0.6.0 - KillEffects Lightning

Author: ShayBox

README.md

@@ -9,4 +9,5 @@ My personal RusherHack tweaks plugin
 - Durability101 (Armor HUD) - Durability101 Mod
 - RepairPriority (AutoArmor) - Prioritize low durability armor with mending
 - GoldenPriority (AutoArmor) - Prioritize one piece of golden armor for piglins
-- Priority Binds (AutoArmor) - Key binds for priority setting toggles
+- Priority Binds (AutoArmor) - Key binds for priority setting toggles
+- Lightning (KillEffects) - Show a client side lightning effect when a player dies

gradle.properties

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

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

@@ -1,14 +1,25 @@
 package com.shaybox.rusher;
 
-import com.shaybox.rusher.tweaks.*;
+import com.shaybox.rusher.modules.KillEffects;
+import com.shaybox.rusher.tweaks.ArmorPriority;
+import com.shaybox.rusher.tweaks.Durability101;
+import com.shaybox.rusher.tweaks.NightVision;
+import com.shaybox.rusher.tweaks.PauseOnUse;
 import org.rusherhack.client.api.RusherHackAPI;
+import org.rusherhack.client.api.feature.module.IModule;
+import org.rusherhack.client.api.feature.module.ToggleableModule;
 import org.rusherhack.client.api.plugin.Plugin;
 import org.rusherhack.core.event.IEventBus;
 import org.rusherhack.core.event.listener.EventListener;
