diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java index ac1ea60..52e5e94 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java @@ -6,32 +6,22 @@ package minetweaker.runtime; -import minetweaker.IBracketHandler; -import minetweaker.IRecipeRemover; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import stanhebben.zenscript.IZenCompileEnvironment; -import stanhebben.zenscript.IZenErrorLogger; -import stanhebben.zenscript.TypeExpansion; -import stanhebben.zenscript.annotations.ZenExpansion; -import stanhebben.zenscript.compiler.ClassNameGenerator; -import stanhebben.zenscript.compiler.IEnvironmentGlobal; -import stanhebben.zenscript.compiler.TypeRegistry; -import stanhebben.zenscript.expression.partial.IPartialExpression; -import stanhebben.zenscript.parser.Token; +import minetweaker.*; +import minetweaker.api.item.*; +import stanhebben.zenscript.*; +import stanhebben.zenscript.annotations.*; +import stanhebben.zenscript.compiler.*; +import stanhebben.zenscript.expression.partial.*; +import stanhebben.zenscript.parser.*; import stanhebben.zenscript.symbols.*; -import stanhebben.zenscript.type.ZenType; -import stanhebben.zenscript.type.ZenTypeNative; -import stanhebben.zenscript.type.natives.IJavaMethod; -import stanhebben.zenscript.type.natives.JavaMethod; -import stanhebben.zenscript.util.ZenPosition; +import stanhebben.zenscript.type.*; +import stanhebben.zenscript.type.natives.*; +import stanhebben.zenscript.util.*; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Type; +import java.lang.annotation.*; +import java.lang.reflect.*; import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.util.logging.*; /** * @@ -89,12 +79,15 @@ public class GlobalRegistry { } public static void registerNativeClass(Class cls) { + //MineTweakerAPI.logInfo("Registering class: " + cls); try { + ZenTypeNative type = new ZenTypeNative(cls); type.complete(types); root.put(type.getName(), new SymbolType(type), errors); } catch (Throwable ex) { + MineTweakerAPI.logError("Error for " + cls, ex); ex.printStackTrace(); } } @@ -162,7 +155,36 @@ public class GlobalRegistry { MineTweakerAPI.logWarning(position + ": " + message); } } - } + + @Override + public void info(ZenPosition position, String message) { + if (position == null) { + MineTweakerAPI.logInfo("system: " + message); + } else { + MineTweakerAPI.logInfo(position + ": " + message); + } + } + + @Override + public void error(String message) { + error(null, message); + } + + @Override + public void error(String message, Throwable e) { + error(null, message); + } + + @Override + public void warning(String message) { + warning(null, message); + } + + @Override + public void info(String message) { + info(null, message); + } + } private static class MyCompileEnvironment implements IZenCompileEnvironment { @Override @@ -179,11 +201,6 @@ public class GlobalRegistry { } } - @Override - public IZenSymbol getDollar(String name) { - return null; - } - @Override public IZenSymbol getBracketed(IEnvironmentGlobal environment, List tokens) { return resolveBracket(environment, tokens); @@ -198,7 +215,13 @@ public class GlobalRegistry { public TypeExpansion getExpansion(String type) { return expansions.get(type); } - } + + @Override + public void setRegistry(IZenRegistry registry) { + //NO-OP + throw new UnsupportedOperationException("Registry is not local"); + } + } private static class MyGlobalEnvironment implements IEnvironmentGlobal { private final Map classes; @@ -225,8 +248,13 @@ public class GlobalRegistry { public String makeClassName() { return generator.generate(); } - - @Override + + @Override + public String makeClassNameWithMiddleName(String middleName) { + return generator.generateWithMiddleName(middleName); + } + + @Override public boolean containsClass(String name) { return classes.containsKey(name); } @@ -275,6 +303,30 @@ public class GlobalRegistry { public void warning(ZenPosition position, String message) { MineTweakerAPI.logWarning(position.toString() + " > " + message); } + + @Override + public void info(ZenPosition position, String message) { + MineTweakerAPI.logInfo(position.toString() + " > " + message); + } + + public void error(String message) { + MineTweakerAPI.logError(message); + } + + @Override + public void error(String message, Throwable e) { + MineTweakerAPI.logError(message, e); + } + + @Override + public void warning(String message) { + MineTweakerAPI.logWarning(message); + } + + @Override + public void info(String message) { + MineTweakerAPI.logInfo(message); + } @Override public Set getClassNames() { diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java index 4b8a56c..d55fe7e 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java @@ -20,6 +20,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.charset.*; import java.util.*; import static stanhebben.zenscript.ZenModule.compileScripts; @@ -126,12 +127,12 @@ public class MTTweaker implements ITweaker { while (script.next()) { Reader reader = null; try { - reader = new InputStreamReader(new BufferedInputStream(script.open()), "UTF-8"); + reader = new InputStreamReader(new BufferedInputStream(script.open()), StandardCharsets.UTF_8); String filename = script.getName(); String className = extractClassName(filename); - ZenTokener parser = new ZenTokener(reader, environmentGlobal.getEnvironment()); + ZenTokener parser = new ZenTokener(reader, environmentGlobal.getEnvironment(), filename, false); ZenParsedFile pfile = new ZenParsedFile(filename, className, parser, environmentGlobal); files.add(pfile); } catch (IOException ex) { @@ -146,7 +147,7 @@ public class MTTweaker implements ITweaker { if (reader != null) { try { reader.close(); - } catch (IOException ex) { + } catch (IOException ignored) { } } } diff --git a/MineTweaker3-MC1102-Mod-JEI/build.gradle b/MineTweaker3-MC1102-Mod-JEI/build.gradle index 13b7c07..43d4c50 100644 --- a/MineTweaker3-MC1102-Mod-JEI/build.gradle +++ b/MineTweaker3-MC1102-Mod-JEI/build.gradle @@ -43,7 +43,7 @@ dependencies { compile project(':ZenScript') compile project(':MineTweaker3-API') compile project(':MineTweaker3-MC1102-Main') - deobfCompile "mezz.jei:jei_1.10.2:3.9.7.260" + compile "mezz.jei:jei_1.10.2:3.9.7.260" } task makeRegistry(type: RegisterZenClassesTask) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index e2da180..fd312ed 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -31,7 +31,7 @@ import minetweaker.mc1710.server.MCServer; import minetweaker.mc1710.util.MineTweakerHacks; import minetweaker.mc1710.util.MineTweakerPlatformUtils; import minetweaker.mc1710.vanilla.MCVanilla; -import minetweaker.runtime.IScriptProvider; +import minetweaker.runtime.*; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; import minetweaker.runtime.providers.ScriptProviderDirectory; diff --git a/MineTweaker3-MC1710-Mod-NEI/build.gradle b/MineTweaker3-MC1710-Mod-NEI/build.gradle index 5baac03..88d8f00 100644 --- a/MineTweaker3-MC1710-Mod-NEI/build.gradle +++ b/MineTweaker3-MC1710-Mod-NEI/build.gradle @@ -21,6 +21,7 @@ apply plugin: 'forge' minecraft { version = forgeVersion1710 + mappings = "stable_12" } version = "1.0" diff --git a/MineTweaker3-MC18-Mod-JEI/build.gradle b/MineTweaker3-MC18-Mod-JEI/build.gradle index cafff73..c7c6890 100644 --- a/MineTweaker3-MC18-Mod-JEI/build.gradle +++ b/MineTweaker3-MC18-Mod-JEI/build.gradle @@ -38,7 +38,7 @@ dependencies { compile project(':ZenScript') compile project(':MineTweaker3-API') compile project(':MineTweaker3-MC18-Main') - deobfCompile "mezz.jei:jei_1.8.9:2.28.18.186" + compile "mezz.jei:jei_1.8.9:2.28.18.186" } task makeRegistry(type: RegisterZenClassesTask) { diff --git a/build.gradle b/build.gradle index 193040a..0959912 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ uploadArchives { } task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') { - gradleVersion = '2.6' + gradleVersion = '3.0' } subprojects.each { subproject -> evaluationDependsOn( subproject.path ) } diff --git a/gradle.properties b/gradle.properties index d5572d5..b10b9c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -org.gradle.configureondemand=true \ No newline at end of file +org.gradle.configureondemand=true +org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..e8c6bf7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848..e54dad4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Wed Oct 16 21:11:58 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..97fac78 100644 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`