Skip to content

Refactor involving opcodes #250

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
CiroZDP wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor involving opcodes #250

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
61 changes: 19 additions & 42 deletions src/main/java/org/mcphackers/mcp/tools/injector/GLConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,51 +51,28 @@ public GLConstants(ClassVisitor classVisitor) {
super(classVisitor);
}

private static boolean isICmp(int opcode) {
switch (opcode) {
case Opcodes.IF_ICMPEQ:
case Opcodes.IF_ICMPGE:
case Opcodes.IF_ICMPGT:
case Opcodes.IF_ICMPLE:
case Opcodes.IF_ICMPLT:
case Opcodes.IF_ICMPNE:
return true;
}
return false;
private static boolean isICmp(final int opcode) {
return opcode >= Opcodes.IF_ICMPEQ
&& opcode <= Opcodes.IF_ICMPLE;
}

public static Integer intValue(AbstractInsnNode insn) {
if (insn.getOpcode() == Opcodes.ICONST_0) {
return 0;
}
if (insn.getOpcode() == Opcodes.ICONST_1) {
return 1;
}
if (insn.getOpcode() == Opcodes.ICONST_2) {
return 2;
}
if (insn.getOpcode() == Opcodes.ICONST_3) {
return 3;
}
if (insn.getOpcode() == Opcodes.ICONST_4) {
return 4;
}
if (insn.getOpcode() == Opcodes.ICONST_5) {
return 5;
}
if (insn.getOpcode() == Opcodes.ICONST_M1) {
return -1;
}
if (insn.getOpcode() == Opcodes.SIPUSH || insn.getOpcode() == Opcodes.BIPUSH) {
return ((IntInsnNode) insn).operand;
}
if (insn.getOpcode() == Opcodes.LDC) {
LdcInsnNode ldc = (LdcInsnNode) insn;
if (ldc.cst instanceof Integer) {
return (Integer) ldc.cst;
}
public static Integer intValue(final AbstractInsnNode insn) {
final int cnst = insn.getOpcode() - Opcodes.ICONST_0;
if (cnst >= 0 && cnst <= 5) return cnst;

switch (insn.getOpcode()) {
case Opcodes.ICONST_M1:
return -1;
case Opcodes.SIPUSH:
case Opcodes.BIPUSH:
return ((IntInsnNode) insn).operand;
case Opcodes.LDC:
final LdcInsnNode ldc = (LdcInsnNode) insn;
if (ldc.cst instanceof Integer)
return (Integer) ldc.cst;
default:
return null;
}
return null;
}

public static FieldInsnNode getKeyboardInsn(int constant) {
Expand Down
Loading