+import org.rusherhack.core.feature.IFeatureManager;
 
 @SuppressWarnings("unused")
 public class Main extends Plugin {
 
+    /* ModuleManager & Modules */
+    private final IFeatureManager<IModule> moduleManager = RusherHackAPI.getModuleManager();
+    private final ToggleableModule killEffects = new KillEffects();
+
     /* EventBus & Listeners */
     private final IEventBus eventBus = RusherHackAPI.getEventBus();
     private final EventListener armorPriority = new ArmorPriority();
@@ -18,18 +29,19 @@ public class Main extends Plugin {
 
     @Override
     public void onLoad() {
-        eventBus.subscribe(armorPriority);
-        eventBus.subscribe(durability101);
-        eventBus.subscribe(nightVision);
-        eventBus.subscribe(pauseOnUse);
+        this.moduleManager.registerFeature(this.killEffects);
+        this.eventBus.subscribe(this.armorPriority);
+        this.eventBus.subscribe(this.durability101);
+        this.eventBus.subscribe(this.nightVision);
+        this.eventBus.subscribe(this.pauseOnUse);
     }
 
     @Override
     public void onUnload() {
-        eventBus.unsubscribe(armorPriority);
-        eventBus.unsubscribe(durability101);
-        eventBus.unsubscribe(nightVision);
-        eventBus.unsubscribe(pauseOnUse);
+        this.eventBus.unsubscribe(this.armorPriority);
+        this.eventBus.unsubscribe(this.durability101);
+        this.eventBus.unsubscribe(this.nightVision);
+        this.eventBus.unsubscribe(this.pauseOnUse);
     }
 
 }

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

@@ -0,0 +1,78 @@
+package com.shaybox.rusher.modules;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundDamageEventPacket;
+import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.damagesource.DamageTypes;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.entity.player.Player;
+import org.rusherhack.client.api.events.network.EventPacket;
+import org.rusherhack.client.api.feature.module.ModuleCategory;
+import org.rusherhack.client.api.feature.module.ToggleableModule;
+import org.rusherhack.core.event.subscribe.Subscribe;
+import org.rusherhack.core.setting.BooleanSetting;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class KillEffects extends ToggleableModule {
+
+    /* Minecraft */
+    private final Minecraft minecraft = Minecraft.getInstance();
+
+    /* RusherHackAPI Managers & Settings */
+    private final BooleanSetting self = new BooleanSetting("Self", "Only when you kill", false);
+
+    /* Previous State */
+    private final Map<Entity, Entity> playerAttacker = new HashMap<>();
+
+    /* Initialize */
+    public KillEffects() {
+        super("KillEffects", ModuleCategory.RENDER);
+        this.registerSettings(this.self);
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe
+    private void onPacket(EventPacket.Receive event) {
+        Packet<?> packet = event.getPacket();
+
+        if (packet instanceof ClientboundDamageEventPacket damagePacket) {
+            assert this.minecraft.level != null;
+
+            DamageSource source = damagePacket.getSource(this.minecraft.level);
+            if (!source.is(DamageTypes.PLAYER_ATTACK)) return;
+
+            Entity entity = this.minecraft.level.getEntity(damagePacket.entityId());
+            if (entity instanceof Player) {
+                Entity attacker = this.minecraft.level.getEntity(damagePacket.sourceCauseId());
+                this.playerAttacker.put(entity, attacker);
+            }
+        } else if (packet instanceof ClientboundEntityEventPacket entityPacket) {
+            assert this.minecraft.level != null;
+
+            byte eventId = entityPacket.getEventId();
+            if (eventId != 3) return;
+
+            Entity entity = entityPacket.getEntity(this.minecraft.level);
+            boolean isPlayer = entity instanceof Player;
+            if (!isPlayer) return;
+
+            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.addEntity(lightning);
+        }
+    }
+
+}

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

@@ -85,8 +85,8 @@ public boolean isListening() {
         );
     }
 
-    @Subscribe
     @SuppressWarnings("unused")
+    @Subscribe
     private void onUpdate(EventUpdate event) {
         if (minecraft.screen != null) return;
 
@@ -145,18 +145,18 @@ private void onPlayerUpdate(EventPlayerUpdate event) {
 
                                 int itemDamage = itemStack.getDamageValue();
                                 int armorDamage = armorStack.getDamageValue();
-                                if (itemDamage > armorDamage) swapSlotId(player, slot, armorSlotId);
+                                if (itemDamage > armorDamage) swapSlotArmorId(slot, armorSlotId);
                             });
                 }
             }
 
             if (prioritizeGolden) {
                 this.repairPriority.setValue(false);
 
-                for (Item goldArmor : this.goldenArmorPriority)
+                for (Item goldenArmor : this.goldenArmorPriority)
                     player.inventoryMenu.slots.stream()
-                            .filter(slot -> slot.getItem().getItem() instanceof Equipable e && e == goldArmor)
-                            .filter(slot -> { /* Only one piece of gold armor */
+                            .filter(slot -> slot.getItem().getItem() instanceof Equipable e && e == goldenArmor)
+                            .filter(slot -> { /* Only one piece of golden armor */
                                 for (Item item : this.goldenArmorPriority)
                                     if (inventory.armor.stream().map(ItemStack::getItem).toList().contains(item))
                                         return false;
@@ -166,7 +166,7 @@ private void onPlayerUpdate(EventPlayerUpdate event) {
                                 Equipable equipable = (Equipable) slot.getItem().getItem();
                                 EquipmentSlot equipmentSlot = equipable.getEquipmentSlot();
                                 int armorSlotId = InventoryUtils.getInventorySlot(equipmentSlot);
-                                this.swapSlotId(player, slot, armorSlotId);
+                                this.swapSlotArmorId(slot, armorSlotId);
                             });
             }
         } else if (isPaused) {
@@ -175,7 +175,7 @@ private void onPlayerUpdate(EventPlayerUpdate event) {
         }
     }
 
-    private void swapSlotId(LocalPlayer player, Slot slot, int armorSlotId) {
+    private void swapSlotArmorId(Slot slot, int armorSlotId) {
         InventoryUtils.clickSlot(slot.index, false);
         InventoryUtils.clickSlot(armorSlotId, false);
         InventoryUtils.clickSlot(slot.index, false);

src/main/resources/rusherhack-plugin.json

@@ -7,9 +7,12 @@
     "ShayBox"
   ],
   "Minecraft-Versions": [
+    "1.20.6",
+    "1.20.5",
     "1.20.4",
     "1.20.3",
     "1.20.2",
-    "1.20.1"
+    "1.20.1",
+    "1.12.2"
   ]
 }