From b436befc7655add200d6d154781b4134a439c23d Mon Sep 17 00:00:00 2001 From: kindlich Date: Sat, 19 Oct 2019 13:15:23 +0200 Subject: [PATCH] Set version Number to 3.1.0 --- .../main/java/minetweaker/MineTweakerAPI.java | 21 ++++++------------- .../minetweaker/runtime/GlobalRegistry.java | 3 ++- ZenScript | 2 +- configuration.gradle | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index 6e28765e..7111abd 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -70,12 +70,7 @@ public class MineTweakerAPI { }; static { -// List apiClasses = new ArrayList(); -// ClassRegistry.getClasses(apiClasses); -// -// for (Class cls : apiClasses) { -// registerClass(cls); -// } + registerClassRegistry(ClassRegistry.class, "MT-API"); registerGlobalSymbol("logger", getJavaStaticGetterSymbol(MineTweakerAPI.class, "getLogger")); registerGlobalSymbol("recipes", getJavaStaticFieldSymbol(MineTweakerAPI.class, "recipes")); @@ -260,7 +255,7 @@ public class MineTweakerAPI { try { Method method = registryClass.getMethod("getClasses", List.class); if ((method.getModifiers() & Modifier.STATIC) == 0) { - System.out.println("ERROR: getClasses method in " + registryClass.getName() + " isn't static"); + logError("ERROR: getClasses method in " + registryClass.getName() + " isn't static"); } else { List classes = new ArrayList(); method.invoke(null, classes); @@ -285,16 +280,12 @@ public class MineTweakerAPI { } if (description != null) - System.out.println("Loaded class registry: " + description); + logInfo("Loaded class registry: " + description); } - } catch (NoSuchMethodException ex) { - - } catch (IllegalAccessException ex) { - - } catch (InvocationTargetException ex) { - + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { + logError("Error registering class registry", ex); } - } + } /** * Registers a class registry. Will attempt to resolve the given class name. diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java index 52e5e94..4fb57ba 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java @@ -66,7 +66,8 @@ public class GlobalRegistry { } } } catch (Throwable ex) { - ex.printStackTrace(); + errors.error("Error while applying expansion", ex); + ex.printStackTrace(); } } diff --git a/ZenScript b/ZenScript index b88317d..d6a692b 160000 --- a/ZenScript +++ b/ZenScript @@ -1 +1 @@ -Subproject commit b88317d667ca6f937beeb2a0b1ee71cc3af642a3 +Subproject commit d6a692ba99865798ce3d413cdc5ee93c6307cfec diff --git a/configuration.gradle b/configuration.gradle index 379ae4a..7b75a70 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -4,7 +4,7 @@ import javax.tools.ToolProvider // ### Global settings ### // ####################### -ext.mineTweakerVersion = "3.0.13" +ext.mineTweakerVersion = "3.1.0" if (System.getenv('BUILD_NUMBER') != null) project.mineTweakerVersion += "."+System.getenv('BUILD_NUMBER') else {