Fix resistance and armor bar rendering

XXMA16 · Mar 7, 2023 · 494a55e · 494a55e
1 parent 2fc97db
commit 494a55e
Showing 1 changed file with 13 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
@@ -123,15 +123,24 @@ public void patch(ClassNode clazzNode) {
 			public void patch(ClassNode clazzNode) {
 				MethodNode m_renderOverlaysPre = this.findMethodWithDesc(clazzNode,
 						"(Lnet/minecraftforge/client/event/RenderGameOverlayEvent$Pre;)V", "renderOverlaysPre");
+				MethodNode m_renderOverlaysPost = this.findMethodWithDesc(clazzNode,
+						"(Lnet/minecraftforge/client/event/RenderGameOverlayEvent$Post;)V", "renderOverlaysPost");
 
-				AbstractInsnNode target = ASMUtil.findMethodInsn(m_renderOverlaysPre, Opcodes.INVOKEVIRTUAL,
+				AbstractInsnNode target = ASMUtil.findMethodInsn(m_renderOverlaysPre, Opcodes.INVOKEINTERFACE,
 						"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)));
+				AbstractInsnNode target1 = ASMUtil.findMethodInsn(m_renderOverlaysPost, Opcodes.INVOKEINTERFACE,
+						"net/minecraft/entity/ai/attributes/IAttributeInstance", "func_111126_e", "getAttributeValue",
+						"()D", 1);
+				target1 = target1.getNext();
+				target1 = target1.getNext();
+
+				insert(m_renderOverlaysPre, target, ASMUtil.listOf(new MethodInsnNode(Opcodes.INVOKESTATIC,
+						"com/charles445/rltweaker/hook/HookPotionCore", "getActualResistance", "(D)D", false)));
+				insert(m_renderOverlaysPost, target1, ASMUtil.listOf(new MethodInsnNode(Opcodes.INVOKESTATIC,
+						"com/charles445/rltweaker/hook/HookPotionCore", "getActualResistance", "(D)D", false)));
 			}
 		});
 	}