- Refactored code into different packages

- Fixed some non-static expansion methods
- Fixed scripts not reloading properly
- Implemented mod support build system
- Fixed recipe removal breaking on recipes without predefined output
- Fixed NPE on parsing a bracket expression that doesn't exist - now prints an appropriate error
This commit is contained in:
Stan Hebben committed 2014-06-21 18:51:11 +02:00
1 parent 1789aa74b5
commit 2de467d7d8
93 files changed
+321 -262

No files matched your search

@@ -18,21 +18,33 @@ import java.util.logging.Logger;
import minetweaker.IBracketHandler;
import minetweaker.IRecipeRemover;
import minetweaker.MineTweakerAPI;
import minetweaker.minecraft.data.IData;
import minetweaker.minecraft.item.Condition;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemCondition;
import minetweaker.minecraft.item.IItemDefinition;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.item.IItemTransformer;
import minetweaker.minecraft.item.Transform;
import minetweaker.minecraft.liquid.ILiquidDefinition;
import minetweaker.minecraft.liquid.ILiquidStack;
import minetweaker.minecraft.oredict.IOreDict;
import minetweaker.minecraft.oredict.IOreDictEntry;
import minetweaker.minecraft.recipes.ICraftingInventory;
import minetweaker.minecraft.recipes.IFurnaceManager;
import minetweaker.minecraft.recipes.IRecipeFunction;
import minetweaker.expand.ExpandAnyArray;
import minetweaker.expand.ExpandAnyDict;
import minetweaker.expand.ExpandBool;
import minetweaker.expand.ExpandByte;
import minetweaker.expand.ExpandDouble;
import minetweaker.expand.ExpandFloat;
import minetweaker.expand.ExpandInt;
import minetweaker.expand.ExpandLong;
import minetweaker.expand.ExpandShort;
import minetweaker.expand.ExpandString;
import minetweaker.api.data.IData;
import minetweaker.api.item.Condition;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemCondition;
import minetweaker.api.item.IItemDefinition;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IItemTransformer;
import minetweaker.api.item.Transform;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDict;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.player.IPlayer;
import minetweaker.api.recipes.ICraftingInventory;
import minetweaker.api.recipes.IFurnaceManager;
import minetweaker.api.recipes.IRecipeFunction;
import minetweaker.api.recipes.IRecipeManager;
import stanhebben.zenscript.IZenErrorLogger;
import stanhebben.zenscript.TypeExpansion;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -77,7 +89,7 @@ public class GlobalRegistry {
registerGlobal("furnace", getStaticField(MineTweakerAPI.class, "furnace"));
registerGlobal("oreDict", getStaticField(MineTweakerAPI.class, "oreDict"));
/*registerExpansion(ExpandAnyArray.class);
registerExpansion(ExpandAnyArray.class);
registerExpansion(ExpandAnyDict.class);
registerExpansion(ExpandBool.class);
registerExpansion(ExpandByte.class);
@@ -86,10 +98,12 @@ public class GlobalRegistry {
registerExpansion(ExpandInt.class);
registerExpansion(ExpandLong.class);
registerExpansion(ExpandShort.class);
registerExpansion(ExpandString.class);*/
registerExpansion(ExpandString.class);
// minetweaker.api.data
registerNativeClass(IData.class);
// minetweaker.api.item
registerNativeClass(IIngredient.class);
registerNativeClass(IItemCondition.class);
registerNativeClass(IItemDefinition.class);
@@ -98,15 +112,22 @@ public class GlobalRegistry {
registerNativeClass(Condition.class);
registerNativeClass(Transform.class);
// minetweaker.api.liquid
registerNativeClass(ILiquidDefinition.class);
registerNativeClass(ILiquidStack.class);
// minetweaker.api.oredict
registerNativeClass(IOreDict.class);
registerNativeClass(IOreDictEntry.class);
// minetweaker.api.player
registerNativeClass(IPlayer.class);
// minetweaker.api.recipes
registerNativeClass(ICraftingInventory.class);
registerNativeClass(IFurnaceManager.class);
registerNativeClass(IRecipeFunction.class);
registerNativeClass(IRecipeManager.class);
}
private GlobalRegistry() {}
@@ -9,7 +9,7 @@ package minetweaker.runtime;
import java.io.Closeable;
import java.util.List;
import minetweaker.IUndoableAction;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.api.item.IIngredient;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -19,7 +19,7 @@ import java.util.Map;
import java.util.Set;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.api.item.IIngredient;
import minetweaker.runtime.providers.ScriptProviderMemory;
import stanhebben.zenscript.ZenModule;
import static stanhebben.zenscript.ZenModule.compileScripts;
@@ -62,6 +62,7 @@ public class Tweaker implements IMineTweaker {
MineTweakerAPI.logger.logInfo(action.describeUndo());
action.undo();
} else {
MineTweakerAPI.logger.logInfo("[Stuck] " + action.describe());
stuck.add(0, action);
wereStuck.add(action);
}
@@ -108,7 +109,7 @@ public class Tweaker implements IMineTweaker {
} catch (ParseException ex) {
MineTweakerAPI.logger.logError("Error parsing " + ex.getFile() + ":" + ex.getLine() + " -- " + ex.getExplanation());
} catch (Exception ex) {
MineTweakerAPI.logger.logError("Error loading " + script.getName() + ": " + ex.getMessage());
MineTweakerAPI.logger.logError("Error loading " + script.getName() + ": " + ex.toString());
ex.printStackTrace();
}
@@ -22,7 +22,7 @@ import java.util.Set;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
import minetweaker.MineTweakerAPI;
import minetweaker.minecraft.util.FileUtil;
import minetweaker.util.FileUtil;
import minetweaker.runtime.IScriptIterator;
import minetweaker.runtime.IScriptProvider;