- 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

@@ -1,6 +1,6 @@
package minetweaker;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.api.item.IIngredient;
/**
* Used to register removable mod recipes for mod machines. Once registered,
@@ -4,9 +4,9 @@ import java.lang.reflect.Field;
import minetweaker.runtime.IMineTweaker;
import minetweaker.runtime.ILogger;
import minetweaker.runtime.Tweaker;
import minetweaker.minecraft.recipes.IRecipeManager;
import minetweaker.minecraft.oredict.IOreDict;
import minetweaker.minecraft.recipes.IFurnaceManager;
import minetweaker.api.recipes.IRecipeManager;
import minetweaker.api.oredict.IOreDict;
import minetweaker.api.recipes.IFurnaceManager;
import minetweaker.runtime.GlobalRegistry;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.ArrayList;
import java.util.Arrays;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.ArrayList;
import java.util.Arrays;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.ArrayList;
import java.util.Collections;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.Collections;
import java.util.HashMap;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -21,7 +21,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan
*/
@ZenClass("minecraft.data.IData")
@ZenClass("minetweaker.data.IData")
public interface IData {
@ZenOperator(OperatorType.ADD)
public IData add(IData other);
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.data;
package minetweaker.api.data;
import java.util.List;
import java.util.Map;
@@ -4,9 +4,9 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan Hebben
*/
@ZenClass("minecraft.item.Condition")
@ZenClass("minetweaker.item.Condition")
public class Condition {
/**
* Requires the item to be damaged. A damage value of 1 is enough.
@@ -1,4 +1,4 @@
package minetweaker.minecraft.item;
package minetweaker.api.item;
import java.util.List;
import stanhebben.zenscript.annotations.OperatorType;
@@ -17,7 +17,7 @@ import stanhebben.zenscript.annotations.ZenOperator;
*
* @author Stan Hebben
*/
@ZenClass("minecraft.item.IIngredient")
@ZenClass("minetweaker.item.IIngredient")
public interface IIngredient {
/**
* Gets the mark of the ingredient. Ingredients can be marked so they can
@@ -1,4 +1,4 @@
package minetweaker.minecraft.item;
package minetweaker.api.item;
import stanhebben.zenscript.annotations.ZenClass;
@@ -10,7 +10,7 @@ import stanhebben.zenscript.annotations.ZenClass;
*
* @author Stan Hebben
*/
@ZenClass("minecraft.item.IItemCondition")
@ZenClass("minetweaker.item.IItemCondition")
public interface IItemCondition {
/**
* Returns true if the given stack matches the required conditions.
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import stanhebben.zenscript.annotations.ZenClass;
@@ -12,7 +12,7 @@ import stanhebben.zenscript.annotations.ZenClass;
*
* @author Stan
*/
@ZenClass("minecraft.item.IItemDefinition")
@ZenClass("minetweaker.item.IItemDefinition")
public interface IItemDefinition {
}
@@ -4,10 +4,10 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import minetweaker.minecraft.data.IData;
import minetweaker.minecraft.liquid.ILiquidStack;
import minetweaker.api.data.IData;
import minetweaker.api.liquid.ILiquidStack;
import stanhebben.zenscript.annotations.OperatorType;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenOperator;
*
* @author Stan
*/
@ZenClass("minecraft.item.IItemStack")
@ZenClass("minetweaker.item.IItemStack")
public interface IItemStack extends IIngredient {
@ZenGetter("definition")
public IItemDefinition getDefinition();
@@ -1,10 +1,4 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -16,7 +10,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan Hebben
*/
@ZenClass("minecraft.item.IItemTransformer")
@ZenClass("minetweaker.item.IItemTransformer")
public interface IItemTransformer {
/**
* Transforms the specified item. May modify this item (and return it)
@@ -4,10 +4,10 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import java.util.List;
import minetweaker.minecraft.util.ArrayUtil;
import minetweaker.util.ArrayUtil;
/**
*
@@ -4,10 +4,10 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import java.util.List;
import minetweaker.minecraft.util.ArrayUtil;
import minetweaker.util.ArrayUtil;
/**
*
@@ -4,11 +4,11 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import java.util.Collections;
import java.util.List;
import minetweaker.minecraft.util.ArrayUtil;
import minetweaker.util.ArrayUtil;
/**
*
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import java.util.List;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.item;
package minetweaker.api.item;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -13,7 +13,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan
*/
@ZenClass("minecraft.item.Transform")
@ZenClass("minetweaker.item.Transform")
public class Transform {
/**
* Makes the item reusable. Prevents consumption of the item upon crafting.
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.liquid;
package minetweaker.api.liquid;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
@@ -16,7 +16,7 @@ import stanhebben.zenscript.annotations.ZenSetter;
*
* @author Stanneke
*/
@ZenClass("minecraft.liquid.ILiquidDefinition")
@ZenClass("minetweaker.liquid.ILiquidDefinition")
public interface ILiquidDefinition {
@ZenOperator(OperatorType.MUL)
public ILiquidStack asStack(int millibuckets);
@@ -4,9 +4,9 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.liquid;
package minetweaker.api.liquid;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -15,7 +15,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stanneke
*/
@ZenClass("minecraft.liquid.ILiquidStack")
@ZenClass("minetweaker.liquid.ILiquidStack")
public interface ILiquidStack {
@ZenGetter("definition")
public ILiquidDefinition getDefinition();
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.oredict;
package minetweaker.api.oredict;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMemberGetter;
@@ -13,7 +13,7 @@ import stanhebben.zenscript.annotations.ZenMemberGetter;
*
* @author Stan
*/
@ZenClass("minecraft.oredict.IOreDict")
@ZenClass("minetweaker.oredict.IOreDict")
public interface IOreDict {
@ZenMemberGetter
public IOreDictEntry get(String name);
@@ -4,10 +4,10 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.oredict;
package minetweaker.api.oredict;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -15,7 +15,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan
*/
@ZenClass("minecraft.oredict.IOreDictEntry")
@ZenClass("minetweaker.oredict.IOreDictEntry")
public interface IOreDictEntry extends IIngredient {
@ZenMethod
public void add(IItemStack item);
@@ -4,15 +4,15 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.oredict;
package minetweaker.api.oredict;
import java.util.List;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemCondition;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.item.IItemTransformer;
import minetweaker.minecraft.item.IngredientStack;
import minetweaker.minecraft.util.ArrayUtil;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemCondition;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IItemTransformer;
import minetweaker.api.item.IngredientStack;
import minetweaker.util.ArrayUtil;
/**
*
@@ -4,9 +4,9 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.player;
package minetweaker.api.player;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -15,7 +15,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan
*/
@ZenClass("minecraft.player.IPlayer")
@ZenClass("minetweaker.player.IPlayer")
public interface IPlayer {
@ZenGetter("name")
public String getName();
@@ -4,9 +4,9 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.recipes;
package minetweaker.api.recipes;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenGetter;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -15,7 +15,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan
*/
@ZenClass("minecraft.recipes.ICraftingInventory")
@ZenClass("minetweaker.recipes.ICraftingInventory")
public interface ICraftingInventory {
@ZenGetter("size")
public int getSize();
@@ -4,10 +4,10 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.recipes;
package minetweaker.api.recipes;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -16,7 +16,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan
*/
@ZenClass("minecraft.recipes.IFurnaceManager")
@ZenClass("minetweaker.recipes.IFurnaceManager")
public interface IFurnaceManager {
@ZenMethod
public void remove(IIngredient ingredient);
@@ -4,17 +4,17 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.recipes;
package minetweaker.api.recipes;
import java.util.Map;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
import stanhebben.zenscript.annotations.ZenClass;
/**
*
* @author Stan
*/
@ZenClass("minecraft.recipes.IRecipeFunction")
@ZenClass("minetweaker.recipes.IRecipeFunction")
public interface IRecipeFunction {
public IItemStack process(IItemStack output, Map<String, IItemStack> inputs);
}
@@ -1,7 +1,7 @@
package minetweaker.minecraft.recipes;
package minetweaker.api.recipes;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -12,7 +12,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
*
* @author Stan Hebben
*/
@ZenClass("minecraft.recipes.IRecipeManager")
@ZenClass("minetweaker.recipes.IRecipeManager")
public interface IRecipeManager {
/**
* Removes all crafting recipes crafting the specified item.
@@ -4,12 +4,12 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.recipes;
package minetweaker.api.recipes;
import java.util.HashMap;
import java.util.Map;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
/**
*
@@ -66,7 +66,7 @@ public class ShapedRecipe {
System.out.println("ShapedRecipe width=" + width + ", height=" + height);
System.out.println("Ingredients: ");
for (int i = 0; i < ingredients.length; i++) {
for (int i = 0; i < this.ingredients.length; i++) {
System.out.println("(" + posx[i] + ", " + posy[i] + "): " + this.ingredients[i]);
}
}
@@ -4,12 +4,12 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.recipes;
package minetweaker.api.recipes;
import java.util.HashMap;
import java.util.Map;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
/**
*
@@ -1,25 +1,20 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package minetweaker.expand;
import java.util.Arrays;
import minetweaker.minecraft.data.DataList;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataList;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
/**
*
* @author Stanneke
* Makes arrays convertable to IData.
*
* @author Stan Hebben
*/
@ZenExpansion("any[]")
public class ExpandAnyArray {
@ZenCaster
public IData asData(IData[] values) {
public static IData asData(IData[] values) {
return new DataList(Arrays.asList(values), true);
}
}
@@ -7,8 +7,8 @@
package minetweaker.expand;
import java.util.Map;
import minetweaker.minecraft.data.DataMap;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataMap;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -19,7 +19,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("any[any]")
public class ExpandAnyDict {
@ZenCaster
public IData asData(Map<String, IData> values) {
public static IData asData(Map<String, IData> values) {
return new DataMap(values, true);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataBool;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataBool;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("bool")
public class ExpandBool {
@ZenCaster
public IData asData(boolean value) {
public static IData asData(boolean value) {
return new DataBool(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataByte;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataByte;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("byte")
public class ExpandByte {
@ZenCaster
public IData asData(byte value) {
public static IData asData(byte value) {
return new DataByte(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataDouble;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataDouble;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("double")
public class ExpandDouble {
@ZenCaster
public IData asData(double value) {
public static IData asData(double value) {
return new DataDouble(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataFloat;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataFloat;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("float")
public class ExpandFloat {
@ZenCaster
public IData asData(float value) {
public static IData asData(float value) {
return new DataFloat(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataInt;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataInt;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("int")
public class ExpandInt {
@ZenCaster
public IData toData(int value) {
public static IData toData(int value) {
return new DataInt(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataLong;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataLong;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("long")
public class ExpandLong {
@ZenCaster
public IData asData(long value) {
public static IData asData(long value) {
return new DataLong(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataShort;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataShort;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("short")
public class ExpandShort {
@ZenCaster
public IData asNBT(short value) {
public static IData asNBT(short value) {
return new DataShort(value);
}
}
@@ -6,8 +6,8 @@
package minetweaker.expand;
import minetweaker.minecraft.data.DataString;
import minetweaker.minecraft.data.IData;
import minetweaker.api.data.DataString;
import minetweaker.api.data.IData;
import stanhebben.zenscript.annotations.ZenCaster;
import stanhebben.zenscript.annotations.ZenExpansion;
@@ -18,7 +18,7 @@ import stanhebben.zenscript.annotations.ZenExpansion;
@ZenExpansion("string")
public class ExpandString {
@ZenCaster
public IData asData(String value) {
public static IData asData(String value) {
return new DataString(value);
}
}
@@ -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;
@@ -4,11 +4,11 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.util;
package minetweaker.util;
import java.util.Arrays;
import minetweaker.minecraft.item.IItemCondition;
import minetweaker.minecraft.item.IItemTransformer;
import minetweaker.api.item.IItemCondition;
import minetweaker.api.item.IItemTransformer;
/**
*
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.util;
package minetweaker.util;
import java.io.Closeable;
import java.io.IOException;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.minecraft.util;
package minetweaker.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -106,10 +106,9 @@ public class MineTweakerCommand implements ICommand {
}
if (arguments[0].equals("reload")) {
MineTweakerAPI.tweaker.load();
MineTweakerMod.INSTANCE.reload();
String message = "Scripts have been reloaded";
MineTweakerAPI.logger.logCommand(message);
sendChatMessage(icommandsender, message);
} else if (arguments[0].equals("names")) {
for (Object okey : Item.itemRegistry.getKeys()) {
@@ -19,6 +19,9 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.relauncher.Side;
import java.io.File;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
import minetweaker.MineTweakerAPI;
@@ -48,6 +51,11 @@ public class MineTweakerMod {
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(MODID);
private static final String[] REGISTRIES = {
"minetweaker.mods.ic2.ClassRegistry",
"minetweaker.mods.nei.ClassRegistry"
};
static {
NETWORK.registerMessage(MineTweakerLoadScriptsHandler.class, MineTweakerLoadScriptsPacket.class, 0, Side.CLIENT);
}
@@ -115,6 +123,26 @@ public class MineTweakerMod {
public void onPostInit(FMLPostInitializationEvent ev) {
MineTweakerAPI.registerBracketHandler(new ItemBracketHandler());
MineTweakerAPI.registerBracketHandler(new LiquidBracketHandler());
for (String registry : REGISTRIES) {
try {
Class cls = Class.forName(registry);
Method method = cls.getMethod("register");
if ((method.getModifiers() & Modifier.STATIC) == 0) {
System.out.println("ERROR: register method in " + registry + " isn't static");
} else {
method.invoke(null);
}
} catch (ClassNotFoundException ex) {
} catch (NoSuchMethodException ex) {
} catch (IllegalAccessException ex) {
} catch (InvocationTargetException ex) {
}
}
}
@EventHandler
@@ -11,8 +11,8 @@ import minetweaker.IBracketHandler;
import minetweaker.MineTweakerAPI;
import minetweaker.annotations.BracketHandler;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.item.IngredientAny;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IngredientAny;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -4,7 +4,7 @@ import java.util.List;
import minetweaker.IBracketHandler;
import minetweaker.annotations.BracketHandler;
import minetweaker.mc172.liquid.TweakerLiquidStack;
import minetweaker.minecraft.liquid.ILiquidStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.runtime.GlobalRegistry;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -12,19 +12,19 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import minetweaker.mc172.util.MineTweakerHacks;
import minetweaker.minecraft.data.DataByte;
import minetweaker.minecraft.data.DataByteArray;
import minetweaker.minecraft.data.DataDouble;
import minetweaker.minecraft.data.DataFloat;
import minetweaker.minecraft.data.DataInt;
import minetweaker.minecraft.data.DataIntArray;
import minetweaker.minecraft.data.DataList;
import minetweaker.minecraft.data.DataLong;
import minetweaker.minecraft.data.DataMap;
import minetweaker.minecraft.data.DataShort;
import minetweaker.minecraft.data.DataString;
import minetweaker.minecraft.data.IData;
import minetweaker.minecraft.data.IDataConverter;
import minetweaker.api.data.DataByte;
import minetweaker.api.data.DataByteArray;
import minetweaker.api.data.DataDouble;
import minetweaker.api.data.DataFloat;
import minetweaker.api.data.DataInt;
import minetweaker.api.data.DataIntArray;
import minetweaker.api.data.DataList;
import minetweaker.api.data.DataLong;
import minetweaker.api.data.DataMap;
import minetweaker.api.data.DataShort;
import minetweaker.api.data.DataString;
import minetweaker.api.data.IData;
import minetweaker.api.data.IDataConverter;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagByteArray;
@@ -7,8 +7,8 @@
package minetweaker.mc172.data;
import java.util.Map;
import minetweaker.minecraft.data.IData;
import minetweaker.minecraft.data.IDataConverter;
import minetweaker.api.data.IData;
import minetweaker.api.data.IDataConverter;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
@@ -6,7 +6,7 @@
package minetweaker.mc172.item;
import minetweaker.minecraft.item.IItemDefinition;
import minetweaker.api.item.IItemDefinition;
import net.minecraft.item.Item;
/**
@@ -11,15 +11,15 @@ import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.data.NBTConverter;
import minetweaker.mc172.liquid.TweakerLiquidStack;
import minetweaker.minecraft.data.IData;
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.IngredientItem;
import minetweaker.minecraft.liquid.ILiquidStack;
import minetweaker.minecraft.util.ArrayUtil;
import minetweaker.api.data.IData;
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.IngredientItem;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.util.ArrayUtil;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -8,8 +8,8 @@ package minetweaker.mc172.liquid;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.minecraft.liquid.ILiquidDefinition;
import minetweaker.minecraft.liquid.ILiquidStack;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.liquid.ILiquidStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -7,9 +7,9 @@
package minetweaker.mc172.liquid;
import minetweaker.mc172.data.NBTConverter;
import minetweaker.minecraft.data.IData;
import minetweaker.minecraft.liquid.ILiquidDefinition;
import minetweaker.minecraft.liquid.ILiquidStack;
import minetweaker.api.data.IData;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.liquid.ILiquidStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
@@ -6,8 +6,8 @@
package minetweaker.mc172.oredict;
import minetweaker.minecraft.oredict.IOreDict;
import minetweaker.minecraft.oredict.IOreDictEntry;
import minetweaker.api.oredict.IOreDict;
import minetweaker.api.oredict.IOreDictEntry;
import net.minecraftforge.oredict.OreDictionary;
/**
@@ -12,14 +12,14 @@ import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.mc172.util.MineTweakerHacks;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemCondition;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.item.IItemTransformer;
import minetweaker.minecraft.item.IngredientStack;
import minetweaker.minecraft.oredict.IOreDictEntry;
import minetweaker.minecraft.oredict.IngredientOreDict;
import minetweaker.minecraft.util.ArrayUtil;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemCondition;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IItemTransformer;
import minetweaker.api.item.IngredientStack;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.oredict.IngredientOreDict;
import minetweaker.util.ArrayUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -7,8 +7,8 @@
package minetweaker.mc172.player;
import minetweaker.mc172.data.NBTConverter;
import minetweaker.minecraft.data.IData;
import minetweaker.minecraft.player.IPlayer;
import minetweaker.api.data.IData;
import minetweaker.api.player.IPlayer;
import net.minecraft.entity.player.EntityPlayer;
/**
@@ -1,17 +1,17 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapedRecipe;
import minetweaker.minecraft.recipes.ShapelessRecipe;
import minetweaker.api.recipes.ShapedRecipe;
import minetweaker.api.recipes.ShapelessRecipe;
import java.util.ArrayList;
import java.util.List;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.mc172.oredict.OreDictEntry;
import minetweaker.mc172.util.MineTweakerHacks;import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.recipes.IRecipeFunction;
import minetweaker.minecraft.recipes.IRecipeManager;
import minetweaker.mc172.util.MineTweakerHacks;import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import minetweaker.api.recipes.IRecipeFunction;
import minetweaker.api.recipes.IRecipeManager;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
@@ -98,7 +98,7 @@ public class MTRecipeManager implements IRecipeManager {
outer: for (int i = 0; i < recipes.size(); i++) {
IRecipe recipe = recipes.get(i);
if (!output.matches(new TweakerItemStack(recipe.getRecipeOutput()))) {
if (recipe.getRecipeOutput() == null || !output.matches(new TweakerItemStack(recipe.getRecipeOutput()))) {
continue;
}
@@ -164,7 +164,7 @@ public class MTRecipeManager implements IRecipeManager {
outer: for (int i = 0; i < recipes.size(); i++) {
IRecipe recipe = recipes.get(i);
if (!output.matches(new TweakerItemStack(recipe.getRecipeOutput()))) {
if (recipe.getRecipeOutput() == null || !output.matches(new TweakerItemStack(recipe.getRecipeOutput()))) {
continue;
}
@@ -314,7 +314,6 @@ public class MTRecipeManager implements IRecipeManager {
@Override
public void apply() {
CraftingManager.getInstance().getRecipeList().add(recipe);
recipes.add(recipe);
}
@@ -6,11 +6,11 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapedRecipe;
import minetweaker.minecraft.recipes.ShapelessRecipe;
import minetweaker.api.recipes.ShapedRecipe;
import minetweaker.api.recipes.ShapelessRecipe;
import java.util.ArrayList;
import java.util.Arrays;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.api.item.IIngredient;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
@@ -6,7 +6,7 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapedRecipe;
import minetweaker.api.recipes.ShapedRecipe;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
@@ -6,8 +6,8 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.recipes.ShapedRecipe;
import minetweaker.api.item.IItemStack;
import minetweaker.api.recipes.ShapedRecipe;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.ShapedRecipes;
@@ -6,7 +6,7 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapedRecipe;
import minetweaker.api.recipes.ShapedRecipe;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -6,7 +6,7 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapelessRecipe;
import minetweaker.api.recipes.ShapelessRecipe;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
@@ -6,7 +6,7 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapelessRecipe;
import minetweaker.api.recipes.ShapelessRecipe;
import java.util.Arrays;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
@@ -6,7 +6,7 @@
package minetweaker.mc172.recipes;
import minetweaker.minecraft.recipes.ShapelessRecipe;
import minetweaker.api.recipes.ShapelessRecipe;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -9,8 +9,8 @@ package minetweaker.mc172.recipes;
import java.util.List;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.mc172.util.MineTweakerHacks;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.minecraft.recipes.ICraftingInventory;
import minetweaker.api.item.IItemStack;
import minetweaker.api.recipes.ICraftingInventory;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.InventoryCrafting;
@@ -6,7 +6,7 @@
package minetweaker.mc172.util;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
/**
@@ -1,4 +1,4 @@
package stanhebben.minetweaker.mods.ic2;
package minetweaker.mods.ic2;
import ic2.api.item.IC2Items;
import java.util.List;
@@ -6,7 +6,7 @@ import minetweaker.IBracketHandler;
import minetweaker.MineTweakerAPI;
import minetweaker.annotations.BracketHandler;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import stanhebben.zenscript.ZenTokener;
@@ -1,9 +1,9 @@
package stanhebben.minetweaker.mods.ic2;
package minetweaker.mods.ic2;
import ic2.api.tile.ExplosionWhitelist;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
@@ -4,14 +4,14 @@
* and open the template in the editor.
*/
package stanhebben.minetweaker.mods.ic2;
package minetweaker.mods.ic2;
import ic2.api.recipe.IRecipeInput;
import java.util.ArrayList;
import java.util.List;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
/**
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package stanhebben.minetweaker.mods.ic2;
package minetweaker.mods.ic2;
import ic2.api.recipe.IMachineRecipeManager;
import minetweaker.OneWayAction;
@@ -1,9 +1,9 @@
package stanhebben.minetweaker.mods.ic2.expand;
package minetweaker.mods.ic2.expand;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.Optional;
@@ -1,13 +1,13 @@
package stanhebben.minetweaker.mods.ic2.machines;
package minetweaker.mods.ic2.machines;
import ic2.api.recipe.Recipes;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import stanhebben.minetweaker.mods.ic2.IC2RecipeInput;
import stanhebben.minetweaker.mods.ic2.MachineAddRecipeAction;
import minetweaker.mods.ic2.IC2RecipeInput;
import minetweaker.mods.ic2.MachineAddRecipeAction;
import stanhebben.zenscript.annotations.NotNull;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -4,16 +4,16 @@
* and open the template in the editor.
*/
package stanhebben.minetweaker.mods.ic2.machines;
package minetweaker.mods.ic2.machines;
import ic2.api.recipe.Recipes;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import stanhebben.minetweaker.mods.ic2.IC2RecipeInput;
import stanhebben.minetweaker.mods.ic2.MachineAddRecipeAction;
import minetweaker.mods.ic2.IC2RecipeInput;
import minetweaker.mods.ic2.MachineAddRecipeAction;
import stanhebben.zenscript.annotations.NotNull;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -1,13 +1,13 @@
package stanhebben.minetweaker.mods.ic2.machines;
package minetweaker.mods.ic2.machines;
import ic2.api.recipe.Recipes;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import stanhebben.minetweaker.mods.ic2.IC2RecipeInput;
import stanhebben.minetweaker.mods.ic2.MachineAddRecipeAction;
import minetweaker.mods.ic2.IC2RecipeInput;
import minetweaker.mods.ic2.MachineAddRecipeAction;
import stanhebben.zenscript.annotations.NotNull;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -1,15 +1,15 @@
package stanhebben.minetweaker.mods.ic2.machines;
package minetweaker.mods.ic2.machines;
import ic2.api.recipe.Recipes;
import minetweaker.MineTweakerAPI;
import minetweaker.mc172.item.TweakerItemStack;
import minetweaker.mc172.util.MineTweakerUtil;
import minetweaker.minecraft.item.IIngredient;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import stanhebben.minetweaker.mods.ic2.IC2RecipeInput;
import stanhebben.minetweaker.mods.ic2.MachineAddRecipeAction;
import minetweaker.mods.ic2.IC2RecipeInput;
import minetweaker.mods.ic2.MachineAddRecipeAction;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@@ -1,4 +1,4 @@
package stanhebben.minetweaker.mods.nei;
package minetweaker.mods.nei;
import codechicken.nei.api.API;
import net.minecraft.item.ItemStack;
@@ -8,7 +8,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.OneWayAction;
import minetweaker.minecraft.item.IItemStack;
import minetweaker.api.item.IItemStack;
/**
* MineTweaker NEI support.
@@ -24,6 +24,7 @@ import stanhebben.zenscript.parser.ParseException;
import stanhebben.zenscript.parser.Token;
import stanhebben.zenscript.expression.partial.IPartialExpression;
import stanhebben.zenscript.statements.Statement;
import stanhebben.zenscript.symbols.IZenSymbol;
import stanhebben.zenscript.type.ZenType;
import stanhebben.zenscript.type.ZenTypeAny;
import stanhebben.zenscript.type.ZenTypeDouble;
@@ -365,9 +366,25 @@ public abstract class ParsedExpression {
tokens.add(next);
next = parser.next();
}
return new ParsedExpressionValue(
start.getPosition(),
parser.getEnvironment().getBracketed(tokens).instance(start.getPosition()));
IZenSymbol resolved = parser.getEnvironment().getBracketed(tokens);
if (resolved == null) {
StringBuilder builder = new StringBuilder();
builder.append('<');
Token last = null;
for (Token token : tokens) {
if (last != null) builder.append(' ');
builder.append(token.getValue());
last = token;
}
builder.append('>');
parser.getEnvironment().getErrorLogger().error(start.getPosition(), "Could not resolve " + builder.toString());
return new ParsedExpressionInvalid(start.getPosition());
} else {
return new ParsedExpressionValue(
start.getPosition(),
parser.getEnvironment().getBracketed(tokens).instance(start.getPosition()));
}
}
case T_SQBROPEN: {
parser.next();
@@ -26,7 +26,6 @@ public class MethodOutput {
private final LocalVariablesSorter visitor;
public MethodOutput(ClassVisitor cls, int access, String name, String descriptor, String signature, String[] exceptions) {
System.out.println("Method output: " + name + descriptor);
MethodVisitor methodVisitor = cls.visitMethod(access, name, descriptor, signature, exceptions);
visitor = new LocalVariablesSorter(access, descriptor, methodVisitor);
}
+3 -1
View File
@@ -30,9 +30,11 @@ task assembleMC17(type: Jar, dependsOn: [\
':ZenScript:build',
':MineTweaker3-API:build',
':MineTweaker3-MC17-Main:build',
':MineTweaker3-MC17-Mod-IC2:build']) {
':MineTweaker3-MC17-Mod-IC2:build',
':MineTweaker3-MC17-Mod-NEI:build']) {
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
from zipTree(project(':MineTweaker3-MC17-Main').jar.archivePath)
from zipTree(project(':MineTweaker3-MC17-Mod-IC2').jar.archivePath)
from zipTree(project(':MineTweaker3-MC17-Mod-NEI').jar.archivePath)
}
+5 -1
View File
@@ -4,7 +4,7 @@ Welcome to the MineTweaker 3 source! MineTweaker 3 is the new version of MineTwe
## License and contributions
The source code is freely available in here, at GitHub. You may modify and redistribute it as long as your mark your own version of MineTweaker as CUSTOMIZED (that is, put CUSTOMIZED in both the jar and mod name). The mod itself may be redistributed in modpacks as long as these modpacks are distributed for free. No money can be made from the distribution of the mod.
The source code is freely available in here, at GitHub. The mod itself may be redistributed in modpacks as long as these modpacks are distributed for free. No money can be made from the distribution of the mod.
Want to contribute? That's great! Contact me if you want to propose or discuss new features. Adding new mods is definitely welcome and doesn't need prior permission (just follow the existing structure, add it & make a pull request). Credit will be granted appropriately.
@@ -32,3 +32,7 @@ Before it can be released, you will have to modify the assembleMC17 task to incl
### Building a release
The assembleMC17 task is the main building task for building a reobfuscated jar combining all the different mod support libraries into one. The jar will be stored in build/libs/MineTweaker3.jar .
## Customized builds
You may modify and redistribute your own customized version of MineTweaker as long as you mark your own version of MineTweaker as CUSTOMIZED (that is, put CUSTOMIZED in both the jar and mod name). Obviously, I cannot offer support for customized builds. Just be so kind to mention the original source and author (me) ;)