fix entity attributes range (#486)

GTNewHorizons · Feb 7, 2025 · 62bf00c · 62bf00c
1 parent 42fafa8
commit 62bf00c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java b/src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java
@@ -335,6 +335,11 @@ public class FixesConfig {
     @Config.RequiresMcRestart
     public static boolean fixInventorySyncLag;
 
+    @Config.Comment("Prevent the client from crashing due to invalid entity attributes range (MC-150405)")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresMcRestart
+    public static boolean fixEntityAttributesRange;
+
     /* ====== Minecraft fixes end ===== */
 
     // bukkit fixes

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java
@@ -115,6 +115,10 @@ public enum Mixins {
     TRANSPARENT_CHAT(new Builder("Transparent Chat").setPhase(Phase.EARLY)
             .addMixinClasses("minecraft.MixinGuiNewChat_TransparentChat").setSide(Side.CLIENT)
             .setApplyIf(() -> TweaksConfig.transparentChat).addTargetedMod(TargetedMod.VANILLA)),
+    FIX_ENTITY_ATTRIBUTES_RANGE(new Builder("Fix Entity Attributes Range").setPhase(Phase.EARLY)
+            .addMixinClasses("minecraft.MixinNetHandlerPlayClient_FixEntityAttributesRange").setSide(Side.CLIENT)
+            .setApplyIf(() -> FixesConfig.fixEntityAttributesRange).addTargetedMod(TargetedMod.VANILLA)),
+
     // config handled in mixin due to server->client config sync
     LONGER_MESSAGES_CLIENT(new Builder("Longer Messages Client Side").setPhase(Phase.EARLY)
             .addMixinClasses("minecraft.MixinGuiChat_LongerMessages").setApplyIf(() -> true)

diff --git a/...hodgepodge/mixins/early/minecraft/MixinNetHandlerPlayClient_FixEntityAttributesRange.java b/...hodgepodge/mixins/early/minecraft/MixinNetHandlerPlayClient_FixEntityAttributesRange.java
@@ -0,0 +1,25 @@
+package com.mitchej123.hodgepodge.mixins.early.minecraft;
+
+import net.minecraft.client.network.NetHandlerPlayClient;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(NetHandlerPlayClient.class)
+public class MixinNetHandlerPlayClient_FixEntityAttributesRange {
+
+    /**
+     * @author raylras
+     * @reason Prevent the client from crashing due to invalid entity attributes range.
+     *
+     * @see <a href="https://bugs.mojang.com/browse/MC-150405">MC-150405</a>
+     * @see <a href=
+     *      "https://github.com/MinecraftForge/MinecraftForge/commit/05f4f5ec775fbba7cf5c0421041f417dd4c70a36">MinecraftForge
+     *      Patch</a>
+     */
+    @ModifyConstant(method = "handleEntityProperties", constant = @Constant(doubleValue = Double.MIN_NORMAL))
+    private static double hodgepodge$FixEntityAttributesRange(double original) {
+        return -Double.MAX_VALUE;
+    }
+}