0.9.0 - ElytraTweaks AutoDeploy

Author: ShayBox

1.20.1/gradle.properties

@@ -7,6 +7,6 @@ minecraft_version=1.20.1
 parchment_version=2023.09.03
 
 # Plugin Properties
-plugin_version=0.8.1
+plugin_version=0.9.0
 maven_group=com.shaybox.rusher
 archives_base_name=shays-rusher-plugin

1.20.1/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

1.20.1/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

1.20.1/src/main/java/com/shaybox/rusher/Main.java

@@ -20,10 +20,12 @@ public class Main extends Plugin {
     /* ModuleManager & Modules */
     private final IFeatureManager<IModule> moduleManager = RusherHackAPI.getModuleManager();
     private final ToggleableModule killEffects = new KillEffects();
+    private final ToggleableModule spawnLocations = new SpawnLocations();
 
     /* EventBus & Listeners */
     private final IEventBus eventBus = RusherHackAPI.getEventBus();
     private final EventListener armorPriority = new ArmorPriority();
+    private final EventListener autoDeploy = new AutoDeploy();
     private final EventListener autoRestart = new AutoRestart();
     private final EventListener durability101 = new Durability101();
     private final EventListener grimDisabler = new GrimDisabler();
@@ -33,7 +35,9 @@ public class Main extends Plugin {
     @Override
     public void onLoad() {
         this.moduleManager.registerFeature(this.killEffects);
+        this.moduleManager.registerFeature(this.spawnLocations);
         this.eventBus.subscribe(this.armorPriority);
+        this.eventBus.subscribe(this.autoDeploy);
         this.eventBus.subscribe(this.autoRestart);
         this.eventBus.subscribe(this.durability101);
         this.eventBus.subscribe(this.grimDisabler);
@@ -44,6 +48,7 @@ public void onLoad() {
     @Override
     public void onUnload() {
         this.eventBus.unsubscribe(this.armorPriority);
+        this.eventBus.unsubscribe(this.autoDeploy);
         this.eventBus.unsubscribe(this.autoRestart);
         this.eventBus.unsubscribe(this.durability101);
         this.eventBus.unsubscribe(this.grimDisabler);

1.20.1/src/main/java/com/shaybox/rusher/modules/KillEffects.java

@@ -24,7 +24,7 @@ public class KillEffects extends ToggleableModule {
     /* Minecraft */
     private final Minecraft minecraft = Minecraft.getInstance();
 
-    /* RusherHackAPI & Settings */
+    /* Settings */
     private final BooleanSetting self = new BooleanSetting("Self", "Only when you kill", false);
 
     /* Previous State */
@@ -36,20 +36,19 @@ public KillEffects() {
         this.registerSettings(this.self);
     }
 
-    @SuppressWarnings("unused")
     @Subscribe
     private void onPacket(EventPacket.Receive event) {
-        Packet<?> packet = event.getPacket();
+        final Packet<?> packet = event.getPacket();
 
         if (packet instanceof ClientboundDamageEventPacket damagePacket) {
             assert this.minecraft.level != null;
 
-            DamageSource source = damagePacket.getSource(this.minecraft.level);
+            final DamageSource source = damagePacket.getSource(this.minecraft.level);
             if (!source.is(DamageTypes.PLAYER_ATTACK) && !source.is(DamageTypes.PLAYER_EXPLOSION)) return;
 
-            Entity entity = this.minecraft.level.getEntity(damagePacket.entityId());
+            final Entity entity = this.minecraft.level.getEntity(damagePacket.entityId());
             if (entity instanceof Player) {
-                Entity attacker = this.minecraft.level.getEntity(damagePacket.sourceCauseId());
+                final Entity attacker = this.minecraft.level.getEntity(damagePacket.sourceCauseId());
                 this.playerAttacker.put(entity, attacker);
             }
         } else if (packet instanceof ClientboundEntityEventPacket entityPacket) {
@@ -58,20 +57,20 @@ private void onPacket(EventPacket.Receive event) {
             byte eventId = entityPacket.getEventId();
             if (eventId != 3) return;
 
-            Entity entity = entityPacket.getEntity(this.minecraft.level);
+            final Entity entity = entityPacket.getEntity(this.minecraft.level);
             boolean isPlayer = entity instanceof Player;
             if (!isPlayer) return;
 
-            Entity attacker = this.playerAttacker.get(entity);
+            final Entity attacker = this.playerAttacker.get(entity);
             if (attacker == null) return;
             else this.playerAttacker.remove(entity);
 
             /* Only show lightning when the local player is the attacker */
             if (this.self.getValue() && attacker != this.minecraft.player) return;
 
-            LightningBolt lightning = new LightningBolt(EntityType.LIGHTNING_BOLT, this.minecraft.level);
-            lightning.setPos(entity.position());
-            this.minecraft.level.addFreshEntity(lightning);
+            final LightningBolt lightningBolt = new LightningBolt(EntityType.LIGHTNING_BOLT, this.minecraft.level);
+            lightningBolt.setPos(entity.position());
+            this.minecraft.level.addFreshEntity(lightningBolt);
         }
     }
 

1.20.1/src/main/java/com/shaybox/rusher/modules/SpawnLocations.java

@@ -0,0 +1,78 @@
+package com.shaybox.rusher.modules;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.NeutralMob;
+import net.minecraft.world.entity.animal.Animal;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.player.Player;
+import org.rusherhack.client.api.events.render.EventRender3D;
+import org.rusherhack.client.api.events.world.EventEntity;
+import org.rusherhack.client.api.feature.module.ModuleCategory;
+import org.rusherhack.client.api.feature.module.ToggleableModule;
+import org.rusherhack.client.api.render.IRenderer3D;
+import org.rusherhack.client.api.setting.ColorSetting;
+import org.rusherhack.core.event.subscribe.Subscribe;
+import org.rusherhack.core.setting.BooleanSetting;
+import org.rusherhack.core.utils.ColorUtils;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpawnLocations extends ToggleableModule {
+
+    /* Settings */
+    private final BooleanSetting pause = new BooleanSetting("Pause", false);
+    private final BooleanSetting players = new BooleanSetting("Players", false);
+    private final BooleanSetting hostiles = new BooleanSetting("Hostiles", true);
+    private final BooleanSetting passives = new BooleanSetting("Passives", false);
+    private final BooleanSetting neutrals = new BooleanSetting("Neutrals", false);
+    private final ColorSetting color = new ColorSetting("Color", Color.CYAN)
+            .setAlphaAllowed(false)
+            .setThemeSync(true);
+
+    /* Previous State */
+    private final List<BlockPos> positions = new ArrayList<>();
+
+    /* Initialize */
+    public SpawnLocations() {
+        super("SpawnLocations", ModuleCategory.RENDER);
+        this.registerSettings(this.pause, this.players, this.hostiles, this.passives, this.neutrals);
+    }
+
+    @Override
+    public void onDisable() {
+        this.positions.clear();
+        super.onDisable();
+    }
+
+    @Subscribe
+    private void onEntityAdd(EventEntity.Add event) {
+        final Entity entity = event.getEntity();
+        final BlockPos blockPos = entity.blockPosition();
+
+        if (this.pause.getValue()) return;
+        if (this.players.getValue() && !(entity instanceof Player)) return;
+        if (this.hostiles.getValue() && !(entity instanceof Monster)) return;
+        if (this.passives.getValue() && !(entity instanceof Animal)) return;
+        if (this.neutrals.getValue() && !(entity instanceof NeutralMob)) return;
+
+        this.positions.add(blockPos);
+    }
+
+    @Subscribe
+    private void onRender3D(EventRender3D event) {
+        final PoseStack matrixStack = event.getMatrixStack();
+        final IRenderer3D renderer = event.getRenderer();
+        renderer.begin(matrixStack);
+
+        final int color = ColorUtils.transparency(this.color.getValueRGB(), 0.5f);
+        for (BlockPos blockPos : this.positions) {
+            renderer.drawBox(blockPos, true, true, color);
+        }
+
+        renderer.end();
+    }
+}

1.20.1/src/main/java/com/shaybox/rusher/tweaks/ArmorPriority.java

@@ -71,9 +71,9 @@ public ArmorPriority() {
 
     @Override
     public boolean isListening() {
-        IKey elytraBind = this.elytraPriorityBind.getValue();
-        IKey repairBind = this.repairPriorityBind.getValue();
-        IKey goldenBind = this.goldenPriorityBind.getValue();
+        final IKey elytraBind = this.elytraPriorityBind.getValue();
+        final IKey repairBind = this.repairPriorityBind.getValue();
+        final IKey goldenBind = this.goldenPriorityBind.getValue();
 
         return this.isPaused || this.autoArmor.isToggled() && (
                 (this.repairPriority.getValue() || this.goldenPriority.getValue()) || (
@@ -84,7 +84,6 @@ public boolean isListening() {
         );
     }
 
-    @SuppressWarnings("unused")
     @Subscribe
     private void onUpdate(EventUpdate event) {
         if (minecraft.screen != null) return;
@@ -94,20 +93,18 @@ private void onUpdate(EventUpdate event) {
         Main.handleKey(this.goldenPriorityBind::getValue, this.isGoldenDown, (value) -> this.isGoldenDown = value, this.goldenPriority::getValue, this.goldenPriority::setValue);
     }
 
-    @SuppressWarnings("unused")
     @Subscribe
     private void onPlayerUpdate(EventPlayerUpdate event) {
-        LocalPlayer player = event.getPlayer();
-        Inventory inventory = player.getInventory();
+        final LocalPlayer player = event.getPlayer();
+        final Inventory inventory = player.getInventory();
 
         /* Prevent moving items in other containers */
         if (minecraft.screen instanceof InventoryScreen) if (!this.inventory.getValue()) return;
         else if (minecraft.screen instanceof AbstractContainerScreen) return;
 
         /* There can only be one enabled at a time */
-        boolean prioritizeRepair = this.repairPriority.getValue();
-        boolean prioritizeGolden = this.goldenPriority.getValue();
-
+        final boolean prioritizeRepair = this.repairPriority.getValue();
+        final boolean prioritizeGolden = this.goldenPriority.getValue();
         if (prioritizeRepair || prioritizeGolden) {
             if (!isPaused) {
                 isPaused = true;

1.20.1/src/main/java/com/shaybox/rusher/tweaks/AutoDeploy.java

@@ -0,0 +1,69 @@
+package com.shaybox.rusher.tweaks;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
+import net.minecraft.world.effect.MobEffects;
+import org.rusherhack.client.api.RusherHackAPI;
+import org.rusherhack.client.api.events.player.EventPlayerUpdate;
+import org.rusherhack.client.api.feature.module.IModule;
+import org.rusherhack.client.api.feature.module.ToggleableModule;
+import org.rusherhack.core.event.listener.EventListener;
+import org.rusherhack.core.event.subscribe.Subscribe;
+import org.rusherhack.core.feature.IFeatureManager;
+import org.rusherhack.core.setting.BooleanSetting;
+import org.rusherhack.core.setting.NumberSetting;
+
+public class AutoDeploy implements EventListener {
+
+    /* RusherHackAPI Managers & Modules */
+    private final IFeatureManager<IModule> moduleManager = RusherHackAPI.getModuleManager();
+    private final ToggleableModule autoArmor = (ToggleableModule) moduleManager.getFeature("AutoArmor").orElseThrow();
+    private final ToggleableModule elytraTweaks = (ToggleableModule) moduleManager.getFeature("ElytraTweaks").orElseThrow();
+
+    /* AutoArmor Settings */
+    private final BooleanSetting elytraPriority = (BooleanSetting) autoArmor.getSetting("ElytraPriority");
+
+    /* Custom Settings */
+    private final BooleanSetting autoDeploy = new BooleanSetting("AutoDeploy", "Automatically deploy elytra while falling", false);
+    private final NumberSetting<Double> fallingDelay = new NumberSetting<>("FallingDelay", 1.5, 0.0, 10.0);
+
+    /* Previous State */
+    private boolean lastElytraPriority = this.elytraPriority.getValue();
+    private long fallingTicks = 0;
+
+    /* Initialize */
+    public AutoDeploy() {
+        this.autoDeploy.addSubSettings(this.fallingDelay);
+        this.elytraTweaks.registerSettings(this.autoDeploy);
+    }
+
+    @Override
+    public boolean isListening() {
+        return this.elytraTweaks.isToggled() && this.autoDeploy.getValue();
+    }
+
+    @Subscribe
+    private void onPlayerUpdate(EventPlayerUpdate event) {
+        final LocalPlayer player = event.getPlayer();
+        final boolean isInWater = player.isInWater();
+        final boolean isOnGround = player.onGround();
+        final boolean isFallFlying = player.isFallFlying();
+        final boolean hasLevitation = player.hasEffect(MobEffects.LEVITATION);
+        if (isInWater || isOnGround || isFallFlying || hasLevitation) {
+            this.lastElytraPriority = this.elytraPriority.getValue();
+            this.fallingTicks = Math.round(this.fallingDelay.getValue() * 20);
+            return;
+        }
+
+        if (this.fallingTicks >= -3) this.fallingTicks--;
+        if (this.fallingTicks == -1) this.elytraPriority.setValue(true);
+        if (this.fallingTicks == -3) {
+            final var startFallFlying = new ServerboundPlayerCommandPacket(player, ServerboundPlayerCommandPacket.Action.START_FALL_FLYING);
+            player.connection.send(startFallFlying);
+            player.startFallFlying();
+        }
+    }
+
+}
+

1.20.1/src/main/java/com/shaybox/rusher/tweaks/AutoRestart.java

@@ -64,35 +64,33 @@ public AutoRestart() {
 
     @Override
     public boolean isListening() {
-        IKey autoRestartBind = this.autoRestartBind.getValue();
+        final IKey autoRestartBind = this.autoRestartBind.getValue();
 
         return this.elytraFly.isToggled() || this.autoRestart.getValue() || this.isAutoRestartDown || autoRestartBind.isKeyDown();
     }
 
-    @SuppressWarnings("unused")
     @Subscribe
     private void onUpdate(EventUpdate event) {
         if (minecraft.screen != null) return;
 
         Main.handleKey(this.autoRestartBind::getValue, this.isAutoRestartDown, (value) -> this.isAutoRestartDown = value, this.autoRestart::getValue, this.autoRestart::setValue);
     }
 
-    @SuppressWarnings("unused")
     @Subscribe
     private void onPlayerUpdate(EventPlayerUpdate event) {
-        LocalPlayer player = event.getPlayer();
-        Vec3 position = player.position();
+        final LocalPlayer player = event.getPlayer();
+        final Vec3 position = player.position();
 
         if (!this.mode.getDisplayValue().equals("Packet")) {
             this.autoRestart.setValue(false);
             return;
         }
 
         /* Calculate Player Speed */
-        double dx = position.x - player.xOld;
-        double dy = position.y - player.yOld;
-        double dz = position.z - player.zOld;
-        double speed = Math.sqrt(dx * dx + dy * dy + dz * dz);
+        final double dx = position.x - player.xOld;
+        final double dy = position.y - player.yOld;
+        final double dz = position.z - player.zOld;
+        final double speed = Math.sqrt(dx * dx + dy * dy + dz * dz);
 
         /* Update speed buffer */
         this.speedBuffer.offer(speed);
@@ -101,7 +99,7 @@ private void onPlayerUpdate(EventPlayerUpdate event) {
         }
 
         /* Calculate Average Speed */
-        double averageSpeed = speedBuffer.stream().mapToDouble(Double::doubleValue).average().orElse(0.0);
+        final double averageSpeed = speedBuffer.stream().mapToDouble(Double::doubleValue).average().orElse(0.0);
 
         /* Make sure modules do not de-sync */
         if (!this.autoRestart.getValue()) {