From 6ab45190933d6bcc111b4fdc1a765b9ded7b34a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A4seToatz?= Date: Mon, 15 Jul 2024 09:28:55 +0200 Subject: [PATCH] V1.2 --- gradle.properties | 2 +- .../riptidehacks/mixin/TridentItemMixin.java | 26 ------- .../TridentHacks.java} | 32 ++++---- .../kasetoatz/tridenthacks/config/Config.java | 77 +++++++++++++++++++ .../mixin/ClientConnectionMixin.java | 14 ++-- .../mixin/EnchantmentHelperMixin.java | 10 ++- .../mixin/EntityMixin.java | 12 +-- .../mixin/LivingEntityMixin.java | 9 ++- .../mixin/PlayerInventoryMixin.java | 46 +++++++++++ .../mixin/PlayerMoveC2SPacketMixin.java | 2 +- .../tridenthacks/mixin/TridentItemMixin.java | 44 +++++++++++ src/main/resources/fabric.mod.json | 8 +- ...s.mixins.json => tridenthacks.mixins.json} | 7 +- 13 files changed, 219 insertions(+), 70 deletions(-) delete mode 100644 src/main/java/com/kasetoatz/riptidehacks/mixin/TridentItemMixin.java rename src/main/java/com/kasetoatz/{riptidehacks/RiptideHacks.java => tridenthacks/TridentHacks.java} (54%) create mode 100644 src/main/java/com/kasetoatz/tridenthacks/config/Config.java rename src/main/java/com/kasetoatz/{riptidehacks => tridenthacks}/mixin/ClientConnectionMixin.java (63%) rename src/main/java/com/kasetoatz/{riptidehacks => tridenthacks}/mixin/EnchantmentHelperMixin.java (60%) rename src/main/java/com/kasetoatz/{riptidehacks => tridenthacks}/mixin/EntityMixin.java (56%) rename src/main/java/com/kasetoatz/{riptidehacks => tridenthacks}/mixin/LivingEntityMixin.java (65%) create mode 100644 src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java rename src/main/java/com/kasetoatz/{riptidehacks => tridenthacks}/mixin/PlayerMoveC2SPacketMixin.java (89%) create mode 100644 src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java rename src/main/resources/{riptidehacks.mixins.json => tridenthacks.mixins.json} (67%) diff --git a/gradle.properties b/gradle.properties index 4271988..a685c1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties mod_version = 1.1 maven_group = com.kasetoatz - archives_base_name = RiptideHacks + archives_base_name = TridentHacks # Dependencies # check this on https://modmuss50.me/fabric.html diff --git a/src/main/java/com/kasetoatz/riptidehacks/mixin/TridentItemMixin.java b/src/main/java/com/kasetoatz/riptidehacks/mixin/TridentItemMixin.java deleted file mode 100644 index a141741..0000000 --- a/src/main/java/com/kasetoatz/riptidehacks/mixin/TridentItemMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.kasetoatz.riptidehacks.mixin; - -import com.kasetoatz.riptidehacks.RiptideHacks; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.TridentItem; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TridentItem.class) -public class TridentItemMixin { - @Inject(method="onStoppedUsing", at=@At("HEAD")) - private void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int remainingUseTicks, CallbackInfo ci) - { - if (RiptideHacks.toggled && user == RiptideHacks.client.player && user.getItemUseTime() > 10) - { - world.playSoundFromEntity(user, SoundEvents.ITEM_TRIDENT_RIPTIDE_3.value(), SoundCategory.AMBIENT, 1.f, 1.f); - RiptideHacks.setLastTridentUse(); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/kasetoatz/riptidehacks/RiptideHacks.java b/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java similarity index 54% rename from src/main/java/com/kasetoatz/riptidehacks/RiptideHacks.java rename to src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java index 5d0804f..fda1e07 100644 --- a/src/main/java/com/kasetoatz/riptidehacks/RiptideHacks.java +++ b/src/main/java/com/kasetoatz/tridenthacks/TridentHacks.java @@ -1,30 +1,38 @@ -package com.kasetoatz.riptidehacks; +package com.kasetoatz.tridenthacks; +import com.kasetoatz.tridenthacks.config.Config; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.Items; import net.minecraft.text.Text; -import net.minecraft.util.Formatting; import org.lwjgl.glfw.GLFW; -public class RiptideHacks implements ClientModInitializer { +import java.util.HashMap; + +public class TridentHacks implements ClientModInitializer { public static MinecraftClient client; - public static boolean toggled = false; public static boolean onGround = true; + public static boolean riptideConditions = false; + public static boolean hasRiptide = false; + public static int tridentSlot = -1; private static KeyBinding keyBinding; - private static long lastTridentUse = 0; + public static long lastTridentUse = 0; @Override public void onInitializeClient() { client = MinecraftClient.getInstance(); + Config.load(); keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("Toggle Riptide", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_ALT, "RiptideHacks")); ClientTickEvents.END_CLIENT_TICK.register(client -> { while (keyBinding.wasPressed()) { - toggled = !toggled; - client.inGameHud.setOverlayMessage(Text.literal("Riptide ").append((toggled) ? Text.literal("ON").styled((style -> style.withColor(Formatting.GREEN))) : Text.literal("OFF").styled((style -> style.withColor(Formatting.RED)))), false); + Config.toggleRiptide = !Config.toggleRiptide; + Config.save(); + client.inGameHud.setOverlayMessage(Text.of(Config.toggleRiptide ? Config.riptideOnMessage : Config.riptideOffMessage), false); } if (!onGround && client.player != null && client.player.isOnGround()) { @@ -33,14 +41,8 @@ public class RiptideHacks implements ClientModInitializer { }); } - public static void setLastTridentUse() + public static boolean noNormalRiptide() { - lastTridentUse = System.currentTimeMillis(); - onGround = false; - } - - public static boolean shouldAnimate() - { - return lastTridentUse > System.currentTimeMillis() - 1000; + return client.player == null || !riptideConditions || client.player.getActiveItem().getItem() != Items.TRIDENT || !hasRiptide; } } \ No newline at end of file diff --git a/src/main/java/com/kasetoatz/tridenthacks/config/Config.java b/src/main/java/com/kasetoatz/tridenthacks/config/Config.java new file mode 100644 index 0000000..0ee0c31 --- /dev/null +++ b/src/main/java/com/kasetoatz/tridenthacks/config/Config.java @@ -0,0 +1,77 @@ +package com.kasetoatz.tridenthacks.config; + +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import com.google.gson.Gson; +import com.kasetoatz.tridenthacks.TridentHacks; +import net.minecraft.util.crash.CrashException; +import net.minecraft.util.crash.CrashReport; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; + +public class Config { + public static boolean toggleRiptide = true; + public static boolean noFallDamage = true; + public static boolean returnToSameSlot = true; + public static String riptideOnMessage = "Riptide §aON"; + public static String riptideOffMessage = "Riptide §cOFF"; + + public static void load() { + File file = new File(TridentHacks.client.runDirectory, "config/tridenthacks.json"); + if (!file.exists()) + { + save(); + return; + } + try (FileReader reader = new FileReader(file)) + { + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + JsonObject json = gson.fromJson(reader, JsonObject.class); + if (json.has("toggleRiptide")) + { + toggleRiptide = json.get("toggleRiptide").getAsBoolean(); + } + if (json.has("noFallDamage")) + { + noFallDamage = json.get("noFallDamage").getAsBoolean(); + } + if (json.has("returnToSameSlot")) + { + returnToSameSlot = json.get("returnToSameSlot").getAsBoolean(); + } + if (json.has("riptideOnMessage")) + { + riptideOnMessage = json.get("riptideOnMessage").getAsString(); + } + if (json.has("riptideOffMessage")) + { + riptideOffMessage = json.get("riptideOffMessage").getAsString(); + } + } + catch (IOException exc) + { + throw new CrashException(CrashReport.create(exc, "Loading config file.")); + } + } + + public static void save() + { + JsonObject json = new JsonObject(); + json.addProperty("toggleRiptide", toggleRiptide); + json.addProperty("noFallDamage", noFallDamage); + json.addProperty("returnToSameSlot", returnToSameSlot); + json.addProperty("riptideOnMessage", riptideOnMessage); + json.addProperty("riptideOffMessage", riptideOffMessage); + try (FileWriter writer = new FileWriter(new File(TridentHacks.client.runDirectory, "config/tridenthacks.json"))) + { + new GsonBuilder().setPrettyPrinting().create().toJson(json, writer); + } + catch (IOException exc) + { + throw new CrashException(CrashReport.create(exc, "Saving config file.")); + } + } +} diff --git a/src/main/java/com/kasetoatz/riptidehacks/mixin/ClientConnectionMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java similarity index 63% rename from src/main/java/com/kasetoatz/riptidehacks/mixin/ClientConnectionMixin.java rename to src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java index 43d452a..162597a 100644 --- a/src/main/java/com/kasetoatz/riptidehacks/mixin/ClientConnectionMixin.java +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/ClientConnectionMixin.java @@ -1,8 +1,8 @@ -package com.kasetoatz.riptidehacks.mixin; +package com.kasetoatz.tridenthacks.mixin; -import com.kasetoatz.riptidehacks.RiptideHacks; +import com.kasetoatz.tridenthacks.config.Config; +import com.kasetoatz.tridenthacks.TridentHacks; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.item.Items; import net.minecraft.network.ClientConnection; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; @@ -17,16 +17,16 @@ public abstract class ClientConnectionMixin { @Inject(method="send*", at=@At("HEAD"), cancellable = true) private void send(Packet packet, CallbackInfo ci) { - if (RiptideHacks.toggled) + if (Config.toggleRiptide) { - ClientPlayerEntity player = RiptideHacks.client.player; + ClientPlayerEntity player = TridentHacks.client.player; if (player != null) { - if (packet instanceof PlayerActionC2SPacket && player.getActiveItem().getItem() == Items.TRIDENT) + if (packet instanceof PlayerActionC2SPacket && TridentHacks.noNormalRiptide() && ((PlayerActionC2SPacket)packet).getAction() == PlayerActionC2SPacket.Action.RELEASE_USE_ITEM) { ci.cancel(); } - else if (packet instanceof PlayerMoveC2SPacket && !RiptideHacks.onGround) + else if (Config.noFallDamage && packet instanceof PlayerMoveC2SPacket && !TridentHacks.onGround && !player.isFallFlying()) { ((PlayerMoveC2SPacketMixin)packet).setOnGround(true); } diff --git a/src/main/java/com/kasetoatz/riptidehacks/mixin/EnchantmentHelperMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java similarity index 60% rename from src/main/java/com/kasetoatz/riptidehacks/mixin/EnchantmentHelperMixin.java rename to src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java index c7a7b1e..00dbc1b 100644 --- a/src/main/java/com/kasetoatz/riptidehacks/mixin/EnchantmentHelperMixin.java +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/EnchantmentHelperMixin.java @@ -1,6 +1,7 @@ -package com.kasetoatz.riptidehacks.mixin; +package com.kasetoatz.tridenthacks.mixin; -import com.kasetoatz.riptidehacks.RiptideHacks; +import com.kasetoatz.tridenthacks.config.Config; +import com.kasetoatz.tridenthacks.TridentHacks; import net.minecraft.enchantment.EnchantmentHelper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -9,11 +10,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(EnchantmentHelper.class) public abstract class EnchantmentHelperMixin { - @Inject(method="getTridentSpinAttackStrength", at=@At("HEAD"), cancellable = true) + @Inject(method="getTridentSpinAttackStrength", at=@At("RETURN"), cancellable = true) private static void getTridentSpinAttackStrength(CallbackInfoReturnable cir) { - if (RiptideHacks.toggled) + if (Config.toggleRiptide) { + TridentHacks.hasRiptide = cir.getReturnValue() > 0.0f; cir.setReturnValue(3.f); } } diff --git a/src/main/java/com/kasetoatz/riptidehacks/mixin/EntityMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java similarity index 56% rename from src/main/java/com/kasetoatz/riptidehacks/mixin/EntityMixin.java rename to src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java index f32ccb8..1ac027a 100644 --- a/src/main/java/com/kasetoatz/riptidehacks/mixin/EntityMixin.java +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/EntityMixin.java @@ -1,6 +1,7 @@ -package com.kasetoatz.riptidehacks.mixin; +package com.kasetoatz.tridenthacks.mixin; -import com.kasetoatz.riptidehacks.RiptideHacks; +import com.kasetoatz.tridenthacks.config.Config; +import com.kasetoatz.tridenthacks.TridentHacks; import net.minecraft.entity.Entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -9,13 +10,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Entity.class) public abstract class EntityMixin { - @Inject(method="isTouchingWaterOrRain", at=@At("HEAD"), cancellable = true) + @Inject(method="isTouchingWaterOrRain", at=@At("RETURN"), cancellable = true) private void isTouchingWaterOrRain(CallbackInfoReturnable cir) { - if (RiptideHacks.toggled) + if (Config.toggleRiptide) { - if (((Entity)(Object)this) == RiptideHacks.client.player) + if (((Entity)(Object)this) == TridentHacks.client.player) { + TridentHacks.riptideConditions = cir.getReturnValue(); cir.setReturnValue(true); } } diff --git a/src/main/java/com/kasetoatz/riptidehacks/mixin/LivingEntityMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java similarity index 65% rename from src/main/java/com/kasetoatz/riptidehacks/mixin/LivingEntityMixin.java rename to src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java index 99c42ff..e9c94f8 100644 --- a/src/main/java/com/kasetoatz/riptidehacks/mixin/LivingEntityMixin.java +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/LivingEntityMixin.java @@ -1,6 +1,7 @@ -package com.kasetoatz.riptidehacks.mixin; +package com.kasetoatz.tridenthacks.mixin; -import com.kasetoatz.riptidehacks.RiptideHacks; +import com.kasetoatz.tridenthacks.config.Config; +import com.kasetoatz.tridenthacks.TridentHacks; import net.minecraft.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -13,9 +14,9 @@ public abstract class LivingEntityMixin { private void isUsingRiptide(CallbackInfoReturnable cir) { LivingEntity entity = (LivingEntity)(Object)this; - if (RiptideHacks.toggled && RiptideHacks.shouldAnimate()) + if (Config.toggleRiptide && TridentHacks.noNormalRiptide() && TridentHacks.lastTridentUse > System.currentTimeMillis() - 1000) { - if (entity == RiptideHacks.client.player) + if (entity == TridentHacks.client.player) { cir.setReturnValue(true); } diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java new file mode 100644 index 0000000..06390ea --- /dev/null +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerInventoryMixin.java @@ -0,0 +1,46 @@ +package com.kasetoatz.tridenthacks.mixin; + +import com.kasetoatz.tridenthacks.TridentHacks; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.network.ClientPlayerInteractionManager; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.screen.slot.SlotActionType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PlayerInventory.class) +public abstract class PlayerInventoryMixin { + @Inject(method="setStack", at=@At("HEAD")) + public void setStack(int slot, ItemStack stack, CallbackInfo ci) + { + int tridentSlot = TridentHacks.tridentSlot; + if (tridentSlot != -1) + { + ClientPlayerEntity player = TridentHacks.client.player; + ClientPlayerInteractionManager interactionManager = TridentHacks.client.interactionManager; + if (!stack.isEmpty() && stack.getItem() == Items.TRIDENT && player != null && interactionManager != null) + { + if (player.getInventory().getStack(TridentHacks.tridentSlot).isEmpty()) + { + interactionManager.clickSlot(player.playerScreenHandler.syncId, this.getSlotID(slot), 0, SlotActionType.PICKUP, player); + interactionManager.clickSlot(player.playerScreenHandler.syncId, this.getSlotID(TridentHacks.tridentSlot), 0, SlotActionType.PICKUP, player); + if (TridentHacks.tridentSlot == tridentSlot) + { + TridentHacks.tridentSlot = -1; + } + } + } + } + } + + @Unique + private int getSlotID(int index) + { + return (index == PlayerInventory.OFF_HAND_SLOT) ? 45 : (index < PlayerInventory.getHotbarSize()) ? index + PlayerInventory.MAIN_SIZE : index; + } +} \ No newline at end of file diff --git a/src/main/java/com/kasetoatz/riptidehacks/mixin/PlayerMoveC2SPacketMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java similarity index 89% rename from src/main/java/com/kasetoatz/riptidehacks/mixin/PlayerMoveC2SPacketMixin.java rename to src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java index 2265256..d8516e8 100644 --- a/src/main/java/com/kasetoatz/riptidehacks/mixin/PlayerMoveC2SPacketMixin.java +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/PlayerMoveC2SPacketMixin.java @@ -1,4 +1,4 @@ -package com.kasetoatz.riptidehacks.mixin; +package com.kasetoatz.tridenthacks.mixin; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java b/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java new file mode 100644 index 0000000..58554ca --- /dev/null +++ b/src/main/java/com/kasetoatz/tridenthacks/mixin/TridentItemMixin.java @@ -0,0 +1,44 @@ +package com.kasetoatz.tridenthacks.mixin; + +import com.kasetoatz.tridenthacks.config.Config; +import com.kasetoatz.tridenthacks.TridentHacks; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.TridentItem; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(TridentItem.class) +public class TridentItemMixin { + @Inject(method="onStoppedUsing", at=@At("HEAD")) + private void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int remainingUseTicks, CallbackInfo ci) + { + if (Config.toggleRiptide) + { + PlayerEntity player = TridentHacks.client.player; + if (TridentHacks.noNormalRiptide() && user == player && user.getItemUseTime() > 10) + { + world.playSoundFromEntity(player, SoundEvents.ITEM_TRIDENT_RIPTIDE_3.value(), SoundCategory.PLAYERS, 1.F, 1.F); + } + TridentHacks.lastTridentUse = System.currentTimeMillis(); + TridentHacks.onGround = false; + } + else if (Config.returnToSameSlot && !TridentHacks.hasRiptide) + { + PlayerEntity player = TridentHacks.client.player; + if (player != null) + { + TridentHacks.tridentSlot = (user.getOffHandStack() == stack) ? PlayerInventory.OFF_HAND_SLOT : player.getInventory().selectedSlot; + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 36e4e6d..52c3ac0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,23 +1,23 @@ { "schemaVersion": 1, - "id": "riptidehacks", + "id": "tridenthacks", "version": "${version}", "name": "RiptideHacks", "description": "", "authors": [], "contact": { - "repo": "https://github.com/KaseToatz1337/RiptideHacks" + "repo": "https://github.com/KaseToatz1337/TridentHacks" }, "license": "MIT", "environment": "*", "entrypoints": { "client": [ - "com.kasetoatz.riptidehacks.RiptideHacks" + "com.kasetoatz.tridenthacks.TridentHacks" ], "main": [] }, "mixins": [ - "riptidehacks.mixins.json" + "tridenthacks.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}", diff --git a/src/main/resources/riptidehacks.mixins.json b/src/main/resources/tridenthacks.mixins.json similarity index 67% rename from src/main/resources/riptidehacks.mixins.json rename to src/main/resources/tridenthacks.mixins.json index 724f555..005d584 100644 --- a/src/main/resources/riptidehacks.mixins.json +++ b/src/main/resources/tridenthacks.mixins.json @@ -1,16 +1,17 @@ { "required": true, "minVersion": "0.8", - "package": "com.kasetoatz.riptidehacks.mixin", + "package": "com.kasetoatz.tridenthacks.mixin", "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ + "ClientConnectionMixin", "EnchantmentHelperMixin", "EntityMixin", "LivingEntityMixin", + "PlayerInventoryMixin", "PlayerMoveC2SPacketMixin", - "TridentItemMixin", - "ClientConnectionMixin" + "TridentItemMixin" ], "injectors": { "defaultRequire": 1