0.8.0 - GrimDisabler AutoChestplate & Binds

Author: ShayBox

README.md

@@ -10,12 +10,15 @@ My personal RusherHack tweaks plugin
 - AutoArmor:
   - RepairPriority - Prioritize low durability armor with mending
   - GoldenPriority - Prioritize one piece of golden armor for piglins
-  - PriorityBinds - Key binds for priority setting toggles
+  - Priority Binds - Key binds for priority setting toggles
 - AutoWalk/ElytraFly/RotationLock:
   - PauseOnUse - Pause modules while using/eating
   - AutoRestart - Automatically restart **packet** fly if your speed drops (Requested by _0lw)
 - Armor HUD:
   - Durability101 - Durability101 Mod
+- Elytra Tweaks:
+  - GrimDisabler AutoChestplate - Automatically disable AutoArmor ElytraPriority
+  - GrimDisabler Binds - Key binds for GrimDisabler
 - FullBright:
   - NightVision - Client side night vision effect (for shaders)
 

gradle.properties

@@ -7,6 +7,6 @@ minecraft_version=1.20.4
 parchment_version=2024.04.14
 
 # Plugin Properties
-plugin_version=0.7.0
+plugin_version=0.8.0
 maven_group=com.shaybox.rusher
 archives_base_name=shays-rusher-plugin

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

