diff --git a/MineTweaker3-API/build.gradle b/MineTweaker3-API/build.gradle index 3aacadb..9a80127 100644 --- a/MineTweaker3-API/build.gradle +++ b/MineTweaker3-API/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'maven' version = ext.mineTweakerVersion -sourceCompatibility = '1.6' -targetCompatibility = '1.6' +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 task makeRegistry(type: RegisterZenClassesTask) { inputDir = file('build/classes/main') diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index 127eb6d..6e28765e 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -70,12 +70,12 @@ public class MineTweakerAPI { }; static { - List apiClasses = new ArrayList(); - ClassRegistry.getClasses(apiClasses); - - for (Class cls : apiClasses) { - registerClass(cls); - } +// List apiClasses = new ArrayList(); +// ClassRegistry.getClasses(apiClasses); +// +// for (Class cls : apiClasses) { +// registerClass(cls); +// } registerGlobalSymbol("logger", getJavaStaticGetterSymbol(MineTweakerAPI.class, "getLogger")); registerGlobalSymbol("recipes", getJavaStaticFieldSymbol(MineTweakerAPI.class, "recipes")); diff --git a/MineTweaker3-MC1102-Main/build.gradle b/MineTweaker3-MC1102-Main/build.gradle index 553f276..bb37001 100644 --- a/MineTweaker3-MC1102-Main/build.gradle +++ b/MineTweaker3-MC1102-Main/build.gradle @@ -1,5 +1,8 @@ import minetweaker.tasks.RegisterZenClassesTask; + + + buildscript { repositories { jcenter() @@ -15,6 +18,9 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'maven' +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + version = "1.10.2-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name @@ -87,4 +93,4 @@ uploadArchives { } } } -} \ No newline at end of file +} 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 fd0b2d0..90ef1d2 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java @@ -8,6 +8,7 @@ package minetweaker.mc1102; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.annotations.BracketHandler; import minetweaker.api.logger.FileLogger; import minetweaker.mc1102.brackets.ItemBracketHandler; import minetweaker.mc1102.brackets.LiquidBracketHandler; @@ -41,10 +42,16 @@ import net.minecraftforge.fml.common.event.*; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenExpansion; import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +import static minetweaker.MineTweakerAPI.registerClass; /** * Main mod class. Performs some general logic, initialization of the API and @@ -82,7 +89,7 @@ public class MineTweakerMod { MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; File globalDir = new File("scripts"); - if (!globalDir.exists()) + if(!globalDir.exists()) globalDir.mkdirs(); scriptsIMC = new ScriptProviderCustom("intermod"); scriptsGlobal = new ScriptProviderDirectory(globalDir); @@ -95,11 +102,11 @@ public class MineTweakerMod { @EventHandler public void onIMCEvent(FMLInterModComms.IMCEvent event) { - for (final FMLInterModComms.IMCMessage imcMessage : event.getMessages()) { - if (imcMessage.key.equalsIgnoreCase("addMineTweakerScript")) { - if (imcMessage.isStringMessage()) { + for(final FMLInterModComms.IMCMessage imcMessage : event.getMessages()) { + if(imcMessage.key.equalsIgnoreCase("addMineTweakerScript")) { + if(imcMessage.isStringMessage()) { scriptsIMC.add(imcMessage.getSender() + "::imc", imcMessage.getStringValue()); - } else if (imcMessage.isNBTMessage()) { + } else if(imcMessage.isNBTMessage()) { NBTTagCompound message = imcMessage.getNBTValue(); scriptsIMC.add(imcMessage.getSender() + "::" + message.getString("name"), message.getString("content")); } @@ -111,14 +118,24 @@ public class MineTweakerMod { public void onLoad(FMLPreInitializationEvent ev) { MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); FMLCommonHandler.instance().bus().register(new FMLEventHandler()); -// for (ASMDataTable.ASMData data : ev.getAsmData().getAll(ZenExpansion.class.getCanonicalName())) { -// try { -// Class asmClass = Class.forName(data.getClassName()); -// MineTweakerAPI.registerClass(asmClass); -// } catch (ClassNotFoundException e) { -// e.printStackTrace(); -// } -// } + List apiClasses = new ArrayList(); + 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); + } catch(ClassNotFoundException e) { + e.printStackTrace(); + } + }); + } + +// ClassRegistry.getClasses(apiClasses); + for(Class cls : apiClasses) { + registerClass(cls); + } } @@ -126,22 +143,22 @@ public class MineTweakerMod { public void onPostInit(FMLPostInitializationEvent ev) { MineTweakerAPI.registerClassRegistry(MineTweakerRegistry.class); - for (int i = 0; i < REGISTRIES.length; i++) { + for(int i = 0; i < REGISTRIES.length; i++) { MineTweakerAPI.registerClassRegistry(REGISTRIES[i], REGISTRY_DESCRIPTIONS[i]); } FuelTweaker.INSTANCE.register(); - if (Loader.isModLoaded("JEI")) { + if(Loader.isModLoaded("JEI")) { try { Method register = Class.forName("minetweaker.mods.jei.JEI").getMethod("onRegister"); register.invoke(null); - } catch (NoSuchMethodException e) { + } catch(NoSuchMethodException e) { e.printStackTrace(); - } catch (ClassNotFoundException e) { + } catch(ClassNotFoundException e) { e.printStackTrace(); - } catch (InvocationTargetException e) { + } catch(InvocationTargetException e) { e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch(IllegalAccessException e) { e.printStackTrace(); } } @@ -170,12 +187,12 @@ public class MineTweakerMod { // starts before loading worlds // perfect place to start MineTweaker! - if (MineTweakerPlatformUtils.isClient()) { + if(MineTweakerPlatformUtils.isClient()) { MineTweakerAPI.client = new MCClient(); } File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); - if (!scriptsDir.exists()) { + if(!scriptsDir.exists()) { scriptsDir.mkdir(); } diff --git a/MineTweaker3-MC1102-Mod-IC2/build.gradle b/MineTweaker3-MC1102-Mod-IC2/build.gradle index 88d1cd0..57e41bd 100644 --- a/MineTweaker3-MC1102-Mod-IC2/build.gradle +++ b/MineTweaker3-MC1102-Mod-IC2/build.gradle @@ -1,5 +1,7 @@ import minetweaker.tasks.RegisterZenClassesTask; + + buildscript { repositories { mavenCentral() @@ -19,6 +21,9 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + version = "1.10.2-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name @@ -42,4 +47,4 @@ task makeRegistry(type: RegisterZenClassesTask) { className = 'minetweaker.mods.ic2.ClassRegistry' } -tasks.jar.dependsOn(makeRegistry) \ No newline at end of file +tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1102-Mod-JEI/build.gradle b/MineTweaker3-MC1102-Mod-JEI/build.gradle index a7c783a..13b7c07 100644 --- a/MineTweaker3-MC1102-Mod-JEI/build.gradle +++ b/MineTweaker3-MC1102-Mod-JEI/build.gradle @@ -1,5 +1,7 @@ import minetweaker.tasks.RegisterZenClassesTask; + + buildscript { repositories { mavenCentral() @@ -19,6 +21,9 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + version = "1.10.2-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name diff --git a/ZenScript/build.gradle b/ZenScript/build.gradle index ee0ea66..dc11e6c 100644 --- a/ZenScript/build.gradle +++ b/ZenScript/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'java' apply plugin: 'maven' version = ext.mineTweakerVersion -sourceCompatibility = '1.6' -targetCompatibility = '1.6' +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 dependencies { compile 'org.ow2.asm:asm-debug-all:5.0.3'