Merge pull request #3 from AV306/FastBreak-DEV

not fastbreak anymore

src/main/java/me/av306/xenon/Xenon.java

@@ -69,6 +69,7 @@ public void initialise()
  new ConfigMenu();
  //new Debugger();
  new TimerFeature();
+ new ProximityRadarFeature();
  }
 
 

src/main/java/me/av306/xenon/config/FeatureConfigGroup.java

@@ -2,7 +2,6 @@
 
 import me.av306.xenon.config.feature.*;
 import me.lortseam.completeconfig.api.*;
-import net.minecraft.client.render.entity.feature.TridentRiptideFeatureRenderer;
 
 @ConfigEntries
 public class FeatureConfigGroup implements XenonConfigGroup
@@ -21,4 +20,7 @@ public class FeatureConfigGroup implements XenonConfigGroup
 
  @Transitive
  private final TimerGroup timer = new TimerGroup();
+
+ @Transitive
+ private final ProximityRadarGroup proximityRadarGroup = new ProximityRadarGroup();
 }

src/main/java/me/av306/xenon/config/feature/ProximityRadarGroup.java

@@ -0,0 +1,16 @@
+package me.av306.xenon.config.feature;
+
+import me.av306.xenon.config.XenonConfigGroup;
+import me.lortseam.completeconfig.api.ConfigEntries;
+import me.lortseam.completeconfig.api.ConfigEntry;
+
+@ConfigEntries
+public class ProximityRadarGroup implements XenonConfigGroup
+{
+ @ConfigEntry.BoundedInteger( min = 1, max = 100 )
+ public static int range = 3;
+
+ @ConfigEntry.BoundedInteger( min = 1, max = 100 )
+ @ConfigEntry.Slider
+ public static int interval = 5;
+}

src/main/java/me/av306/xenon/event/callback/RenderTickCounterBeginRenderTickCallback.java → src/main/java/me/av306/xenon/event/BeginRenderTickEvent.java

@@ -1,17 +1,16 @@
-package me.av306.xenon.event.callback;
+package me.av306.xenon.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.ActionResult;
 