@@ -26,6 +26,7 @@ public class Main extends Plugin {
     private final EventListener armorPriority = new ArmorPriority();
     private final EventListener autoRestart = new AutoRestart();
     private final EventListener durability101 = new Durability101();
+    private final EventListener grimDisabler = new GrimDisabler();
     private final EventListener nightVision = new NightVision();
     private final EventListener pauseOnUse = new PauseOnUse();
 
@@ -35,6 +36,7 @@ public void onLoad() {
         this.eventBus.subscribe(this.armorPriority);
         this.eventBus.subscribe(this.autoRestart);
         this.eventBus.subscribe(this.durability101);
+        this.eventBus.subscribe(this.grimDisabler);
         this.eventBus.subscribe(this.nightVision);
         this.eventBus.subscribe(this.pauseOnUse);
     }
@@ -44,6 +46,7 @@ public void onUnload() {
         this.eventBus.unsubscribe(this.armorPriority);
         this.eventBus.unsubscribe(this.autoRestart);
         this.eventBus.unsubscribe(this.durability101);
+        this.eventBus.unsubscribe(this.grimDisabler);
         this.eventBus.unsubscribe(this.nightVision);
         this.eventBus.unsubscribe(this.pauseOnUse);
     }

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

@@ -94,8 +94,8 @@ private void onUpdate(EventUpdate event) {
         Main.handleKey(this.goldenPriorityBind::getValue, this.isGoldenDown, (value) -> this.isGoldenDown = value, this.goldenPriority::getValue, this.goldenPriority::setValue);
     }
 
-    @Subscribe
     @SuppressWarnings("unused")
+    @Subscribe
     private void onPlayerUpdate(EventPlayerUpdate event) {
         LocalPlayer player = event.getPlayer();
         Inventory inventory = player.getInventory();
@@ -125,7 +125,7 @@ private void onPlayerUpdate(EventPlayerUpdate event) {
                     player.inventoryMenu.slots.stream()
                             .filter(slot -> slot.getItem().getItem() instanceof Equipable e && e.getEquipmentSlot() == equipmentSlot)
                             .filter(slot -> EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MENDING, slot.getItem()) > 0)
-                            .min(Comparator.comparingInt(slot -> slot.getItem().getDamageValue()))
+                            .max(Comparator.comparingInt(slot -> slot.getItem().getDamageValue()))
                             .ifPresent(slot -> {
                                 Slot armorSlot = player.inventoryMenu.getSlot(armorSlotId);
                                 ItemStack armorStack = armorSlot.getItem();

src/main/java/com/shaybox/rusher/tweaks/Durability101.java

@@ -14,6 +14,7 @@
 import org.rusherhack.client.api.events.render.EventRender2D;
 import org.rusherhack.client.api.feature.hud.HudElement;
 import org.rusherhack.client.api.feature.hud.TextHudElement;
+import org.rusherhack.client.api.render.IRenderer2D;
 import org.rusherhack.client.api.render.font.IFontRenderer;
 import org.rusherhack.client.api.system.IHudManager;
 import org.rusherhack.client.api.ui.theme.IThemeManager;
@@ -22,6 +23,7 @@
 import org.rusherhack.core.event.subscribe.Subscribe;
 import org.rusherhack.core.setting.BooleanSetting;
 import org.rusherhack.core.setting.EnumSetting;
+import org.rusherhack.core.setting.NumberSetting;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -48,13 +50,14 @@ public class Durability101 implements EventListener {
     /* Custom Settings */
     private final BooleanSetting durability101 = new BooleanSetting("Durability101", "Durability101 Mod for Armor HUD", false);
     private final BooleanSetting unbreaking = new BooleanSetting("Unbreaking", "Estimates Unbreaking Durability", false);
+    private final NumberSetting<Integer> yOffset = new NumberSetting<>("Y Offset", "Manual Y Offset", 0, -15, 15);
 
     /* Temporary */
     private final TextHudElement watermark = (TextHudElement) hudManager.getFeature("Watermark").orElseThrow();
 
     /* Initialize */
     public Durability101() {
-        this.durability101.addSubSettings(this.unbreaking);
+        this.durability101.addSubSettings(this.unbreaking, this.yOffset);
         this.armor.registerSettings(this.durability101);
     }
 
@@ -81,15 +84,16 @@ private void onRender2D(EventRender2D event) {
         double startX = this.armor.getStartX(), startY = this.armor.getStartY();
         double width = this.armor.getWidth(), height = this.armor.getHeight();
 
-        /* Matrix Stack */
-        PoseStack matrixStack = event.getMatrixStack();
-        matrixStack.pushPose();
-        matrixStack.translate(startX, startY, 0);
-        matrixStack.scale(scale * 0.5F, scale * 0.5F, 0);
-
         /* Font Renderer */
+        PoseStack matrixStack = event.getMatrixStack();
+        IRenderer2D renderer = this.armor.getRenderer();
         IFontRenderer fontRenderer = this.armor.getFontRenderer();
-        fontRenderer.begin(matrixStack);
+        renderer.begin(matrixStack, fontRenderer);
+
+        /* Matrix Stack */
+        matrixStack.pushPose();
+        matrixStack.translate(startX, startY + this.yOffset.getValue(), 1);
+        matrixStack.scale(scale * 0.5F, scale * 0.5F, 1);
 
         /* Player Armor Slots (Clone & Reverse) */
         Inventory inventory = player.getInventory();
@@ -144,7 +148,7 @@ private void onRender2D(EventRender2D event) {
             fontRenderer.drawString(text, x, y, color, true);
         }
 
-        fontRenderer.end();
+        renderer.end();
         matrixStack.popPose();
     }
 

src/main/java/com/shaybox/rusher/tweaks/GrimDisabler.java

@@ -0,0 +1,72 @@
+package com.shaybox.rusher.tweaks;
+
+import com.shaybox.rusher.Main;
+import net.minecraft.client.Minecraft;
+import org.rusherhack.client.api.RusherHackAPI;
+import org.rusherhack.client.api.events.client.EventUpdate;
+import org.rusherhack.client.api.feature.module.IModule;
+import org.rusherhack.client.api.feature.module.ToggleableModule;
+import org.rusherhack.client.api.setting.BindSetting;
+import org.rusherhack.core.bind.key.IKey;
+import org.rusherhack.core.bind.key.NullKey;
+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;
+
+public class GrimDisabler implements EventListener {
+
+    /* Minecraft */
+    private final Minecraft minecraft = Minecraft.getInstance();
+
+    /* 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();
+
+    /* Custom Settings */
+    private final BooleanSetting elytraPriority = (BooleanSetting) autoArmor.getSetting("ElytraPriority");
+    private final BooleanSetting grimDisabler = (BooleanSetting) this.elytraTweaks.getSetting("GrimDisabler");
+    private final BooleanSetting autoChestplate = new BooleanSetting("AutoChestplate", "Automatically disable AutoArmor ElytraPriority", true);
+    private final BindSetting grimDisablerBind = new BindSetting("Bind", NullKey.INSTANCE);
+
+    /* Previous State */
+    private boolean isRunning = false;
+    private boolean isGrimDisablerDown = false;
+    private boolean lastElytraPriority = this.elytraPriority.getValue();
+
+    /* Initialize */
+    public GrimDisabler() {
+        this.grimDisabler.addSubSettings(this.autoChestplate, this.grimDisablerBind);
+    }
+
+    @Override
+    public boolean isListening() {
+        IKey grimDisablerBind = this.grimDisablerBind.getValue();
+
+        return this.grimDisabler.getValue() | this.isGrimDisablerDown || grimDisablerBind.isKeyDown() || this.isRunning;
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe
+    private void onUpdate(EventUpdate event) {
+        if (this.autoChestplate.getValue()) {
+            if (this.grimDisabler.getValue()) {
+                if (!this.isRunning) {
+                    this.lastElytraPriority = this.elytraPriority.getValue();
+                    this.elytraPriority.setValue(false);
+                    this.isRunning = true;
+                }
+            } else if (this.isRunning) {
+                this.elytraPriority.setValue(lastElytraPriority);
+                this.isRunning = false;
+            }
+        }
+
+        if (minecraft.screen != null) return;
+
+        Main.handleKey(this.grimDisablerBind::getValue, this.isGrimDisablerDown, (value) -> this.isGrimDisablerDown = value, this.grimDisabler::getValue, this.grimDisabler::setValue);
+    }
+
+}
+

src/main/java/com/shaybox/rusher/tweaks/NightVision.java

@@ -37,8 +37,8 @@ public boolean isListening() {
         return this.nightVisionSetting.getValue() || this.isApplied;
     }
 
-    @Subscribe
     @SuppressWarnings("unused")
+    @Subscribe
     private void onPlayerUpdate(EventPlayerUpdate event) {
         LocalPlayer player = event.getPlayer();
         boolean hasNightVision = player.hasEffect(MobEffects.NIGHT_VISION);