Fix resistance overlay

XXMA16 · Mar 3, 2023 · 843e091 · 843e091
1 parent f78c7e3
commit 843e091
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/main/java/com/charles445/rltweaker/asm/patch/PatchPotionCoreResistance.java b/src/main/java/com/charles445/rltweaker/asm/patch/PatchPotionCoreResistance.java
@@ -28,10 +28,8 @@ public void patch(ClassNode clazzNode) {
 						"(Z)Lnet/minecraft/entity/ai/attributes/BaseAttribute;", 3);
 				target = target.getPrevious();
 
-				m_clinit.instructions.insertBefore(target, ASMUtil.listOf(new MethodInsnNode(Opcodes.INVOKESTATIC,
-						"com/charles445/rltweaker/hook/HookPotionCore", "resistance_createAttribute",
-						"(Lnet/minecraft/entity/ai/attributes/RangedAttribute;)Lnet/minecraft/entity/ai/attributes/RangedAttribute;",
-						false)));
+				m_clinit.instructions.insertBefore(target, ASMUtil.listOf(
+						new MethodInsnNode(Opcodes.INVOKESTATIC, "com/charles445/rltweaker/hook/HookPotionCore", "resistance_createAttribute", "(Lnet/minecraft/entity/ai/attributes/RangedAttribute;)Lnet/minecraft/entity/ai/attributes/RangedAttribute;", false)));
 			}
 		});
 
@@ -118,6 +116,24 @@ public void patch(ClassNode clazzNode) {
 						new VarInsnNode(Opcodes.FSTORE, 2)));
 			}
 		});
+
+		add(new Patch(this, "com.tmtravlr.potioncore.PotionCoreEventHandlerClient",
+				ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES) {
+			@Override
+			public void patch(ClassNode clazzNode) {
+				MethodNode m_renderOverlaysPre = this.findMethodWithDesc(clazzNode,
+						"(Lnet/minecraftforge/client/event/RenderGameOverlayEvent$Pre;)V", "renderOverlaysPre");
+
+				AbstractInsnNode target = ASMUtil.findMethodInsn(m_renderOverlaysPre, Opcodes.INVOKEVIRTUAL,
+						"net/minecraft/entity/ai/attributes/IAttributeInstance", "func_111126_e", "getAttributeValue",
+						"()D", 0);
+				target = target.getNext();
+				target = target.getNext();
+
+				insert(m_renderOverlaysPre, target, ASMUtil.listOf(
+						new MethodInsnNode(Opcodes.INVOKESTATIC, "com/charles445/rltweaker/hook/HookPotionCore", "getActualResistance", "(D)D", false)));
+			}
+		});
 	}
 
 }
diff --git a/src/main/java/com/charles445/rltweaker/hook/HookPotionCore.java b/src/main/java/com/charles445/rltweaker/hook/HookPotionCore.java
@@ -122,4 +122,8 @@ public static float postResistancePotionCalculation(EntityLivingBase entity, flo
 		}
 	}
 
+	public static double getActualResistance(double resistance) {
+		return ModConfig.server.potioncore.alternativeResistanceMode ? -resistance : resistance;
+	}
+
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
+    	public static double getActualResistance(double resistance) {
+    		return ModConfig.server.potioncore.alternativeResistanceMode ? -resistance : resistance;
+    	}
     }