From 37b5a2ec92555a79f5d1437cac94c609c260c939 Mon Sep 17 00:00:00 2001 From: Astrash Date: Tue, 12 Sep 2023 13:42:23 +1000 Subject: [PATCH] Use static ints instead of enum --- .../terrascript/codegen/asm/OpcodeAlias.java | 27 ++++++++----------- .../asm/TerraScriptClassGenerator.java | 4 +-- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/OpcodeAlias.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/OpcodeAlias.java index fa5982c28..baee63e5f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/OpcodeAlias.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/OpcodeAlias.java @@ -3,20 +3,15 @@ package com.dfsek.terra.addons.terrascript.codegen.asm; import org.objectweb.asm.Opcodes; -public enum OpcodeAlias { - CMP_GREATER_THAN(Opcodes.IFGT), - CMP_GREATER_EQUALS(Opcodes.IFGE), - CMP_LESS_THAN(Opcodes.IFLT), - CMP_LESS_EQUALS(Opcodes.IFLE), - CMP_EQUALS(Opcodes.IFEQ), - CMP_NOT_EQUALS(Opcodes.IFNE), - BOOL_FALSE(Opcodes.IFEQ), - BOOL_TRUE(Opcodes.IFNE), - INTEGERS_EQUAL(Opcodes.IF_ICMPEQ), - INTEGERS_NOT_EQUAL(Opcodes.IF_ICMPNE), - ; - - public final int opcode; - - OpcodeAlias(int opcode) { this.opcode = opcode; } +public class OpcodeAlias { + public static int CMP_GREATER_THAN = Opcodes.IFGT; + public static int CMP_GREATER_EQUALS = Opcodes.IFGE; + public static int CMP_LESS_THAN = Opcodes.IFLT; + public static int CMP_LESS_EQUALS = Opcodes.IFLE; + public static int CMP_EQUALS = Opcodes.IFEQ; + public static int CMP_NOT_EQUALS = Opcodes.IFNE; + public static int BOOL_FALSE = Opcodes.IFEQ; + public static int BOOL_TRUE = Opcodes.IFNE; + public static int INTEGERS_EQUAL = Opcodes.IF_ICMPEQ; + public static int INTEGERS_NOT_EQUAL = Opcodes.IF_ICMPNE; } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/TerraScriptClassGenerator.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/TerraScriptClassGenerator.java index 5bc1e958e..87675b0c0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/TerraScriptClassGenerator.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/TerraScriptClassGenerator.java @@ -466,8 +466,8 @@ public class TerraScriptClassGenerator { method.visitInsn(Opcodes.ICONST_0); } - private void jumpIf(OpcodeAlias insn, Label label) { - method.visitJumpInsn(insn.opcode, label); + private void jumpIf(int opcode, Label label) { + method.visitJumpInsn(opcode, label); } private void jump(Label label) {