From c6643a65d920fa966b57bdc3ea9e78a9e5d7d791 Mon Sep 17 00:00:00 2001 From: Jared Date: Sun, 30 Oct 2016 21:47:15 +0200 Subject: [PATCH] Class registry fix --- .../minetweaker/mc1102/MineTweakerMod.java | 3 -- .../mc1102/oredict/MCOreDictEntry.java | 4 +- .../mc1102/util/MineTweakerHacks.java | 4 +- .../zenscript/type/ZenTypeNative.java | 45 +++++-------------- .../zenscript/type/natives/JavaMethod.java | 1 - 5 files changed, 16 insertions(+), 41 deletions(-) diff --git a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java index 90ef1d2..ab0d508 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java @@ -122,7 +122,6 @@ public class MineTweakerMod { String[] classNames = new String[]{ZenExpansion.class.getCanonicalName(), ZenClass.class.getCanonicalName(), BracketHandler.class.getCanonicalName()}; for(String name : classNames) { ev.getAsmData().getAll(name).forEach(clazz -> { - try { Class asmClass = Class.forName(clazz.getClassName()); apiClasses.add(asmClass); @@ -131,8 +130,6 @@ public class MineTweakerMod { } }); } - -// ClassRegistry.getClasses(apiClasses); for(Class cls : apiClasses) { registerClass(cls); } diff --git a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/oredict/MCOreDictEntry.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/oredict/MCOreDictEntry.java index 99348bf..184bd84 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/oredict/MCOreDictEntry.java @@ -31,7 +31,7 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; public class MCOreDictEntry implements IOreDictEntry { private static final List> OREDICT_CONTENTS = MineTweakerHacks.getOreIdStacks(); - private static final List> OREDICT_CONTENTS_UN = MineTweakerHacks.getOreIdStacksUn(); + private static final List> OREDICT_CONTENTS_UN = MineTweakerHacks.getOreIdStacksUn(); private final String id; @@ -301,7 +301,7 @@ public class MCOreDictEntry implements IOreDictEntry { private final String idSource; private final ArrayList targetCopy; - private final ArrayList targetCopyUn; + private final List targetCopyUn; public ActionMirror(String idTarget, String idSource) { this.idTarget = idTarget; diff --git a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/util/MineTweakerHacks.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/util/MineTweakerHacks.java index ce5555d..f5b4189 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/util/MineTweakerHacks.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/util/MineTweakerHacks.java @@ -134,9 +134,9 @@ public class MineTweakerHacks{ } } - public static List> getOreIdStacksUn(){ + public static List> getOreIdStacksUn(){ try{ - return (List>) OREDICTIONARY_IDTOSTACKUN.get(null); + return (List>) OREDICTIONARY_IDTOSTACKUN.get(null); }catch(IllegalAccessException ex){ MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); return null; diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java index d56ace4..06102ea 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeNative.java @@ -6,43 +6,16 @@ package stanhebben.zenscript.type; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Queue; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import stanhebben.zenscript.TypeExpansion; -import stanhebben.zenscript.annotations.ZenCaster; -import stanhebben.zenscript.annotations.CompareType; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.IterableList; -import stanhebben.zenscript.annotations.IterableMap; -import stanhebben.zenscript.annotations.IterableSimple; -import stanhebben.zenscript.annotations.ZenOperator; -import stanhebben.zenscript.annotations.OperatorType; -import stanhebben.zenscript.annotations.ZenMemberGetter; -import stanhebben.zenscript.annotations.ZenMemberSetter; -import stanhebben.zenscript.annotations.ZenSetter; -import stanhebben.zenscript.annotations.ZenMethod; +import stanhebben.zenscript.annotations.*; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.compiler.IEnvironmentMethod; import stanhebben.zenscript.compiler.ITypeRegistry; -import stanhebben.zenscript.expression.Expression; -import stanhebben.zenscript.expression.ExpressionArithmeticUnary; -import stanhebben.zenscript.expression.ExpressionCallVirtual; -import stanhebben.zenscript.expression.ExpressionCompareGeneric; -import stanhebben.zenscript.expression.ExpressionInvalid; -import stanhebben.zenscript.expression.ExpressionNull; -import stanhebben.zenscript.expression.ExpressionString; +import stanhebben.zenscript.expression.*; import stanhebben.zenscript.expression.partial.IPartialExpression; import stanhebben.zenscript.type.casting.CastingNotNull; import stanhebben.zenscript.type.casting.CastingRuleNone; @@ -56,14 +29,20 @@ import stanhebben.zenscript.type.natives.JavaMethod; import stanhebben.zenscript.type.natives.ZenNativeCaster; import stanhebben.zenscript.type.natives.ZenNativeMember; import stanhebben.zenscript.type.natives.ZenNativeOperator; -import static stanhebben.zenscript.util.AnyClassWriter.throwCastException; -import static stanhebben.zenscript.util.AnyClassWriter.throwUnsupportedException; import stanhebben.zenscript.util.IAnyDefinition; import stanhebben.zenscript.util.MethodOutput; import stanhebben.zenscript.util.ZenPosition; +import stanhebben.zenscript.value.IAny; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.*; + +import static stanhebben.zenscript.util.AnyClassWriter.throwCastException; +import static stanhebben.zenscript.util.AnyClassWriter.throwUnsupportedException; import static stanhebben.zenscript.util.ZenTypeUtil.internal; import static stanhebben.zenscript.util.ZenTypeUtil.signature; -import stanhebben.zenscript.value.IAny; /** * @@ -153,7 +132,7 @@ public class ZenTypeNative extends ZenType { } } } - +//TODO check this for (Method method : cls.getMethods()) { boolean isMethod = fully; String methodName = method.getName(); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java b/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java index ea73371..9e69b44 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java @@ -181,7 +181,6 @@ public class JavaMethod implements IJavaMethod { optional = new boolean[parameterTypes.length]; for (int i = 0; i < parameterTypes.length; i++) { parameterTypes[i] = types.getType(method.getGenericParameterTypes()[i]); - optional[i] = false; for (Annotation annotation : method.getParameterAnnotations()[i]) { if (annotation instanceof Optional) {