-public interface RenderTickCounterBeginRenderTickCallback
+public interface BeginRenderTickEvent
 {
- Event<RenderTickCounterBeginRenderTickCallback> EVENT = EventFactory.createArrayBacked(
- RenderTickCounterBeginRenderTickCallback.class,
+ Event<BeginRenderTickEvent> EVENT = EventFactory.createArrayBacked(
+ BeginRenderTickEvent.class,
  (listeners) -> (timeMillis) ->
  {
- for ( RenderTickCounterBeginRenderTickCallback listener : listeners )
+ for ( BeginRenderTickEvent listener : listeners )
  {
  ActionResult result = listener.interact( timeMillis );
 

src/main/java/me/av306/xenon/event/callback/ChatHudAddMessageCallback.java → src/main/java/me/av306/xenon/event/ChatHudAddMessageEvent.java

@@ -1,17 +1,17 @@
-package me.av306.xenon.event.callback;
+package me.av306.xenon.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 
-public interface ChatHudAddMessageCallback
+public interface ChatHudAddMessageEvent
 {
- Event<ChatHudAddMessageCallback> EVENT = EventFactory.createArrayBacked(
- ChatHudAddMessageCallback.class,
+ Event<ChatHudAddMessageEvent> EVENT = EventFactory.createArrayBacked(
+ ChatHudAddMessageEvent.class,
  (listeners) -> (message) ->
  {
- for ( ChatHudAddMessageCallback listener : listeners )
+ for ( ChatHudAddMessageEvent listener : listeners )
  {
  ActionResult result = listener.interact( message );
 

src/main/java/me/av306/xenon/event/callback/KeyboardKeyCallback.java → src/main/java/me/av306/xenon/event/KeyEvent.java

@@ -1,17 +1,16 @@
-package me.av306.xenon.event.callback;
+package me.av306.xenon.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.ActionResult;
 
-public interface KeyboardKeyCallback
+public interface KeyEvent
 {
- Event<KeyboardKeyCallback> EVENT = EventFactory.createArrayBacked(
- KeyboardKeyCallback.class,
+ Event<KeyEvent> EVENT = EventFactory.createArrayBacked(
+ KeyEvent.class,
  (listeners) -> (window, key, scancode, action, modifiers) ->
  {
- for ( KeyboardKeyCallback listener : listeners )
+ for ( KeyEvent listener : listeners )
  {
  ActionResult result = listener.interact( window, key, scancode, action, modifiers );
 

src/main/java/me/av306/xenon/event/PlayerDamageBlockEvent.java

@@ -0,0 +1,27 @@
+package me.av306.xenon.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+
+public interface PlayerDamageBlockEvent
+{
+ Event<PlayerDamageBlockEvent> EVENT = EventFactory.createArrayBacked(
+ PlayerDamageBlockEvent.class,
+ (listeners) -> (pos, direction) ->
+ {
+ for ( PlayerDamageBlockEvent listener : listeners )
+ {
+ ActionResult result = listener.interact( pos, direction );
+
+ if ( result != ActionResult.PASS ) return result;
+ }
+
+ return ActionResult.PASS;
+ }
+ );
+
+ ActionResult interact( BlockPos pos, Direction direction );
+}

src/main/java/me/av306/xenon/event/callback/InGameOverlayRendererRenderFireOverlayCallback.java → src/main/java/me/av306/xenon/event/RenderFireOverlayEvent.java

@@ -1,4 +1,4 @@
-package me.av306.xenon.event.callback;
+package me.av306.xenon.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -16,14 +16,14 @@
  * default to SUCCESS when there are no other listeners.
  * - FAIL: Cancel the event.
  */
-public interface InGameOverlayRendererRenderFireOverlayCallback
+public interface RenderFireOverlayEvent
 { 
- Event<InGameOverlayRendererRenderFireOverlayCallback> EVENT = EventFactory.createArrayBacked(
- InGameOverlayRendererRenderFireOverlayCallback.class,
+ Event<RenderFireOverlayEvent> EVENT = EventFactory.createArrayBacked(
+ RenderFireOverlayEvent.class,
  (listeners) -> (client, matrices) ->
  {
  // iterate over each listener
- for ( InGameOverlayRendererRenderFireOverlayCallback listener : listeners )
+ for ( RenderFireOverlayEvent listener : listeners )
  {
  // let the listener interact with the event
  ActionResult result = listener.interact( client, matrices );

src/main/java/me/av306/xenon/event/RenderInGameHudEvent.java

@@ -0,0 +1,41 @@
+package me.av306.xenon.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.ActionResult;
+
+public interface RenderInGameHudEvent
+{
+ Event<RenderInGameHudEvent> HEAD = EventFactory.createArrayBacked(
+ RenderInGameHudEvent.class,
+ (listeners) -> (matrices, tickDelta) ->
+ {
+ for ( RenderInGameHudEvent listener : listeners )
+ {
+ ActionResult result = listener.interact( matrices, tickDelta );
+
+ if ( result != ActionResult.PASS ) return result;
+ }
+
+ return ActionResult.PASS;
+ }
+ );
+
+ Event<RenderInGameHudEvent> AFTER_VIGNETTE = EventFactory.createArrayBacked(
+ RenderInGameHudEvent.class,
+ (listeners) -> (matrices, tickDelta) ->
+ {
+ for ( RenderInGameHudEvent listener : listeners )
+ {
+ ActionResult result = listener.interact( matrices, tickDelta );
+
+ if ( result != ActionResult.PASS ) return result;
+ }
+
+ return ActionResult.PASS;
+ }
+ );
+
+ ActionResult interact( MatrixStack matrices, float tickDelta );
+}

src/main/java/me/av306/xenon/feature/IFeature.java

@@ -1,12 +1,9 @@
 package me.av306.xenon.feature;
 
-import me.av306.xenon.Xenon;
-import me.av306.xenon.event.callback.KeyboardKeyCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
-import net.minecraft.util.ActionResult;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.Objects;
@@ -44,7 +41,7 @@ protected IFeature( String name, int key )
  "category.xenon.features"
  ); // don't construct statically because name might not have been set
 
- //KeyboardKeyCallback.EVENT.register( this::onKeyboardKey );
+ //KeyEvent.AFTER_VIGNETTE.register( this::onKeyboardKey );
 
  // register our keybind
  KeyBindingHelper.registerKeyBinding( this.keyBinding );

src/main/java/me/av306/xenon/features/CommandProcessorFeature.java

@@ -1,6 +1,6 @@
 /*package me.av306.xenon.features;
 
-import me.av306.xenon.event.callback.ChatHudAddMessageCallback;
+import me.av306.xenon.event.ChatHudAddMessageEvent;
 import me.av306.xenon.feature.IToggleableFeature;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
@@ -10,7 +10,7 @@ public class CommandProcessorFeature extends IToggleableFeature
  public CommandProcessorFeature()
  {
  super( "CommandProcessor" );
- ChatHudAddMessageCallback.EVENT.register( this::onChatHudAddMessage );
+ ChatHudAddMessageEvent.AFTER_VIGNETTE.register( this::onChatHudAddMessage );
  }
 
  private ActionResult onChatHudAddMessage( Text message )

src/main/java/me/av306/xenon/features/ConfigMenu.java

@@ -1,26 +1,20 @@
 package me.av306.xenon.features;
 
 import me.av306.xenon.Xenon;
-import me.av306.xenon.event.callback.KeyboardKeyCallback;
 import me.av306.xenon.feature.IFeature;
-import me.lortseam.completeconfig.data.Config;
 import me.lortseam.completeconfig.gui.ConfigScreenBuilder;
 import me.lortseam.completeconfig.gui.cloth.ClothConfigScreenBuilder;
 import me.shedaniel.clothconfig2.api.ConfigBuilder;
-import net.fabricmc.fabric.mixin.screen.ScreenAccessor;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.ActionResult;
-import org.lwjgl.glfw.GLFW;
-
-import java.util.function.Consumer;
 
 public class ConfigMenu extends IFeature
 {
  public ConfigMenu()
  {
  super( "ConfigMenu" );
 
- //KeyboardKeyCallback.EVENT.register( this::onKey );
+ //KeyEvent.AFTER_VIGNETTE.register( this::onKey );
  }
 
  protected ActionResult onKey( long window, int key, int scanCode, int action, int modifiers )

src/main/java/me/av306/xenon/features/DataHudFeature.java

@@ -1,23 +1,22 @@
 package me.av306.xenon.features;
 
 import me.av306.xenon.Xenon;
-import me.av306.xenon.event.callback.InGameHudRenderCallback;
+import me.av306.xenon.event.RenderInGameHudEvent;
 import me.av306.xenon.feature.IToggleableFeature;
 import me.av306.xenon.util.ScreenPosition;
 import me.av306.xenon.util.color.ColorUtil;
 import me.av306.xenon.util.text.TextUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.ActionResult;
-import org.lwjgl.opengl.GL11;
 
 public class DataHudFeature extends IToggleableFeature
 {
  public DataHudFeature()
  {
  super( "DataHUD" );
 
- InGameHudRenderCallback.EVENT.register( this::onInGameHudRender );
+ RenderInGameHudEvent.AFTER_VIGNETTE.register( this::onInGameHudRender );
  }
 
  private ActionResult onInGameHudRender( MatrixStack matrixStack, float tickDelta )

src/main/java/me/av306/xenon/features/Debugger.java

@@ -1,11 +1,6 @@
 package me.av306.xenon.features;
 
-import me.av306.xenon.Xenon;
-import me.av306.xenon.event.callback.KeyboardKeyCallback;
 import me.av306.xenon.feature.IFeature;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.ActionResult;
 import org.lwjgl.glfw.GLFW;
 
 public class Debugger extends IFeature
@@ -14,7 +9,7 @@ public Debugger()
  {
 
  super( "Debugger", GLFW.GLFW_KEY_BACKSLASH );
- //KeyboardKeyCallback.EVENT.register( this::onKeyboardKey );
+ //KeyEvent.AFTER_VIGNETTE.register( this::onKeyboardKey );
  }
 
  @Override

src/main/java/me/av306/xenon/features/FastBreakFeature.java

@@ -0,0 +1,45 @@
+package me.av306.xenon.features;
+
+import me.av306.xenon.Xenon;
+import me.av306.xenon.feature.IToggleableFeature;
+import me.av306.xenon.mixin.ClientPlayerInteractionManagerAccessor;
+import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+
+// FIXME: too complex, won;t work
+public class FastBreakFeature extends IToggleableFeature
+{
+ protected FastBreakFeature()
+ {
+ super( "FastBreak" );
+ }
+
+ private ActionResult onUpdateBlockBreakingProgress( BlockPos pos, Direction dir )
+ {
+ // TODO: Add CPIM onDamageBlock event, hook to that, and set the cooldown to 0 and send the following packer
+ ClientPlayerInteractionManager im = Xenon.INSTANCE.client.interactionManager;
+
+ if( ((ClientPlayerInteractionManagerAccessor) im).getCurrentBreakingProgress() >= 1 )
+ return ActionResult.PASS;
+
+ PlayerActionC2SPacket.Action action = PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK;
+ BlockPos blockPos = pos;
+ Direction direction = dir;
+ //im.sendPlayerActionC2SPacket(action, blockPos, direction);
+ return ActionResult.PASS;
+ }
+
+ @Override
+ protected void onEnable()
+ {
+ }
+
+ @Override
+ protected void onDisable()
+ {
+
+ }
+}