diff --git a/MineTweaker3-API/src/main/java/minetweaker/IRecipeRemover.java b/MineTweaker3-API/src/main/java/minetweaker/IRecipeRemover.java index 11d464f..059bcef 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/IRecipeRemover.java +++ b/MineTweaker3-API/src/main/java/minetweaker/IRecipeRemover.java @@ -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, diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index ebce36b..2e61600 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataBool.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataBool.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java index 25fb5f4..9999f07 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataBool.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataByte.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataByte.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java index c5bc3b0..f41e700 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataByte.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataByteArray.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java similarity index 99% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataByteArray.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java index cedaa58..2cf0874 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataByteArray.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataDouble.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataDouble.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java index ceb53b4..e0a4323 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataDouble.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataFloat.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataFloat.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java index f92a5d6..efc2b88 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataFloat.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataInt.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataInt.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java index 14d14e4..c869732 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataInt.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataIntArray.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java similarity index 99% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataIntArray.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java index a3fc47f..b8b7d1b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataIntArray.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataList.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java similarity index 99% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataList.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java index 3d61d42..16ecef6 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataList.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataLong.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataLong.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java index 573980c..4e732c7 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataLong.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataMap.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java similarity index 99% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataMap.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java index f046a41..ed4e414 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataMap.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataShort.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java similarity index 98% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataShort.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java index 22466f1..3396942 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataShort.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataString.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java similarity index 99% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataString.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java index 353e8ed..50aa1b4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/DataString.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/IData.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java similarity index 97% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/IData.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java index 6ae5fa7..110ca37 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/IData.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java @@ -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); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/IDataConverter.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java similarity index 95% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/data/IDataConverter.java rename to MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java index 492dc22..dfed5d0 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/data/IDataConverter.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/Condition.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/Condition.java similarity index 96% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/Condition.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/Condition.java index 35e49ef..8a7b721 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/Condition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/Condition.java @@ -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. diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IIngredient.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java similarity index 97% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IIngredient.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java index 27cf58a..f3761d5 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IIngredient.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java @@ -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 diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemCondition.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemCondition.java similarity index 87% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemCondition.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IItemCondition.java index 9a144eb..0e3e73e 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemCondition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemCondition.java @@ -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. diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java similarity index 79% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemDefinition.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java index 41d055a..79fe781 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemDefinition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java @@ -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 { } diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java similarity index 88% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemStack.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java index 5d77593..a7f0c26 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java @@ -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(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemTransformer.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java similarity index 69% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemTransformer.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java index 98a0bbb..48e954d 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IItemTransformer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java @@ -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) diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientAny.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java similarity index 95% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientAny.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java index 6fb3500..bed5337 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientAny.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java @@ -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; /** * diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientAnyAdvanced.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java similarity index 96% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientAnyAdvanced.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java index 01fcd85..d83b416 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientAnyAdvanced.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java @@ -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; /** * diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientItem.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java similarity index 96% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientItem.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java index 7bcfcf2..574bed7 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientItem.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java @@ -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; /** * diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java similarity index 97% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientStack.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java index f3b3731..d01e110 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/IngredientStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.minecraft.item; +package minetweaker.api.item; import java.util.List; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/Transform.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/Transform.java similarity index 97% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/item/Transform.java rename to MineTweaker3-API/src/main/java/minetweaker/api/item/Transform.java index 8664f78..2087f34 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/item/Transform.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/Transform.java @@ -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. diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/liquid/ILiquidDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java similarity index 93% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/liquid/ILiquidDefinition.java rename to MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java index 1ed30f1..eaf70f8 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/liquid/ILiquidDefinition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java @@ -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); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/liquid/ILiquidStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidStack.java similarity index 90% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/liquid/ILiquidStack.java rename to MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidStack.java index 90d090a..d48f13e 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/liquid/ILiquidStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidStack.java @@ -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(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IOreDict.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDict.java similarity index 83% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IOreDict.java rename to MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDict.java index 1d69edf..2b949a3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IOreDict.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDict.java @@ -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); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IOreDictEntry.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java similarity index 78% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IOreDictEntry.java rename to MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java index 37618ae..49d7c1e 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IOreDictEntry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IOreDictEntry.java @@ -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); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IngredientOreDict.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java similarity index 86% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IngredientOreDict.java rename to MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java index acda168..63a1c90 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/oredict/IngredientOreDict.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java @@ -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; /** * diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/player/IPlayer.java b/MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java similarity index 82% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/player/IPlayer.java rename to MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java index 2931462..d9c70d4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/player/IPlayer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/player/IPlayer.java @@ -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(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ICraftingInventory.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java similarity index 86% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ICraftingInventory.java rename to MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java index 7fa8ed9..3618bf4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ICraftingInventory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java @@ -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(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IFurnaceManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IFurnaceManager.java similarity index 79% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IFurnaceManager.java rename to MineTweaker3-API/src/main/java/minetweaker/api/recipes/IFurnaceManager.java index 943cbff..a2c6a56 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IFurnaceManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IFurnaceManager.java @@ -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); diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IRecipeFunction.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeFunction.java similarity index 75% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IRecipeFunction.java rename to MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeFunction.java index 6424ab3..5aff388 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IRecipeFunction.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeFunction.java @@ -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 inputs); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IRecipeManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java similarity index 92% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IRecipeManager.java rename to MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java index 8cf8711..1c3dad3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/IRecipeManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java @@ -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. diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ShapedRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java similarity index 96% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ShapedRecipe.java rename to MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java index 39699f9..6af2699 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ShapedRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapedRecipe.java @@ -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]); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ShapelessRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java similarity index 95% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ShapelessRecipe.java rename to MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java index 74007b9..ceab116 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/recipes/ShapelessRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ShapelessRecipe.java @@ -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; /** * diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyArray.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyArray.java index ce3644f..14c2242 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyArray.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyArray.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyDict.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyDict.java index 99ed0d5..477f3c2 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyDict.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandAnyDict.java @@ -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 values) { + public static IData asData(Map values) { return new DataMap(values, true); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandBool.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandBool.java index 57c880b..d9c899a 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandBool.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandBool.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandByte.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandByte.java index 0dc7223..691267f 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandByte.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandByte.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandDouble.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandDouble.java index 4a4708d..93141fd 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandDouble.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandDouble.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandFloat.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandFloat.java index 8490647..cd5cbbd 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandFloat.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandFloat.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandInt.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandInt.java index 7712138..b98fe9c 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandInt.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandInt.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandLong.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandLong.java index eff667d..330dd12 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandLong.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandLong.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandShort.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandShort.java index 3be416f..cdaaf27 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandShort.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandShort.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java index d3a05cc..35e91de 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java @@ -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); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java index 13d8a75..04ce3d3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java @@ -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() {} diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/IMineTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/IMineTweaker.java index 65cdf3a..d2340c7 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/IMineTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/IMineTweaker.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/Tweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/Tweaker.java index ebc759a..f57071b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/Tweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/Tweaker.java @@ -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(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java index 5631211..bdf360c 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/util/ArrayUtil.java b/MineTweaker3-API/src/main/java/minetweaker/util/ArrayUtil.java similarity index 86% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/util/ArrayUtil.java rename to MineTweaker3-API/src/main/java/minetweaker/util/ArrayUtil.java index b272867..41c0b4f 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/util/ArrayUtil.java +++ b/MineTweaker3-API/src/main/java/minetweaker/util/ArrayUtil.java @@ -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; /** * diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/util/CloseablePriorityList.java b/MineTweaker3-API/src/main/java/minetweaker/util/CloseablePriorityList.java similarity index 97% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/util/CloseablePriorityList.java rename to MineTweaker3-API/src/main/java/minetweaker/util/CloseablePriorityList.java index 0f91de1..17ea2cd 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/util/CloseablePriorityList.java +++ b/MineTweaker3-API/src/main/java/minetweaker/util/CloseablePriorityList.java @@ -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; diff --git a/MineTweaker3-API/src/main/java/minetweaker/minecraft/util/FileUtil.java b/MineTweaker3-API/src/main/java/minetweaker/util/FileUtil.java similarity index 94% rename from MineTweaker3-API/src/main/java/minetweaker/minecraft/util/FileUtil.java rename to MineTweaker3-API/src/main/java/minetweaker/util/FileUtil.java index ae242ac..2b791ec 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/minecraft/util/FileUtil.java +++ b/MineTweaker3-API/src/main/java/minetweaker/util/FileUtil.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerCommand.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerCommand.java index 20b6ccd..daae1d5 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerCommand.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerCommand.java @@ -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()) { diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java index 7926dff..a2c7a87 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java @@ -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 diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java index 6d8b733..f22357c 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/ItemBracketHandler.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/LiquidBracketHandler.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/LiquidBracketHandler.java index 6ab4ad7..1d941ce 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/LiquidBracketHandler.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/brackets/LiquidBracketHandler.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTConverter.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTConverter.java index 57f9cf3..2a8c819 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTConverter.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTConverter.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTUpdater.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTUpdater.java index 299ebd2..333b0cf 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTUpdater.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/data/NBTUpdater.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemDefinition.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemDefinition.java index 908ca45..87bee9f 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemDefinition.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemDefinition.java @@ -6,7 +6,7 @@ package minetweaker.mc172.item; -import minetweaker.minecraft.item.IItemDefinition; +import minetweaker.api.item.IItemDefinition; import net.minecraft.item.Item; /** diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemStack.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemStack.java index 2a9c402..23c5a68 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemStack.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/item/TweakerItemStack.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidDefinition.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidDefinition.java index 8ae6050..a996932 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidDefinition.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidDefinition.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidStack.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidStack.java index 4416c4e..a969159 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidStack.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/liquid/TweakerLiquidStack.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDict.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDict.java index 4787d3b..fb26d81 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDict.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDict.java @@ -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; /** diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDictEntry.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDictEntry.java index 46e0201..c96bfd8 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDictEntry.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/oredict/OreDictEntry.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/player/TweakerPlayer.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/player/TweakerPlayer.java index 455b030..a48f127 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/player/TweakerPlayer.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/player/TweakerPlayer.java @@ -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; /** diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/MTRecipeManager.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/MTRecipeManager.java index 367e274..b7ccdef 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/MTRecipeManager.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/MTRecipeManager.java @@ -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); } diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/RecipeConverter.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/RecipeConverter.java index ee934d5..a48d0ee 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/RecipeConverter.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/RecipeConverter.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeAdvanced.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeAdvanced.java index e54b649..6dc476d 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeAdvanced.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeAdvanced.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeBasic.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeBasic.java index 761f1eb..f2783e3 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeBasic.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeBasic.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeOre.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeOre.java index b0d121a..8a16f5c 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeOre.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapedRecipeOre.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeAdvanced.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeAdvanced.java index fdb25a0..dccf1a9 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeAdvanced.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeAdvanced.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeBasic.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeBasic.java index df2c1b0..5e237e1 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeBasic.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeBasic.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeOre.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeOre.java index 3ff3a5a..c46cbb7 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeOre.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/ShapelessRecipeOre.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/TweakerCraftingInventory.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/TweakerCraftingInventory.java index 1049d91..9a0e96f 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/TweakerCraftingInventory.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/recipes/TweakerCraftingInventory.java @@ -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; diff --git a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/util/MineTweakerUtil.java b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/util/MineTweakerUtil.java index 906fb02..851535b 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/util/MineTweakerUtil.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/util/MineTweakerUtil.java @@ -6,7 +6,7 @@ package minetweaker.mc172.util; -import minetweaker.minecraft.item.IItemStack; +import minetweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; /** diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2BracketHandler.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java similarity index 97% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2BracketHandler.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java index f78e22c..964d870 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2BracketHandler.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2ExplosionWhitelist.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java similarity index 97% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2ExplosionWhitelist.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java index 718e32a..5599df0 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2ExplosionWhitelist.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2RecipeInput.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java similarity index 88% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2RecipeInput.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java index 6358164..127cf93 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/IC2RecipeInput.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java @@ -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; /** diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/MachineAddRecipeAction.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java similarity index 97% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/MachineAddRecipeAction.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java index ed971d1..9834776 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/MachineAddRecipeAction.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/expand/ItemExpansion.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java similarity index 97% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/expand/ItemExpansion.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java index 90a45a0..c724b31 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/expand/ItemExpansion.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Compressor.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java similarity index 86% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Compressor.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java index 3fb1397..9831dcc 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Compressor.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Extractor.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java similarity index 87% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Extractor.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java index 96e710e..474eb67 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Extractor.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Macerator.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java similarity index 86% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Macerator.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java index 293a63a..e0efa1e 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/Macerator.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java similarity index 89% rename from MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/ThermalCentrifuge.java rename to MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java index 77e480e..163e766 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/stanhebben/minetweaker/mods/ic2/machines/ThermalCentrifuge.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java @@ -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; diff --git a/MineTweaker3-MC17-Mod-NEI/src/main/java/stanhebben/minetweaker/mods/nei/NEI.java b/MineTweaker3-MC17-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java similarity index 97% rename from MineTweaker3-MC17-Mod-NEI/src/main/java/stanhebben/minetweaker/mods/nei/NEI.java rename to MineTweaker3-MC17-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java index ab88175..8190228 100644 --- a/MineTweaker3-MC17-Mod-NEI/src/main/java/stanhebben/minetweaker/mods/nei/NEI.java +++ b/MineTweaker3-MC17-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java @@ -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. diff --git a/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpression.java b/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpression.java index e20fa83..abcdd0b 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpression.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/parser/expression/ParsedExpression.java @@ -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(); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/util/MethodOutput.java b/ZenScript/src/main/java/stanhebben/zenscript/util/MethodOutput.java index e29f3ab..8b314a4 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/util/MethodOutput.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/util/MethodOutput.java @@ -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); } diff --git a/build.gradle b/build.gradle index 941343c..d9f2894 100644 --- a/build.gradle +++ b/build.gradle @@ -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) } diff --git a/readme.md b/readme.md index 54a7586..c8f181b 100644 --- a/readme.md +++ b/readme.md @@ -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) ;)