From 2c24f3f77ae879b52aaabfbe79d7cb261da1b581 Mon Sep 17 00:00:00 2001 From: Jared Date: Thu, 5 May 2016 01:30:36 +0200 Subject: [PATCH] Added a few checks --- .../MineTweakerImplementationAPI.java | 3 ++ .../java/minetweaker/api/item/IItemStack.java | 11 ++----- .../api/tooltip/IngredientTooltips.java | 4 +-- .../minetweaker/mc19/ForgeEventHandler.java | 4 ++- .../java/stanhebben/zenscript/ZenModule.java | 30 ++++++------------- 5 files changed, 20 insertions(+), 32 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 19756d0..ff23a10 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -685,7 +685,9 @@ public class MineTweakerImplementationAPI { platform.distributeScripts(MineTweakerAPI.tweaker.getScriptData()); } + ONPOSTRELOAD.publish(new ReloadEvent()); + } /** @@ -720,6 +722,7 @@ public class MineTweakerImplementationAPI { } + // ###################### // ### Action classes ### // ###################### diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java index de637a7..4bca64c 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java @@ -1,17 +1,12 @@ package minetweaker.api.item; -import java.util.List; import minetweaker.api.block.IBlock; import minetweaker.api.data.IData; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; -import stanhebben.zenscript.annotations.OperatorType; -import stanhebben.zenscript.annotations.ZenCaster; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.ZenMethod; -import stanhebben.zenscript.annotations.ZenOperator; -import stanhebben.zenscript.annotations.ZenSetter; +import stanhebben.zenscript.annotations.*; + +import java.util.List; /** * Contains an item stack. An item stack consists of an item definition, a meta diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java b/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java index e72765d..1d7f222 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java @@ -6,7 +6,6 @@ package minetweaker.api.tooltip; -import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.formatting.IFormattedText; @@ -17,6 +16,8 @@ import minetweaker.api.util.IngredientMap.IngredientMapEntry; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; +import java.util.List; + /** * * @author Stan @@ -52,7 +53,6 @@ public class IngredientTooltips { private final IIngredient ingredient; private final IFormattedText tooltip; private final boolean shift; - private IngredientMapEntry entry; public AddTooltipAction(IIngredient ingredient, IFormattedText tooltip, boolean shift) { diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java index 9f2fea8..a69f42e 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java +++ b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java @@ -34,7 +34,9 @@ public class ForgeEventHandler{ for(IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)){ ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString()); } - + if (!Keyboard.isCreated()) { + return; + } if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)){ for(IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)){ ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString()); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java b/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java index b2b25c7..868e92a 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/ZenModule.java @@ -1,28 +1,9 @@ package stanhebben.zenscript; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; -import stanhebben.zenscript.compiler.ClassNameGenerator; -import stanhebben.zenscript.compiler.EnvironmentClass; -import stanhebben.zenscript.compiler.EnvironmentGlobal; -import stanhebben.zenscript.compiler.EnvironmentMethod; -import stanhebben.zenscript.compiler.IEnvironmentGlobal; -import stanhebben.zenscript.compiler.IEnvironmentMethod; +import stanhebben.zenscript.compiler.*; import stanhebben.zenscript.definitions.ParsedFunction; import stanhebben.zenscript.definitions.ParsedFunctionArgument; import stanhebben.zenscript.statements.Statement; @@ -31,6 +12,12 @@ import stanhebben.zenscript.symbols.SymbolArgument; import stanhebben.zenscript.symbols.SymbolZenStaticMethod; import stanhebben.zenscript.type.ZenType; import stanhebben.zenscript.util.MethodOutput; + +import java.io.*; +import java.util.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + import static stanhebben.zenscript.util.ZenTypeUtil.internal; /** @@ -149,7 +136,7 @@ public class ZenModule { if (debug) { try { File outputDir = new File("generated"); - outputDir.mkdir(); + outputDir.mkdir(); for (String className : environmentGlobal.getClassNames()) { File outputFile = new File(outputDir, className.replace('.', '/') + ".class"); @@ -289,6 +276,7 @@ public class ZenModule { */ public Runnable getMain() { try { + return (Runnable) classLoader.loadClass("__ZenMain__").newInstance(); } catch (InstantiationException e) { return null;