Skip to content

Change EntityPlayer ASM code for Java 21+ compat #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jchung01 wants to merge 1 commit into
base: 1.12
Choose a base branch
from
Open

Change EntityPlayer ASM code for Java 21+ compat #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/main/java/zmaster587/advancedRocketry/asm/ClassTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,20 +686,17 @@ public byte[] transform(String name, String transformedName,
LabelNode label = new LabelNode();
AbstractInsnNode pos;
AbstractInsnNode ain = null;
int numSpec = 1;
int numAload = 7;

for (int i = 0; i < onUpdate.instructions.size(); i++) {
ain = onUpdate.instructions.get(i);
if (ain.getOpcode() == Opcodes.INVOKESPECIAL && numSpec-- == 0) {

if (ain.getOpcode() == Opcodes.GETFIELD && ((FieldInsnNode) ain).name.equals(obf ? "by" : "openContainer")) {
ain = ain.getPrevious();
while (i < onUpdate.instructions.size()) {
pos = onUpdate.instructions.get(i++);
if (pos.getOpcode() == Opcodes.ALOAD && numAload-- == 0) {
label = (LabelNode) pos.getPrevious().getPrevious().getPrevious();
if (pos.getOpcode() == Opcodes.PUTFIELD && ((FieldInsnNode) pos).name.equals(obf ? "by" : "openContainer")) {
label = (LabelNode) pos.getNext();
break;
}

}
break;
}
Expand All @@ -711,7 +708,7 @@ public byte[] transform(String name, String transformedName,
nodeAdd.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "zmaster587/advancedRocketry/util/RocketInventoryHelper", "allowAccess", "(Ljava/lang/Object;)Z", false));
nodeAdd.add(new JumpInsnNode(Opcodes.IFEQ, label));

onUpdate.instructions.insert(ain, nodeAdd);
onUpdate.instructions.insertBefore(ain, nodeAdd);

//onUpdate.instructions.insertBefore(pos, label);

Expand Down