From 61f4fe58c60070e8b7b17b2d6d8e751b29993a8d Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sun, 22 Jun 2014 21:36:17 +0200 Subject: [PATCH] - /mt names now outputs the names alphabetically - Added initial implementation of IC2 and NEI support - Fixed NPE retrieving names for certain items --- .../main/java/minetweaker/MineTweakerAPI.java | 15 ++- .../minetweaker/mc172/MineTweakerCommand.java | 21 +++- .../minetweaker/mc172/MineTweakerMod.java | 4 +- .../mc172/util/MineTweakerUtil.java | 20 +++- .../minetweaker/mods/ic2/ClassRegistry.java | 8 +- .../mods/ic2/IC2BracketHandler.java | 4 +- .../mods/ic2/machines/Compressor.java | 8 +- .../mods/ic2/machines/Extractor.java | 8 +- .../mods/ic2/machines/Macerator.java | 8 +- .../mods/ic2/machines/MetalFormer.java | 113 ++++++++++++++++++ .../mods/ic2/machines/OreWasher.java | 40 +++++++ .../mods/ic2/machines/ThermalCentrifuge.java | 10 +- 12 files changed, 234 insertions(+), 25 deletions(-) create mode 100644 MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java create mode 100644 MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index 2e61600..d142168 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -1,5 +1,6 @@ package minetweaker; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; import minetweaker.runtime.IMineTweaker; import minetweaker.runtime.ILogger; @@ -71,12 +72,16 @@ public class MineTweakerAPI { * @param annotatedClass */ public static void registerClass(Class annotatedClass) { - if (annotatedClass.isAnnotationPresent(ZenExpansion.class)) { - GlobalRegistry.registerExpansion(annotatedClass); - } + System.out.println("Registering " + annotatedClass.getName()); - if (annotatedClass.isAnnotationPresent(ZenClass.class)) { - GlobalRegistry.registerNativeClass(annotatedClass); + for (Annotation annotation : annotatedClass.getAnnotations()) { + if (annotation instanceof ZenExpansion) { + GlobalRegistry.registerExpansion(annotatedClass); + } + + if (annotation instanceof ZenClass) { + GlobalRegistry.registerNativeClass(annotatedClass); + } } } 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 2f5d802..15cfc2e 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerCommand.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerCommand.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.ModContainer; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Set; import minetweaker.MineTweakerAPI; import minetweaker.mc172.item.TweakerItemStack; @@ -115,11 +116,25 @@ public class MineTweakerCommand implements ICommand { String message = "Scripts have been reloaded"; sendChatMessage(icommandsender, message); } else if (arguments[0].equals("names")) { - for (Object okey : Item.itemRegistry.getKeys()) { - String key = (String) okey; + Set keys = Item.itemRegistry.getKeys(); + String[] sortedKeys = new String[keys.size()]; + int sortedKeyIndex = 0; + for (String key : keys) sortedKeys[sortedKeyIndex++] = key; + Arrays.sort(sortedKeys); + + for (String key : sortedKeys) { Item item = (Item) Item.itemRegistry.getObject(key); - String message = "<" + key + "> -- " + new ItemStack(item, 1, 0).getDisplayName(); + String displayName = ""; + + try { + displayName = " -- " + new ItemStack(item, 1, 0).getDisplayName(); + } catch (Exception ex) { + // some mods (such as buildcraft) may throw exceptions when calling + // getDisplayName on a item stack that doesn't contain valid NBT data + } + + String message = "<" + key + ">" + displayName; MineTweakerAPI.logger.logCommand(message); } sendChatMessage(icommandsender, "List generated; see minetweaker.log in your minecraft dir"); 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 8401073..35b2aa3 100644 --- a/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java +++ b/MineTweaker3-MC17-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java @@ -74,7 +74,7 @@ public class MineTweakerMod { MineTweakerAPI.recipes = new MTRecipeManager(); MineTweakerAPI.logger = new MineTweakerLogger(); - List classes = new ArrayList(); + /*List classes = new ArrayList(); MineTweakerRegistry.getClasses(classes); outer: for (Class cls : classes) { @@ -90,7 +90,7 @@ public class MineTweakerMod { } MineTweakerAPI.registerClass(cls); - } + }*/ File globalDir = new File("scripts"); if (!globalDir.exists()) { 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 851535b..61ea9c2 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,9 @@ package minetweaker.mc172.util; +import java.util.List; import minetweaker.api.item.IItemStack; +import minetweaker.mc172.item.TweakerItemStack; import net.minecraft.item.ItemStack; /** @@ -14,7 +16,7 @@ import net.minecraft.item.ItemStack; * @author Stan */ public class MineTweakerUtil { - public static ItemStack[] fromArray(IItemStack[] items) { + public static ItemStack[] getItemStacks(IItemStack... items) { ItemStack[] output = new ItemStack[items.length]; for (int i = 0; i < items.length; i++) { Object internal = items[i].getInternal(); @@ -24,4 +26,20 @@ public class MineTweakerUtil { } return output; } + + public static IItemStack[] getItemStacks(ItemStack... items) { + IItemStack[] result = new IItemStack[items.length]; + for (int i = 0; i < items.length; i++) { + result[i] = new TweakerItemStack(items[i]); + } + return result; + } + + public static IItemStack[] getItemStacks(List items) { + IItemStack[] result = new IItemStack[items.size()]; + for (int i = 0; i < result.length; i++) { + result[i] = new TweakerItemStack(items.get(i)); + } + return result; + } } diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/ClassRegistry.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/ClassRegistry.java index 25eb3fc..0b69927 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/ClassRegistry.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/ClassRegistry.java @@ -12,6 +12,8 @@ import minetweaker.mods.ic2.expand.ItemExpansion; import minetweaker.mods.ic2.machines.Compressor; import minetweaker.mods.ic2.machines.Extractor; import minetweaker.mods.ic2.machines.Macerator; +import minetweaker.mods.ic2.machines.MetalFormer; +import minetweaker.mods.ic2.machines.OreWasher; import minetweaker.mods.ic2.machines.ThermalCentrifuge; /** @@ -23,12 +25,14 @@ public class ClassRegistry { if (Loader.isModLoaded("IC2")) { MineTweakerAPI.logger.logInfo("Loading IC2 support"); - MineTweakerAPI.registerClass(ItemExpansion.class); - MineTweakerAPI.registerClass(Compressor.class); MineTweakerAPI.registerClass(Extractor.class); MineTweakerAPI.registerClass(Macerator.class); + MineTweakerAPI.registerClass(MetalFormer.class); + MineTweakerAPI.registerClass(OreWasher.class); MineTweakerAPI.registerClass(ThermalCentrifuge.class); + + MineTweakerAPI.registerClass(ItemExpansion.class); } } } diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java index 964d870..802c076 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java @@ -42,9 +42,9 @@ public class IC2BracketHandler implements IBracketHandler { @Override public IZenSymbol resolve(List tokens) { if (tokens.size() >= 5) { - if (tokens.get(2).getValue().equals("ic2") - && tokens.get(0).getValue().equals("item") + if (tokens.get(0).getValue().equals("ic2") && tokens.get(1).getValue().equals("-") + && tokens.get(2).getValue().equals("item") && tokens.get(3).getValue().equals(":")) { String name = tokens.get(4).getValue(); int meta = 0; diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java index 9831dcc..73006ef 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java @@ -1,10 +1,12 @@ package minetweaker.mods.ic2.machines; +import ic2.api.recipe.RecipeOutput; import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.mc172.item.TweakerItemStack; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; +import minetweaker.mc172.util.MineTweakerUtil; import net.minecraft.item.ItemStack; import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; @@ -39,7 +41,7 @@ public class Compressor { MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( "compressor", Recipes.compressor, - new ItemStack[] {(ItemStack) output.getInternal()}, + MineTweakerUtil.getItemStacks(output), null, new IC2RecipeInput(ingredient))); } @@ -55,6 +57,8 @@ public class Compressor { @ZenMethod public static IItemStack getOutput( @NotNull IItemStack input) { - return new TweakerItemStack(Recipes.compressor.getOutputFor((ItemStack) input.getInternal(), false).items.get(0)); + RecipeOutput output = Recipes.compressor.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.size() > 0) return null; + return new TweakerItemStack(output.items.get(0)); } } diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java index 474eb67..1c5e152 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java @@ -6,11 +6,13 @@ package minetweaker.mods.ic2.machines; +import ic2.api.recipe.RecipeOutput; import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.mc172.item.TweakerItemStack; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; +import minetweaker.mc172.util.MineTweakerUtil; import net.minecraft.item.ItemStack; import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; @@ -44,7 +46,7 @@ public class Extractor { MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( "extractor", Recipes.extractor, - new ItemStack[] {(ItemStack) output.getInternal()}, + MineTweakerUtil.getItemStacks(output), null, new IC2RecipeInput(ingredient))); } @@ -60,6 +62,8 @@ public class Extractor { @ZenMethod public static IItemStack getOutput( @NotNull IItemStack input) { - return new TweakerItemStack(Recipes.extractor.getOutputFor((ItemStack) input.getInternal(), false).items.get(0)); + RecipeOutput output = Recipes.extractor.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.size() > 0) return null; + return new TweakerItemStack(output.items.get(0)); } } diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java index e0efa1e..4392311 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java @@ -1,10 +1,12 @@ package minetweaker.mods.ic2.machines; +import ic2.api.recipe.RecipeOutput; import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.mc172.item.TweakerItemStack; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; +import minetweaker.mc172.util.MineTweakerUtil; import net.minecraft.item.ItemStack; import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; @@ -39,7 +41,7 @@ public class Macerator { MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( "macerator", Recipes.macerator, - new ItemStack[] {(ItemStack) output.getInternal()}, + MineTweakerUtil.getItemStacks(output), null, new IC2RecipeInput(ingredient))); } @@ -55,6 +57,8 @@ public class Macerator { @ZenMethod public static IItemStack getOutput( @NotNull IItemStack input) { - return new TweakerItemStack(Recipes.macerator.getOutputFor((ItemStack) input.getInternal(), false).items.get(0)); + RecipeOutput output = Recipes.macerator.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.size() > 0) return null; + return new TweakerItemStack(output.items.get(0)); } } diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java new file mode 100644 index 0000000..0c08623 --- /dev/null +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java @@ -0,0 +1,113 @@ +/* + * 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.mods.ic2.machines; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.mc172.item.TweakerItemStack; +import minetweaker.mc172.util.MineTweakerUtil; +import minetweaker.mods.ic2.IC2RecipeInput; +import minetweaker.mods.ic2.MachineAddRecipeAction; +import net.minecraft.item.ItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.MetalFormer") +public class MetalFormer { + /** + * Adds an extruding recipe to the metal former. + * + * @param output output item + * @param input input item + */ + @ZenMethod + public static void addExtrudingRecipe(IItemStack output, IIngredient input) { + MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + "metal former - extruding", + Recipes.metalformerExtruding, + MineTweakerUtil.getItemStacks(output), + null, + new IC2RecipeInput(input))); + } + + /** + * Gets the extruding output for the given input. + * + * @param input input item + * @return output item, or null + */ + @ZenMethod + public static IItemStack getExtrudingOutput(IItemStack input) { + RecipeOutput output = Recipes.metalformerExtruding.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.size() > 0) return null; + return new TweakerItemStack(output.items.get(0)); + } + + /** + * Adds a rolling recipe to the metal former. + * + * @param output output item + * @param input input item + */ + @ZenMethod + public static void addRollingRecipe(IItemStack output, IIngredient input) { + MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + "metal former - rolling", + Recipes.metalformerRolling, + new ItemStack[] { (ItemStack) output.getInternal() }, + null, + new IC2RecipeInput(input))); + } + + /** + * Gets the extruding output for the given input. + * + * @param input input item + * @return output item, or null + */ + @ZenMethod + public static IItemStack getRollingOutput(IItemStack input) { + RecipeOutput output = Recipes.metalformerRolling.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.size() > 0) return null; + return new TweakerItemStack(output.items.get(0)); + } + /** + * Adds a extruding recipe to the metal former. + * + * @param output output item + * @param input input item + */ + @ZenMethod + public static void addCuttingRecipe(IItemStack output, IIngredient input) { + MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + "metal former - cutting", + Recipes.metalformerCutting, + new ItemStack[] { (ItemStack) output.getInternal() }, + null, + new IC2RecipeInput(input))); + } + + /** + * Gets the cutting output for the given input. + * + * @param input input item + * @return output item, or null + */ + @ZenMethod + public static IItemStack getCuttingOutput(IItemStack input) { + RecipeOutput output = Recipes.metalformerCutting.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.size() > 0) return null; + return new TweakerItemStack(output.items.get(0)); + } +} diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java new file mode 100644 index 0000000..0cef2d6 --- /dev/null +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java @@ -0,0 +1,40 @@ +package minetweaker.mods.ic2.machines; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.mc172.util.MineTweakerUtil; +import minetweaker.mods.ic2.IC2RecipeInput; +import minetweaker.mods.ic2.MachineAddRecipeAction; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.OreWasher") +public class OreWasher { + @ZenMethod + public void addRecipe(IItemStack[] output, IIngredient input, int millibuckets) { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setInteger("amount", millibuckets); + MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + "ore washer", + Recipes.oreWashing, + MineTweakerUtil.getItemStacks(output), + nbt, + new IC2RecipeInput(input))); + } + + @ZenMethod + public IItemStack[] getOutput(IItemStack input) { + RecipeOutput output = Recipes.oreWashing.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.isEmpty()) return null; + return MineTweakerUtil.getItemStacks(output.items); + } +} diff --git a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java index 163e766..3a64c34 100644 --- a/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java +++ b/MineTweaker3-MC17-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java @@ -1,8 +1,8 @@ package minetweaker.mods.ic2.machines; +import ic2.api.recipe.RecipeOutput; import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; -import minetweaker.mc172.item.TweakerItemStack; import minetweaker.mc172.util.MineTweakerUtil; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -41,7 +41,7 @@ public class ThermalCentrifuge { MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( "compressor", Recipes.compressor, - MineTweakerUtil.fromArray(output), + MineTweakerUtil.getItemStacks(output), null, new IC2RecipeInput(ingredient))); } @@ -70,7 +70,9 @@ public class ThermalCentrifuge { * @return recipe output */ @ZenMethod - public static IItemStack getOutput(IItemStack input) { - return new TweakerItemStack(Recipes.centrifuge.getOutputFor((ItemStack) input.getInternal(), false).items.get(0)); + public static IItemStack[] getOutput(IItemStack input) { + RecipeOutput output = Recipes.centrifuge.getOutputFor((ItemStack) input.getInternal(), false); + if (output == null || output.items.isEmpty()) return null; + return MineTweakerUtil.getItemStacks(output.items); } }