diff --git a/MineTweaker3-API/src/main/java/minetweaker/ClassRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/ClassRegistry.java index 7c73115..0e558a5 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/ClassRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/ClassRegistry.java @@ -1,16 +1,12 @@ -/* - * 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; import java.util.List; /** - * - * @author Stan + * The class registry provides the list of annotated classes to the scripting + * system. + * + * @author Stan Hebben */ public class ClassRegistry { public static void getClasses(List output) { diff --git a/MineTweaker3-API/src/main/java/minetweaker/IPlatformFunctions.java b/MineTweaker3-API/src/main/java/minetweaker/IPlatformFunctions.java index 8a21ac8..08b1f8f 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/IPlatformFunctions.java +++ b/MineTweaker3-API/src/main/java/minetweaker/IPlatformFunctions.java @@ -1,22 +1,36 @@ -/* - * 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; import minetweaker.api.chat.IChatMessage; import minetweaker.api.item.IItemDefinition; /** - * - * @author Stan + * Platform functions are a set of internal functions implemented by the platform + * intended to communicate between API and implementation. + * + * @author Stan Hebben */ public interface IPlatformFunctions { + /** + * Converts a string into a chat message. + * + * @param message message string + * @return chat message + */ public IChatMessage getMessage(String message); + /** + * Distributes the given script data to all connected clients. Automatically + * reloads the scripts from this data. + * + * @param data data to be distributed + */ public void distributeScripts(byte[] data); + /** + * Finds the item definition with the given ID. + * + * @param id item ID + * @return resulting item definition + */ public IItemDefinition getItemDefinition(int id); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index ba34654..200ee82 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -21,7 +21,6 @@ import minetweaker.runtime.MTTweaker; import minetweaker.api.recipes.IRecipeManager; import minetweaker.api.oredict.IOreDict; import minetweaker.api.recipes.IFurnaceManager; -import minetweaker.api.resource.IResourceManager; import minetweaker.api.server.IServer; import minetweaker.runtime.GlobalRegistry; import stanhebben.zenscript.annotations.ZenClass; @@ -61,12 +60,14 @@ public class MineTweakerAPI { } registerGlobalSymbol("logger", getJavaStaticGetterSymbol(MineTweakerAPI.class, "getLogger")); - registerGlobalSymbol("tweaker", getJavaStaticFieldSymbol(MineTweakerAPI.class, "tweaker")); registerGlobalSymbol("recipes", getJavaStaticFieldSymbol(MineTweakerAPI.class, "recipes")); registerGlobalSymbol("furnace", getJavaStaticFieldSymbol(MineTweakerAPI.class, "furnace")); registerGlobalSymbol("oreDict", getJavaStaticFieldSymbol(MineTweakerAPI.class, "oreDict")); registerGlobalSymbol("events", getJavaStaticFieldSymbol(MineTweakerAPI.class, "events")); registerGlobalSymbol("server", getJavaStaticFieldSymbol(MineTweakerAPI.class, "server")); + registerGlobalSymbol("client", getJavaStaticFieldSymbol(MineTweakerAPI.class, "client")); + registerGlobalSymbol("game", getJavaStaticFieldSymbol(MineTweakerAPI.class, "game")); + registerGlobalSymbol("loadedMods", getJavaStaticFieldSymbol(MineTweakerAPI.class, "loadedMods")); } private MineTweakerAPI() {} @@ -128,10 +129,61 @@ public class MineTweakerAPI { public static ILoadedMods loadedMods = null; /** - * Access point to the global resource manager. Note that each script group also - * has its own local resource manager. + * Applies this given action. + * + * @param action action object */ - public static IResourceManager resources = null; + public static void apply(IUndoableAction action) { + tweaker.apply(action); + } + + /** + * Logs a command message. Commands messages are those generated as output + * in response to a command. + * + * @param message command message + */ + public static void logCommand(String message) { + getLogger().logCommand(message); + } + + /** + * Logs an info message. Info messages have low priority and will only be + * displayed in the log files, but not directly to players in-game. + * + * @param message info message + */ + public static void logInfo(String message) { + getLogger().logInfo(message); + } + + /** + * Logs a warning message. Warning messages are displayed to admins and + * indicate that there is an issue. However, the issue is not a large + * problem, and everything should run fine - besides perhaps a few things + * not entirely working as expected. + * + * @param message warning message + */ + public static void logWarning(String message) { + getLogger().logWarning(message); + } + + /** + * Logs an error message. Error messages indicate a real problem and + * indicate that things won't run properly. The scripting system will + * still make a best-effort attempt at executing the rest of the scripts, + * but that might cause additional errors and issues. + * + * @param message error message + */ + public static void logError(String message) { + getLogger().logError(message); + } + + // ################################### + // ### Plugin registration methods ### + // ################################### /** * Register a class registry class. Such class must have (at least) a public @@ -173,6 +225,13 @@ public class MineTweakerAPI { } } + /** + * Registers a class registry. Will attempt to resolve the given class + * name. Does nothing if the class could not be loaded. + * + * @param className class name to be loaded + * @return true if registration was successful + */ public static boolean registerClassRegistry(String className) { try { registerClassRegistry(Class.forName(className)); @@ -218,8 +277,8 @@ public class MineTweakerAPI { * Registers a global symbol. Global symbols are immediately accessible from * anywhere in the scripts. * - * @param name - * @param symbol + * @param name symbol name + * @param symbol symbol */ public static void registerGlobalSymbol(String name, IZenSymbol symbol) { GlobalRegistry.registerGlobal(name, symbol); diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementation.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementation.java new file mode 100644 index 0000000..d5bb018 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementation.java @@ -0,0 +1,15 @@ +/* + * 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; + +/** + * + * @author Stan + */ +public class MineTweakerImplementation { + +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 27db903..20e56ea 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -1,9 +1,3 @@ -/* - * 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; import minetweaker.api.logger.MTLogger; @@ -13,25 +7,33 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import static minetweaker.MineTweakerAPI.server; import minetweaker.api.event.IPlayerLoggedInEventHandler; import minetweaker.api.event.IPlayerLoggedOutEventHandler; import minetweaker.api.event.MTEventManager; import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; +import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidDefinition; +import minetweaker.api.mods.ILoadedMods; import minetweaker.api.mods.IMod; +import minetweaker.api.oredict.IOreDict; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; +import minetweaker.api.recipes.IFurnaceManager; +import minetweaker.api.recipes.IRecipeManager; import minetweaker.api.server.ICommandFunction; import minetweaker.api.server.ICommandValidator; +import minetweaker.api.server.IServer; +import minetweaker.runtime.IScriptProvider; /** - * - * @author Stan + * The implementation API is used by API implementations for internal communication + * and initialization. + * + * @author Stan Hebben */ public class MineTweakerImplementationAPI { private static final Map minetweakerCommands; @@ -76,7 +78,7 @@ public class MineTweakerImplementationAPI { // getDisplayName on an item stack that doesn't contain valid NBT data } - MineTweakerAPI.getLogger().logCommand("<" + item.getId() + ">" + displayName); + MineTweakerAPI.logCommand("<" + item.getId() + ">" + displayName); } if (player != null) { @@ -98,7 +100,7 @@ public class MineTweakerImplementationAPI { Collections.sort(liquids, LIQUID_COMPARATOR); for (ILiquidDefinition liquid : liquids) { System.out.println("Liquid " + liquid.getName()); - MineTweakerAPI.getLogger().logCommand("<" + liquid.getName() + "> -- " + liquid.getDisplayName()); + MineTweakerAPI.logCommand("<" + liquid.getName() + "> -- " + liquid.getDisplayName()); } if (player != null) { @@ -156,17 +158,17 @@ public class MineTweakerImplementationAPI { player.sendChat(platform.getMessage("Entry doesn't exist")); return; } else { - MineTweakerAPI.getLogger().logCommand("Ore entries for " + entryName + ":"); + MineTweakerAPI.logCommand("Ore entries for " + entryName + ":"); for (IItemStack ore : entry.getItems()) { - MineTweakerAPI.getLogger().logCommand(" " + ore); + MineTweakerAPI.logCommand(" " + ore); } } } else { for (IOreDictEntry entry : MineTweakerAPI.oreDict.getEntries()) { if (!entry.isEmpty()) { - MineTweakerAPI.getLogger().logCommand("Ore entries for :"); + MineTweakerAPI.logCommand("Ore entries for :"); for (IItemStack ore : entry.getItems()) { - MineTweakerAPI.getLogger().logCommand(" " + ore); + MineTweakerAPI.logCommand(" " + ore); } } } @@ -183,11 +185,11 @@ public class MineTweakerImplementationAPI { }, new ICommandFunction() { @Override public void execute(String[] arguments, IPlayer player) { - MineTweakerAPI.getLogger().logCommand("Mods list:"); + MineTweakerAPI.logCommand("Mods list:"); for (IMod mod : MineTweakerAPI.loadedMods) { String message = mod.getId() + " - " + mod.getName() + " - " + mod.getVersion(); player.sendChat(platform.getMessage(message)); - MineTweakerAPI.getLogger().logCommand("Mod: " + message); + MineTweakerAPI.logCommand("Mod: " + message); } } })); @@ -217,7 +219,7 @@ public class MineTweakerImplementationAPI { player.sendChat(platform.getMessage(description.toString())); } } catch (NumberFormatException e) { - MineTweakerAPI.getLogger().logCommand("ID must be an integer"); + MineTweakerAPI.logCommand("ID must be an integer"); } } } @@ -266,6 +268,9 @@ public class MineTweakerImplementationAPI { */ public static final MTEventManager events = new MTEventManager(); + /** + * Access point to the internal logger instance. + */ public static final MTLogger logger = new MTLogger(); /** @@ -273,14 +278,58 @@ public class MineTweakerImplementationAPI { */ public static IPlatformFunctions platform = null; - public static void onServerStart() { + /** + * Initializes the MineTweaker API. + * + * @param oreDict ore dictionary interface + * @param recipes recipe manager interface + * @param furnace furnace manager interface + * @param game game interface + * @param mods mods interface + */ + public static void init( + IOreDict oreDict, + IRecipeManager recipes, + IFurnaceManager furnace, + IGame game, + ILoadedMods mods) { + MineTweakerAPI.oreDict = oreDict; + MineTweakerAPI.recipes = recipes; + MineTweakerAPI.furnace = furnace; + MineTweakerAPI.game = game; + MineTweakerAPI.loadedMods = mods; + } + + /** + * Must be called upon server start. + * + * @param server server interface + */ + public static void onServerStart(IServer server) { + MineTweakerAPI.server = server; reload(); } + /** + * Must be called upon server stop. + */ public static void onServerStop() { - + MineTweakerAPI.server = null; } + /** + * Sets the script provider. + * + * @param provider script provider + */ + public static void setScriptProvider(IScriptProvider provider) { + MineTweakerAPI.tweaker.setScriptProvider(provider); + } + + /** + * Called to reload scripts. Must be called after setting a new script + * provider in order to reload scripts. + */ public static void reload() { logger.clear(); events.clear(); @@ -330,25 +379,20 @@ public class MineTweakerImplementationAPI { } } + /** + * Adds a new minetweaker command. Can be called with /mt <command&;gt; <arguments>. + * + * @param name command name + * @param description description strings + * @param function command implementation + */ public static void addMineTweakerCommand(String name, String[] description, ICommandFunction function) { - MineTweakerAPI.tweaker.apply(new AddMineTweakerCommandAction(new MineTweakerCommand(name, description, function))); + MineTweakerAPI.apply(new AddMineTweakerCommandAction(new MineTweakerCommand(name, description, function))); } - public static void callMineTweakerCommand(String[] arguments, IPlayer player) { - if (minetweakerCommands.containsKey(arguments[0])) { - minetweakerCommands.get(arguments[0]).function.execute( - Arrays.copyOfRange(arguments, 1, arguments.length), - player); - } - } - - public static Set getMineTweakerCommands() { - return minetweakerCommands.keySet(); - } - - public static String[] getMineTweakerCommandDescription(String command) { - return minetweakerCommands.get(command).description; - } + // ###################### + // ### Action classes ### + // ###################### private static class AddMineTweakerCommandAction implements IUndoableAction { private final MineTweakerCommand command; @@ -388,6 +432,10 @@ public class MineTweakerImplementationAPI { } } + // ############################# + // ### Private inner classes ### + // ############################# + private static class MineTweakerCommand { private final String name; private final String[] description; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlock.java b/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlock.java index 9864fde..1447026 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlock.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlock.java @@ -1,15 +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.api.block; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; + /** - * - * @author Stan + * Block interface. Used to interact with blocks in the world. + * + * @author Stan Hebben */ +@ZenClass("minetweaker.block.IBlock") public interface IBlock { - + /** + * Gets the block definition. + * + * @return block definition + */ + @ZenGetter("definition") + public IBlockDefinition getDefinition(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java new file mode 100644 index 0000000..61afe7a --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/block/IBlockDefinition.java @@ -0,0 +1,13 @@ +package minetweaker.api.block; + +import stanhebben.zenscript.annotations.ZenClass; + +/** + * Blocks definitions provide additional information about blocks. + * + * @author Stan Hebben + */ +@ZenClass("minetweaker.block.IBlockDefinition") +public interface IBlockDefinition { + +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/chat/IChatMessage.java b/MineTweaker3-API/src/main/java/minetweaker/api/chat/IChatMessage.java index f57a665..f771140 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/chat/IChatMessage.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/chat/IChatMessage.java @@ -1,9 +1,3 @@ -/* - * 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.api.chat; import stanhebben.zenscript.annotations.OperatorType; @@ -11,13 +5,27 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenOperator; /** - * - * @author Stan + * Represents a chat message. Strings can be converted into chat messages, + * and chat messages can be colored and concatenated. + * + * @author Stan Hebben */ @ZenClass("minetweaker.chat.IChatMessage") public interface IChatMessage { + /** + * Concatenates two chat messages. + * + * @param other other chat message + * @return concatenated chat message + */ @ZenOperator(OperatorType.ADD) public IChatMessage add(IChatMessage other); + /** + * Retrieves the internal object backing this object. Must be generated by the + * implementing platform. + * + * @return internal object + */ public Object getInternal(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java b/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java index a86e885..5d9f5e0 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java @@ -1,9 +1,3 @@ -/* - * 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.api.client; import minetweaker.api.player.IPlayer; @@ -11,11 +5,17 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; /** - * - * @author Stan + * Interface for client interaction. Only available on clients. + * + * @author Stan Hebben */ @ZenClass("minetweaker.api.IClient") public interface IClient { + /** + * Gets the current player. + * + * @return current player + */ @ZenGetter("player") public IPlayer getPlayer(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/container/IContainer.java b/MineTweaker3-API/src/main/java/minetweaker/api/container/IContainer.java index d64e2ff..89c28b3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/container/IContainer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/container/IContainer.java @@ -1,15 +1,41 @@ -/* - * 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.api.container; +import minetweaker.api.item.IItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; + /** - * - * @author Stan + * Container interface. + * + * @author Stan Hebben */ -public interface IContainer { +@ZenClass("minetweaker.container.IContainer") +public interface IContainer extends Iterable { + /** + * Gets the container size. + * + * @return container size + */ + @ZenGetter("containerSize") + public int getContainerSize(); + /** + * Gets the item stack at the given position. Returns null if there is no + * stack at that position. + * + * @param i stack position + * @return stack contents, or null + */ + @ZenMethod + public IItemStack getStack(int i); + + /** + * Sets the item stack at the given position. + * + * @param i stack position + * @param stack contents, or null to set an empty stack + */ + @ZenMethod + public void setStack(int i, IItemStack stack); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/damage/IDamageSource.java b/MineTweaker3-API/src/main/java/minetweaker/api/damage/IDamageSource.java index e06b2f6..6093899 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/damage/IDamageSource.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/damage/IDamageSource.java @@ -1,14 +1,8 @@ -/* - * 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.api.damage; /** * - * @author Stan + * @author Stan Hebben */ public interface IDamageSource { diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java index 7f9f288..5a79766 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataBool.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a boolean value (true or false). + * + * @author Stan Hebben */ public class DataBool implements IData { private final boolean value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java index 8fe4db1..b30e4c8 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByte.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a byte value (-128 .. 127) + * + * @author Stan Hebben */ public class DataByte implements IData { private final byte value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java index 1616539..4227967 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataByteArray.java @@ -1,9 +1,3 @@ -/* - * 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.api.data; import java.util.ArrayList; @@ -12,8 +6,9 @@ import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a byte array. + * + * @author Stan Hebben */ public class DataByteArray implements IData { private final byte[] data; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java index 3a6dc95..6cd0f7a 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataDouble.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a double-precision value. + * + * @author Stan Hebben */ public class DataDouble implements IData { private final double value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java index e076f93..e64d85a 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataFloat.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a single-precision floating point value. + * + * @author Stan Hebben */ public class DataFloat implements IData { private final float value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java index ce6a902..fae4dac 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataInt.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a 32-bit integer value. + * + * @author Stan Hebben */ public class DataInt implements IData { private final int value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java index f87512b..f39787a 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java @@ -1,9 +1,3 @@ -/* - * 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.api.data; import java.util.ArrayList; @@ -12,8 +6,9 @@ import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains an int array. + * + * @author Stan Hebben */ public class DataIntArray implements IData { private final int[] data; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java index c438475..f585a03 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataList.java @@ -1,9 +1,3 @@ -/* - * 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.api.data; import java.util.ArrayList; @@ -12,8 +6,9 @@ import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a list. + * + * @author Stan Hebben */ public class DataList implements IData { private final List values; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java index 3407212..3228aa6 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataLong.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a 64-bit long value. + * + * @author Stan Hebben */ public class DataLong implements IData { private final long value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java index b8a8d94..14c5e14 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataMap.java @@ -1,9 +1,3 @@ -/* - * 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.api.data; import java.util.Collections; @@ -12,10 +6,13 @@ import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a map, mapping strings to data elements. + * + * @author Stan Hebben */ public class DataMap implements IData { + public static final DataMap EMPTY = new DataMap(new HashMap(), true); + private final Map data; private final boolean immutable; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java index 8a35b0f..86d443e 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataShort.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a 16-bit short value. + * + * @author Stan Hebben */ public class DataShort implements IData { private final short value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java index 64e98d1..c460355 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataString.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Contains a string value. + * + * @author Stan Hebben */ public class DataString implements IData { private final String value; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java index 8eeab64..53aebce 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/IData.java @@ -1,9 +1,3 @@ -/* - * 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.api.data; import java.util.List; @@ -18,8 +12,11 @@ import stanhebben.zenscript.annotations.OperatorType; import stanhebben.zenscript.annotations.ZenMethod; /** - * - * @author Stan + * Generic data interface. A data element may contain any kind of basic data + * element (bool, byte, short, int, long, float, double, string, list, map, + * int array or byte array). Used to store data with stacks, blocks, world, ... + * + * @author Stan Hebben */ @ZenClass("minetweaker.data.IData") public interface IData { diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java index dfed5d0..2e9a2ef 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/IDataConverter.java @@ -1,17 +1,12 @@ -/* - * 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.api.data; import java.util.List; import java.util.Map; /** - * - * @author Stan + * Data converter interface. Used to convert data elements to other types. + * + * @author Stan Hebben * @param output type */ public interface IDataConverter { diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntity.java b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntity.java index 673c7e6..5237c8a 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntity.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntity.java @@ -1,9 +1,3 @@ -/* - * 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.api.entity; import minetweaker.api.util.Position3f; @@ -13,26 +7,60 @@ import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenSetter; /** - * - * @author Stan + * Entity interface. Used to obtain information about entities, and modify + * their data. Entities are any item that is freely movable in the world, + * such as players, monsters, items on the ground, ... + * + * @author Stan Hebben */ @ZenClass("minetweaker.entity.IEntity") public interface IEntity { - @ZenGetter("world") - public IDimension getWorld(); + /** + * Retrieves the dimension this entity is in. + * + * @return current dimension of this entity + */ + @ZenGetter("dimension") + public IDimension getDimension(); + /** + * Retrieves the x position of this entity. + * + * @return entity x position + */ @ZenGetter("x") public float getX(); + /** + * Retrieves the y position of this entity. + * + * @return entity y position + */ @ZenGetter("y") public float getY(); + /** + * Retrieves the z position of this entity. + * + * @return entity z position + */ @ZenGetter("z") public float getZ(); + /** + * Retrieves the position of this entity. + * + * @return entity position + */ @ZenGetter("position") public Position3f getPosition(); + /** + * Sets the position of this entity. Instantly moves (teleports) the entity + * to that position. + * + * @param position entity position + */ @ZenSetter("position") public void setPosition(Position3f position); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityItem.java b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityItem.java index 1ddde07..af9d2fe 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityItem.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityItem.java @@ -1,19 +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.api.entity; import minetweaker.api.item.IItemStack; import stanhebben.zenscript.annotations.ZenGetter; /** - * - * @author Stan + * Represents an item entity. Item entities are entities representing an item + * stack on the ground (or flying through the air). + * + * @author Stan Hebben */ public interface IEntityItem extends IEntity { + /** + * Gets the entity item. + * + * @return entity item + */ @ZenGetter("item") public IItemStack getItem(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityXp.java b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityXp.java index d133a11..9613f09 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityXp.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/entity/IEntityXp.java @@ -1,20 +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.api.entity; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; /** - * - * @author Stan + * Represents an xp orb. + * + * @author Stan Hebben */ @ZenClass("minetweaker.entity.IEntityXp") public interface IEntityXp extends IEntity { + /** + * Gets the amount of xp in this orb. + * + * @return xp amount + */ @ZenGetter("xp") public float getXp(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventHandle.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventHandle.java index 9dc4cde..0006604 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventHandle.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventHandle.java @@ -1,9 +1,3 @@ -/* - * 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.api.event; import java.io.Closeable; @@ -11,11 +5,15 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; /** - * - * @author Stan + * Represents an event handle. Event handles are used to cancel event listeners. + * + * @author Stan Hebben */ @ZenClass("minetweaker.event.IEventHandler") public interface IEventHandle extends Closeable { + /** + * Closes the event listener (stops listening and unregisters the listener). + */ @ZenMethod @Override public void close(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java index d06f2d6..76cc6c4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/event/IEventManager.java @@ -1,9 +1,3 @@ -/* - * 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.api.event; /** @@ -18,10 +12,6 @@ public interface IEventManager { public IEventHandle onPlayerChangedDimension(IPlayerChangedDimensionEventHandler ev); - public IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev); - - public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev); - public IEventHandle onPlayerRespawn(IPlayerRespawnEventHandler ev); public IEventHandle onPlayerAttackEntity(IPlayerAttackEntityEventHandler ev); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java index 911fbd0..fbcd88d 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/event/MTEventManager.java @@ -99,7 +99,6 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerLoggedIn = new EventList(); - @Override public IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev) { return elPlayerLoggedIn.add(ev); } @@ -118,7 +117,6 @@ public class MTEventManager implements IEventManager { private final EventList elPlayerLoggedOut = new EventList(); - @Override public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev) { return elPlayerLoggedOut.add(ev); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java b/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java index 3c1ef5f..b57c6d0 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java @@ -1,9 +1,3 @@ -/* - * 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.api.game; import java.util.List; @@ -13,14 +7,25 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; /** - * - * @author Stan + * Game interface. Used to obtain general game information. + * + * @author Stan Hebben */ @ZenClass("minetweaker.game.IGame") public interface IGame { + /** + * Retrieves the items in this game. + * + * @return game items + */ @ZenGetter("items") public List getItems(); + /** + * Retrieves the liquids in this game. + * + * @return game liquids + */ @ZenGetter("liquids") public List getLiquids(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java index 6d75850..df888bd 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java @@ -115,6 +115,11 @@ public interface IIngredient { @ZenMethod public IItemStack applyTransform(IItemStack item); + /** + * Checks if this ingredient has (or could have) any transformatiosns. + * + * @return true if there are (or could be) any transformations false otherwise. + */ @ZenGetter("hasTransformations") public boolean hasTransformers(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java index 872947e..3908e03 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java @@ -1,29 +1,43 @@ -/* - * 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.api.item; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; -import stanhebben.zenscript.annotations.ZenSetter; /** - * - * @author Stan + * Contains an item definition. Item definitions provide general information + * about an item, such as its name and ID. + * + * Item definitions themselves have no localized name, as it could be different + * for each subitem or even depend on NBT tags. + * + * @author Stan Hebben */ @ZenClass("minetweaker.item.IItemDefinition") public interface IItemDefinition { + /** + * Gets the item ID. + * + * @return item ID + */ @ZenGetter("id") public String getId(); + /** + * Gets the unlocalized item name. + * + * @return item name + */ @ZenGetter("name") public String getName(); + /** + * Makes an item stack from this definition. + * + * @param meta meta value + * @return item stack + */ @ZenMethod public IItemStack makeStack(@Optional int meta); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java index 880a5e2..730da75 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java @@ -1,9 +1,3 @@ -/* - * 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.api.item; import minetweaker.api.data.IData; @@ -16,57 +10,155 @@ import stanhebben.zenscript.annotations.ZenOperator; import stanhebben.zenscript.annotations.ZenSetter; /** - * - * @author Stan + * Contains an item stack. An item stack consists of an item definition, + * a meta or damage value and NBT data. + * + * @author Stan Hebben */ @ZenClass("minetweaker.item.IItemStack") public interface IItemStack extends IIngredient { + /** + * Gets the item definition. + * + * @return item definition + */ @ZenGetter("definition") public IItemDefinition getDefinition(); + /** + * Gets the unlocalized item name. + * + * @return unlocalized item name + */ @ZenGetter("name") public String getName(); + /** + * Gets the display name. By default, it is the localized item name, but + * could also be the display name from NBT data, or another item-specific + * name. + * + * @return item display name + */ @ZenGetter("displayName") public String getDisplayName(); + /** + * Sets the display name. Only works if the name is translatable. Does not + * override names set by NBT data or using item-specific logic. + * + * @param name item display name + */ @ZenSetter("displayName") public void setDisplayName(String name); + /** + * Gets the item damage. Returns 0 if the item cannot be damaged. + * + * @return item damage + */ @ZenGetter("damage") public int getDamage(); - @ZenGetter("tag") - public IData getTag(); - + /** + * Gets the maximum item damage. Returns 0 if the item cannot be damaged. + * + * @return maximum item damage + */ @ZenGetter("maxDamage") public int getMaxDamage(); + /** + * Gets the item tag. (NBT data) The resulting data is immutable and can + * only be changed with updateTag. Returns empty data if there is no data. + * Never returns null. + * + * @return item tag + */ + @ZenGetter("tag") + public IData getTag(); + + /** + * Gets the liquid contained in this item, if any. If this item stack is not + * an item container, it returns null. Only returns the amount of liquid + * in a single item and doesn't into account stack size. + * + * @return liquid data + */ @ZenGetter("liquid") public ILiquidStack getLiquid(); + /** + * Creates a new item stack with a different stack size. + * + * @param amount new item stack size + * @return new item stack + */ @ZenOperator(OperatorType.MUL) @ZenMethod public IItemStack amount(int amount); + /** + * Creates a weighted item stack with the given percentage chance. Does the + * same as item.weight(p * 0.01). + * + * @param p probability, with percent + * @return weighted item stack + */ @ZenOperator(OperatorType.MOD) public WeightedItemStack percent(float p); + /** + * Creates a weighted item stack with the given weight. + * + * @param p item weight + * @return weighted item stack + */ @ZenMethod public WeightedItemStack weight(float p); + /** + * Creates an item stack with the same item and stack size, but accepting + * any damage value. Only useful for items used as ingredients. + * + * @return item stack with wildcard damage + */ @ZenMethod public IIngredient anyDamage(); + /** + * Creates an item stack with the specified damage. + * + * @param damage damage value + * @return new, modified item stack + */ @ZenMethod public IItemStack withDamage(int damage); + /** + * Creates an item stack with the specified stack size. + * + * @param amount stack size + * @return new, modified item stack + */ @ZenMethod public IItemStack withAmount(int amount); + /** + * Creates an item stack with the given nbt tag. Ignores existing tags. + * + * @param tag item tag to be assigned + * @return resulting item stack + */ @ZenMethod public IItemStack withTag(IData tag); + /** + * Creates an item stack with updated nbt tag. Updates existing tags. + * + * @param tagUpdate item tag updates + * @return updated item stack + */ @ZenMethod public IItemStack updateTag(IData tagUpdate); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java index 80d3a0b..05d869b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java @@ -1,17 +1,12 @@ -/* - * 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.api.item; import java.util.List; import minetweaker.util.ArrayUtil; /** - * - * @author Stan + * Represents the wildcard ingredient (<*>). + * + * @author Stan Hebben */ public class IngredientAny implements IIngredient { public static final IngredientAny INSTANCE = new IngredientAny(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java index 66c7248..1adf326 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAnyAdvanced.java @@ -1,17 +1,13 @@ -/* - * 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.api.item; import java.util.List; import minetweaker.util.ArrayUtil; /** - * - * @author Stan + * Represents the wildcard ingredient, with conditions and/or transformers + * applied to it. + * + * @author Stan Hebben */ public class IngredientAnyAdvanced implements IIngredient { private final String mark; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientCondition.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientCondition.java index 24fdecf..12421d5 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientCondition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientCondition.java @@ -1,9 +1,3 @@ -/* - * 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.api.item; import minetweaker.api.data.IData; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java index e724939..39f3cee 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientItem.java @@ -1,9 +1,3 @@ -/* - * 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.api.item; import java.util.Collections; @@ -11,8 +5,9 @@ import java.util.List; import minetweaker.util.ArrayUtil; /** - * - * @author Stan + * Contains an item stack with modifiers applied to it. + * + * @author Stan Hebben */ public class IngredientItem implements IIngredient { private final IItemStack item; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java index b7fe171..3e74ae1 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientStack.java @@ -1,16 +1,12 @@ -/* - * 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.api.item; import java.util.List; /** - * - * @author Stan + * Contains an ingredient stack. Is an ingredient with a specific stack size + * assigned to it. + * + * @author Stan Hebben */ public class IngredientStack implements IIngredient { private final IIngredient ingredient; diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java index 22f33f8..196f7c4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java @@ -1,17 +1,13 @@ -/* - * 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.api.item; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; /** - * - * @author Stan + * Transformations can be used to modify an ingredient after it is used in a + * crafting recipe. It could reuse the item, damage it or consume multiple items. + * + * @author Stan Hebben */ @ZenExpansion("minetweaker.item.IIngredient") public class IngredientTransform { @@ -70,9 +66,9 @@ public class IngredientTransform { public IItemStack transform(IItemStack item) { int newDamage = item.getDamage() + damage; if (newDamage >= item.getMaxDamage()) { - return item.withAmount(item.getAmount() - 1).withDamage(newDamage - item.getMaxDamage()); + return item.withAmount(item.getAmount()).withDamage(0); } else { - return item.withDamage(newDamage); + return item.withAmount(item.getAmount() + 1).withDamage(newDamage); } } }); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/WeightedItemStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/WeightedItemStack.java index f2bf42d..cfadac4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/WeightedItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/WeightedItemStack.java @@ -1,17 +1,13 @@ -/* - * 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.api.item; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; /** - * - * @author Stan + * Contains a weighted item stack. Weighted item stacks simply contain a stack + * and a weight. + * + * @author Stan Hebben */ @ZenClass("minetweaker.item.WeightedItemStack") public final class WeightedItemStack { diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java b/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java index eaf70f8..9472168 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidDefinition.java @@ -1,26 +1,36 @@ -/* - * 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.api.liquid; +import java.util.List; +import minetweaker.api.item.IItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenOperator; import stanhebben.zenscript.annotations.OperatorType; +import stanhebben.zenscript.annotations.ZenMethod; import stanhebben.zenscript.annotations.ZenSetter; /** - * - * @author Stanneke + * Contains a liquid definition. Liquid definitions provide additional information + * about liquids. + * + * @author Stan Hebben */ @ZenClass("minetweaker.liquid.ILiquidDefinition") public interface ILiquidDefinition { + /** + * Converts this liquid into a liquid stack. + * + * @param millibuckets item stack size + * @return resulting item stack + */ @ZenOperator(OperatorType.MUL) public ILiquidStack asStack(int millibuckets); + /** + * Gets the unlocalized name of this item. + * + * @return unlocalized name + */ @ZenGetter("name") public String getName(); @@ -56,4 +66,13 @@ public interface ILiquidDefinition { @ZenSetter("gaseous") public void setGaseous(boolean gaseous); + + @ZenGetter("containers") + public List getContainers(); + + @ZenMethod + public void addContainer(IItemStack filled, IItemStack empty, int amount); + + @ZenMethod + public void removeContainer(IItemStack filled); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java index 3368e46..3796818 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingInventory.java @@ -13,35 +13,88 @@ import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; /** - * - * @author Stan + * Crafting inventory interface. The crafting inventory is the 2x2 grid in the + * player inventory or the 3x3 grid in the crafting bench. + * + * @author Stan Hebben */ @ZenClass("minetweaker.recipes.ICraftingInventory") public interface ICraftingInventory { + /** + * Gets the player owning this inventory. + * + * @return inventory player + */ @ZenGetter("player") public IPlayer getPlayer(); + /** + * Gets the size of this inventory. + * + * @return inventory size + */ @ZenGetter("size") public int getSize(); + /** + * Gets the width of this inventory. + * + * @return inventory width + */ @ZenGetter("width") public int getWidth(); + /** + * Gets the height of this inventory. + * + * @return inventory height + */ @ZenGetter("height") public int getHeight(); + /** + * Gets the number of stacks that are actually filled in. + * + * @return effective stack count + */ @ZenGetter("stackCount") public int getStackCount(); + /** + * Gets the stack at the given location. + * + * @param i stack index + * @return stack contents, or null + */ @ZenMethod public IItemStack getStack(int i); + /** + * Gets the stack at the given position. The top left stack is position (0, 0). + * + * @param x stack x position + * @param y stack y position + * @return item stack, or null if there is no item stack at that position + */ @ZenMethod public IItemStack getStack(int x, int y); + /** + * Sets the stack at the given position. The top left stack is position (0, 0). + * + * @param x stack x position + * @param y stack y position + * @param stack item stack to be set, or null to clear the stack at that position + */ @ZenMethod public void setStack(int x, int y, IItemStack stack); + /** + * Sets the stack at the given index. + * + * @param i stack index + * @param stack item stack to be set, or null to clear the stack at that index + */ @ZenMethod public void setStack(int i, IItemStack stack); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java b/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java new file mode 100644 index 0000000..f8403bf --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/server/AbstractServer.java @@ -0,0 +1,29 @@ +package minetweaker.api.server; + +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.event.IEventHandle; +import minetweaker.api.event.IPlayerLoggedInEventHandler; +import minetweaker.api.event.IPlayerLoggedOutEventHandler; + +/** + * Abstract server implementation. Implements call of which the implementation is + * already fixed by the API. + * + * @author Stan Hebben + */ +public abstract class AbstractServer implements IServer { + @Override + public final void addMineTweakerCommand(String name, String[] usage, ICommandFunction function) { + MineTweakerImplementationAPI.addMineTweakerCommand(name, usage, function); + } + + @Override + public final IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev) { + return MineTweakerImplementationAPI.events.onPlayerLoggedIn(ev); + } + + @Override + public final IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev) { + return MineTweakerImplementationAPI.events.onPlayerLoggedOut(ev); + } +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java b/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java index c883736..71dd544 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/server/IServer.java @@ -6,6 +6,9 @@ package minetweaker.api.server; +import minetweaker.api.event.IEventHandle; +import minetweaker.api.event.IPlayerLoggedInEventHandler; +import minetweaker.api.event.IPlayerLoggedOutEventHandler; import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; @@ -34,4 +37,10 @@ public interface IServer { @ZenMethod public boolean isOp(IPlayer player); + + @ZenMethod + public IEventHandle onPlayerLoggedIn(IPlayerLoggedInEventHandler ev); + + @ZenMethod + public IEventHandle onPlayerLoggedOut(IPlayerLoggedOutEventHandler ev); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalFunctions.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalFunctions.java index 257a41f..f3ef224 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalFunctions.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalFunctions.java @@ -16,6 +16,6 @@ public class GlobalFunctions { private GlobalFunctions() {} public static void print(String message) { - MineTweakerAPI.getLogger().logInfo(message); + MineTweakerAPI.logInfo(message); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java index 0ca465f..a115465 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java @@ -143,18 +143,18 @@ public class GlobalRegistry { @Override public void error(ZenPosition position, String message) { if (position == null) { - MineTweakerAPI.getLogger().logError("system: " + message); + MineTweakerAPI.logError("system: " + message); } else { - MineTweakerAPI.getLogger().logError(position + ": " + message); + MineTweakerAPI.logError(position + ": " + message); } } @Override public void warning(ZenPosition position, String message) { if (position == null) { - MineTweakerAPI.getLogger().logWarning("system: " + message); + MineTweakerAPI.logWarning("system: " + message); } else { - MineTweakerAPI.getLogger().logWarning(position + ": " + message); + MineTweakerAPI.logWarning(position + ": " + message); } } } @@ -259,12 +259,12 @@ public class GlobalRegistry { @Override public void error(ZenPosition position, String message) { - MineTweakerAPI.getLogger().logError(position.toString() + " > " + message); + MineTweakerAPI.logError(position.toString() + " > " + message); } @Override public void warning(ZenPosition position, String message) { - MineTweakerAPI.getLogger().logWarning(position.toString() + " > " + message); + MineTweakerAPI.logWarning(position.toString() + " > " + message); } } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java index d69a1d7..965b5b0 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java @@ -45,7 +45,7 @@ public class MTTweaker implements ITweaker { @Override public void apply(IUndoableAction action) { - MineTweakerAPI.getLogger().logInfo(action.describe()); + MineTweakerAPI.logInfo(action.describe()); Object overrideKey = action.getOverrideKey(); if (wereStuck.contains(action)) { @@ -76,10 +76,10 @@ public class MTTweaker implements ITweaker { for (int i = actions.size() - 1; i >= 0; i--) { IUndoableAction action = actions.get(i); if (action.canUndo()) { - MineTweakerAPI.getLogger().logInfo(action.describeUndo()); + MineTweakerAPI.logInfo(action.describeUndo()); action.undo(); } else { - MineTweakerAPI.getLogger().logInfo("[Stuck] " + action.describe()); + MineTweakerAPI.logInfo("[Stuck] " + action.describe()); stuck.add(0, action); wereStuck.add(action); @@ -129,12 +129,12 @@ public class MTTweaker implements ITweaker { ZenParsedFile pfile = new ZenParsedFile(filename, className, parser, environmentGlobal); files.add(pfile); } catch (IOException ex) { - MineTweakerAPI.getLogger().logError("Could not load script " + script.getName() + ": " + ex.getMessage()); + MineTweakerAPI.logError("Could not load script " + script.getName() + ": " + ex.getMessage()); } catch (ParseException ex) { //ex.printStackTrace(); - MineTweakerAPI.getLogger().logError("Error parsing " + ex.getFile().getFileName() + ":" + ex.getLine() + " -- " + ex.getExplanation()); + MineTweakerAPI.logError("Error parsing " + ex.getFile().getFileName() + ":" + ex.getLine() + " -- " + ex.getExplanation()); } catch (Exception ex) { - MineTweakerAPI.getLogger().logError("Error loading " + script.getName() + ": " + ex.toString()); + MineTweakerAPI.logError("Error loading " + script.getName() + ": " + ex.toString()); ex.printStackTrace(); } @@ -154,16 +154,16 @@ public class MTTweaker implements ITweaker { ZenModule module = new ZenModule(classes, MineTweakerAPI.class.getClassLoader()); module.getMain().run(); } catch (Exception ex) { - MineTweakerAPI.getLogger().logError("Error executing " + script.getGroupName() + ": " + ex.getMessage()); + MineTweakerAPI.logError("Error executing " + script.getGroupName() + ": " + ex.getMessage()); ex.printStackTrace(); } } } if (wereStuck.size() > 0) { - MineTweakerAPI.getLogger().logWarning(Integer.toString(wereStuck.size()) + " modifications were stuck"); + MineTweakerAPI.logWarning(Integer.toString(wereStuck.size()) + " modifications were stuck"); for (IUndoableAction action : wereStuck) { - MineTweakerAPI.getLogger().logInfo("Stuck: " + action.describe()); + MineTweakerAPI.logInfo("Stuck: " + action.describe()); } } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java index c50a8cc..969ea78 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderDirectory.java @@ -41,7 +41,7 @@ public class ScriptProviderDirectory implements IScriptProvider { try { scripts.add(new ScriptIteratorZip(file)); } catch (IOException ex) { - MineTweakerAPI.getLogger().logError("Could not load " + file.getName() + ": " + ex.getMessage()); + MineTweakerAPI.logError("Could not load " + file.getName() + ": " + ex.getMessage()); } } } 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 81b9f99..82b387d 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/providers/ScriptProviderMemory.java @@ -63,7 +63,7 @@ public class ScriptProviderMemory implements IScriptProvider { deflater.close(); } catch (IOException ex) { - MineTweakerAPI.getLogger().logError("Could not collect scripts: " + ex.getMessage()); + MineTweakerAPI.logError("Could not collect scripts: " + ex.getMessage()); } return output.toByteArray(); } @@ -96,7 +96,7 @@ public class ScriptProviderMemory implements IScriptProvider { inflaterData.close(); } catch (IOException ex) { - MineTweakerAPI.getLogger().logError("Could not load transmitted scripts: " + ex.getMessage()); + MineTweakerAPI.logError("Could not load transmitted scripts: " + ex.getMessage()); } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index f574c28..5f8d799 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -35,7 +35,7 @@ public class MineTweakerMC { public static ItemStack getItemStack(IItemStack item) { Object internal = item.getInternal(); if (internal == null || !(internal instanceof ItemStack)) { - MineTweakerAPI.getLogger().logError("Not a valid item stack: " + item); + MineTweakerAPI.logError("Not a valid item stack: " + item); } return (ItemStack) internal; } @@ -50,7 +50,7 @@ public class MineTweakerMC { public static ItemStack getItemStack(IIngredient ingredient) { List items = ingredient.getItems(); if (items.size() != 1) { - MineTweakerAPI.getLogger().logError("Not an ingredient with a single item: " + ingredient); + MineTweakerAPI.logError("Not an ingredient with a single item: " + ingredient); } return getItemStack(items.get(0)); } @@ -142,7 +142,7 @@ public class MineTweakerMC { if (internal != null && internal instanceof ItemStack) { output[i] = (ItemStack) internal; } else { - MineTweakerAPI.getLogger().logError("Invalid item stack: " + items.get(i)); + MineTweakerAPI.logError("Invalid item stack: " + items.get(i)); } } return output; @@ -207,7 +207,7 @@ public class MineTweakerMC { */ public static EntityPlayer getPlayer(IPlayer player) { if (!(player instanceof MCPlayer)) { - MineTweakerAPI.getLogger().logError("Invalid player: " + player); + MineTweakerAPI.logError("Invalid player: " + player); } return ((MCPlayer) player).getInternal(); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java index f252b00..51cf961 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java @@ -69,13 +69,14 @@ public class MineTweakerMod { private final Map userByNetwork = new HashMap(); public MineTweakerMod() { - MineTweakerAPI.oreDict = new MCOreDict(); - MineTweakerAPI.recipes = recipes = new MCRecipeManager(); - MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); - MineTweakerAPI.game = MCGame.INSTANCE; - MineTweakerAPI.furnace = new MCFurnaceManager(); - MineTweakerAPI.loadedMods = new MCLoadedMods(); + MineTweakerImplementationAPI.init( + new MCOreDict(), + recipes = new MCRecipeManager(), + new MCFurnaceManager(), + MCGame.INSTANCE, + new MCLoadedMods()); + MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; File globalDir = new File("scripts"); @@ -84,14 +85,15 @@ public class MineTweakerMod { } scriptsGlobal = new ScriptProviderDirectory(globalDir); - MineTweakerAPI.tweaker.setScriptProvider(scriptsGlobal); + MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); } public void onPlayerLogin(Player player, NetHandler netHandler, INetworkManager manager) { networkByUser.put(netHandler.getPlayer().username, manager); userByNetwork.put(manager, netHandler); - MineTweakerImplementationAPI.events.publishPlayerLoggedIn(new PlayerLoggedInEvent(MineTweakerMC.getIPlayer(netHandler.getPlayer()))); + MineTweakerImplementationAPI.events.publishPlayerLoggedIn( + new PlayerLoggedInEvent(MineTweakerMC.getIPlayer(netHandler.getPlayer()))); } public void onPlayerLogout(INetworkManager manager) { @@ -101,7 +103,9 @@ public class MineTweakerMod { String name = netHandler.getPlayer().username; networkByUser.remove(name); userByNetwork.remove(manager); - MineTweakerImplementationAPI.events.publishPlayerLoggedOut(new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(netHandler.getPlayer()))); + + MineTweakerImplementationAPI.events.publishPlayerLoggedOut( + new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(netHandler.getPlayer()))); } } @@ -145,13 +149,11 @@ public class MineTweakerMod { scriptsDir.mkdir(); } - MineTweakerAPI.server = new MCServer(ev.getServer()); - IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); IScriptProvider cascaded = new ScriptProviderCascade(scriptsGlobal, scriptsLocal); - MineTweakerAPI.tweaker.setScriptProvider(cascaded); - MineTweakerImplementationAPI.onServerStart(); + MineTweakerImplementationAPI.setScriptProvider(cascaded); + MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); } @EventHandler @@ -163,7 +165,7 @@ public class MineTweakerMod { public void onServerStopped(FMLServerStoppedEvent ev) { System.out.println("[MineTweaker] Server stopped"); - MineTweakerAPI.server = null; MineTweakerImplementationAPI.onServerStop(); + MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/FuelTweaker.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/FuelTweaker.java index cdf4caa..18c83ce 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/FuelTweaker.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/FuelTweaker.java @@ -47,7 +47,7 @@ public class FuelTweaker { public void addFuelPattern(SetFuelPattern pattern) { List items = pattern.getPattern().getItems(); if (items == null) { - MineTweakerAPI.getLogger().logError("Cannot set fuel for <*>"); + MineTweakerAPI.logError("Cannot set fuel for <*>"); return; } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/MCFurnaceManager.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/MCFurnaceManager.java index 61837df..4477d08 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/MCFurnaceManager.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/furnace/MCFurnaceManager.java @@ -60,9 +60,9 @@ public class MCFurnaceManager implements IFurnaceManager { } if (toRemove.isEmpty() && toRemoveMeta.isEmpty()) { - MineTweakerAPI.getLogger().logWarning("No furnace recipes for " + output.toString()); + MineTweakerAPI.logWarning("No furnace recipes for " + output.toString()); } else { - MineTweakerAPI.tweaker.apply(new RemoveAction(toRemove, toRemoveValues, toRemoveMeta, toRemoveMetaValues)); + MineTweakerAPI.apply(new RemoveAction(toRemove, toRemoveValues, toRemoveMeta, toRemoveMetaValues)); } } @@ -70,17 +70,17 @@ public class MCFurnaceManager implements IFurnaceManager { public void addRecipe(IItemStack output, IIngredient input, double xp) { List items = input.getItems(); if (items == null) { - MineTweakerAPI.getLogger().logError("Cannot turn " + input.toString() + " into a furnace recipe"); + MineTweakerAPI.logError("Cannot turn " + input.toString() + " into a furnace recipe"); } ItemStack[] items2 = getItemStacks(items); ItemStack output2 = getItemStack(output); - MineTweakerAPI.tweaker.apply(new AddRecipeAction(input, items2, output2, xp)); + MineTweakerAPI.apply(new AddRecipeAction(input, items2, output2, xp)); } @Override public void setFuel(IIngredient item, int fuel) { - MineTweakerAPI.tweaker.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); + MineTweakerAPI.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); } @Override diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java index fa3b58b..23f415c 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java @@ -9,6 +9,7 @@ package minetweaker.mc164.item; import java.util.Collections; import java.util.List; import minetweaker.MineTweakerAPI; +import minetweaker.api.data.DataMap; import minetweaker.mc164.data.NBTConverter; import minetweaker.mc164.liquid.MCLiquidStack; import minetweaker.api.data.IData; @@ -77,7 +78,7 @@ public class MCItemStack implements IItemStack { @Override public void setDisplayName(String name) { - MineTweakerAPI.tweaker.apply(new SetTranslationAction(getName() + ".name", name)); + MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); } @Override @@ -89,7 +90,7 @@ public class MCItemStack implements IItemStack { public IData getTag() { if (tag == null) { if (stack.stackTagCompound == null) { - return null; + return DataMap.EMPTY; } tag = NBTConverter.from(stack.stackTagCompound, true); @@ -111,7 +112,7 @@ public class MCItemStack implements IItemStack { @Override public IIngredient anyDamage() { if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.getLogger().logWarning("subitems don't have damaged states"); + MineTweakerAPI.logWarning("subitems don't have damaged states"); return this; } else { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, OreDictionary.WILDCARD_VALUE); @@ -123,7 +124,7 @@ public class MCItemStack implements IItemStack { @Override public IItemStack withDamage(int damage) { if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.getLogger().logWarning("subitems don't have damaged states"); + MineTweakerAPI.logWarning("subitems don't have damaged states"); return this; } else { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, damage); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/liquid/MCLiquidDefinition.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/liquid/MCLiquidDefinition.java index 058a090..4978302 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/liquid/MCLiquidDefinition.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/liquid/MCLiquidDefinition.java @@ -6,11 +6,22 @@ package minetweaker.mc164.liquid; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.liquid.ILiquidStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.mc164.util.MineTweakerHacks; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; /** @@ -18,6 +29,10 @@ import net.minecraftforge.fluids.FluidStack; * @author Stan */ public class MCLiquidDefinition implements ILiquidDefinition { + private static final Map containerFluidMap = MineTweakerHacks.getFluidContainerMap(); + private static final Map filledContainerMap = MineTweakerHacks.getFilledContainerMap(); + private static final Set emptyContainers = MineTweakerHacks.getEmptyContainers(); + private final Fluid fluid; public MCLiquidDefinition(Fluid fluid) { @@ -46,7 +61,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setLuminosity(int value) { - MineTweakerAPI.tweaker.apply(new ActionSetLuminosity(value)); + MineTweakerAPI.apply(new ActionSetLuminosity(value)); } @Override @@ -56,7 +71,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setDensity(int density) { - MineTweakerAPI.tweaker.apply(new ActionSetDensity(density)); + MineTweakerAPI.apply(new ActionSetDensity(density)); } @Override @@ -66,7 +81,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setTemperature(int temperature) { - MineTweakerAPI.tweaker.apply(new ActionSetTemperature(temperature)); + MineTweakerAPI.apply(new ActionSetTemperature(temperature)); } @Override @@ -76,7 +91,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setViscosity(int viscosity) { - MineTweakerAPI.tweaker.apply(new ActionSetViscosity(viscosity)); + MineTweakerAPI.apply(new ActionSetViscosity(viscosity)); } @Override @@ -86,13 +101,144 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setGaseous(boolean gaseous) { - MineTweakerAPI.tweaker.apply(new ActionSetGaseous(gaseous)); + MineTweakerAPI.apply(new ActionSetGaseous(gaseous)); + } + + @Override + public List getContainers() { + List result = new ArrayList(); + for (FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + if (data.fluid.getFluid() == fluid) { + result.add(MineTweakerMC.getIItemStack(data.filledContainer)); + } + } + return result; + } + + @Override + public void addContainer(IItemStack filled, IItemStack empty, int amount) { + MineTweakerAPI.apply(new AddContainerAction(filled, empty, amount)); + } + + @Override + public void removeContainer(IItemStack filled) { + MineTweakerAPI.apply(new RemoveContainerAction(filled)); + } + + // ####################### + // ### Private methods ### + // ####################### + + private void removeContainerInner(IItemStack filled) { + ItemStack filledItem = MineTweakerMC.getItemStack(filled); + FluidContainerData data = filledContainerMap.get(Arrays.asList(filledItem.itemID, filledItem.getItemDamage())); + if (data != null) { + filledContainerMap.remove(Arrays.asList(filledItem.itemID, filledItem.getItemDamage())); + containerFluidMap.remove(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage())); + + // rebuild empty containers set + emptyContainers.clear(); + for (FluidContainerData fdata : filledContainerMap.values()) { + emptyContainers.add(Arrays.asList(fdata.emptyContainer.itemID, fdata.emptyContainer.getItemDamage())); + } + } + } + + private FluidContainerData getData(IItemStack filled) { + ItemStack filledStack = MineTweakerMC.getItemStack(filled); + return filledContainerMap.get(Arrays.asList(filledStack.itemID, filledStack.getItemDamage())); } // ###################### // ### Action classes ### // ###################### + private class AddContainerAction implements IUndoableAction { + private final IItemStack filled; + private final IItemStack empty; + private final int amount; + + public AddContainerAction(IItemStack filled, IItemStack empty, int amount) { + this.filled = filled; + this.empty = empty; + this.amount = amount; + } + + @Override + public void apply() { + FluidContainerRegistry.registerFluidContainer(new FluidStack(fluid, amount), MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + removeContainerInner(filled); + } + + @Override + public String describe() { + return "Adding " + filled.getDisplayName() + " as liquid container for " + fluid.getLocalizedName(); + } + + @Override + public String describeUndo() { + return "Removing liquid container " + filled; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private class RemoveContainerAction implements IUndoableAction { + private final IItemStack filled; + private final IItemStack empty; + private final FluidStack amount; + + public RemoveContainerAction(IItemStack filled) { + this.filled = filled; + + FluidContainerData data = getData(filled); + empty = MineTweakerMC.getIItemStack(data.emptyContainer); + amount = data.fluid; + } + + @Override + public void apply() { + removeContainerInner(filled); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + FluidContainerRegistry.registerFluidContainer(amount, MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); + } + + @Override + public String describe() { + return "Removing liquid container " + filled; + } + + @Override + public String describeUndo() { + return "Restoring liquid container " + filled; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + private class ActionSetLuminosity implements IUndoableAction { private final int oldValue; private final int newValue; diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java index 907ca21..52f049d 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java @@ -17,6 +17,7 @@ import java.net.URISyntaxException; import java.nio.ByteBuffer; import java.nio.charset.Charset; import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; import minetweaker.runtime.providers.ScriptProviderMemory; public class MCPacketHandler implements IPacketHandler { @@ -34,9 +35,8 @@ public class MCPacketHandler implements IPacketHandler { if (packet.channel.equals(CHANNEL_SERVERSCRIPT)) { System.out.println("Received script data: " + packet.data.length + " bytes"); - MineTweakerAPI.tweaker.setScriptProvider(new ScriptProviderMemory(packet.data)); - MineTweakerAPI.tweaker.rollback(); - MineTweakerAPI.tweaker.load(); + MineTweakerImplementationAPI.setScriptProvider(new ScriptProviderMemory(packet.data)); + MineTweakerImplementationAPI.reload(); } else if (packet.channel.equals(CHANNEL_OPENBROWSER)) { String url = UTF8.decode(ByteBuffer.wrap(packet.data)).toString().trim(); if(Desktop.isDesktopSupported()){ diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java index dd0aa17..2eabef5 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/oredict/MCOreDictEntry.java @@ -57,18 +57,18 @@ public class MCOreDictEntry implements IOreDictEntry { public void add(IItemStack item) { ItemStack stack = getItemStack(item); if (stack == null) { - MineTweakerAPI.getLogger().logError("not a valid item"); + MineTweakerAPI.logError("not a valid item"); } else { - MineTweakerAPI.tweaker.apply(new ActionAddItem(id, stack)); + MineTweakerAPI.apply(new ActionAddItem(id, stack)); } } @Override public void addAll(IOreDictEntry entry) { if (entry instanceof MCOreDictEntry) { - MineTweakerAPI.tweaker.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id)); + MineTweakerAPI.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id)); } else { - MineTweakerAPI.getLogger().logError("not a valid entry"); + MineTweakerAPI.logError("not a valid entry"); } } @@ -83,7 +83,7 @@ public class MCOreDictEntry implements IOreDictEntry { } if (result != null) { - MineTweakerAPI.tweaker.apply(new ActionRemoveItem(id, result)); + MineTweakerAPI.apply(new ActionRemoveItem(id, result)); } } @@ -101,9 +101,9 @@ public class MCOreDictEntry implements IOreDictEntry { @Override public void mirror(IOreDictEntry other) { if (other instanceof MCOreDictEntry) { - MineTweakerAPI.tweaker.apply(new ActionMirror(id, ((MCOreDictEntry) other).id)); + MineTweakerAPI.apply(new ActionMirror(id, ((MCOreDictEntry) other).id)); } else { - MineTweakerAPI.getLogger().logError("not a valid oredict entry"); + MineTweakerAPI.logError("not a valid oredict entry"); } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java index d82fdb2..b7b38d8 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/player/MCPlayer.java @@ -58,7 +58,7 @@ public class MCPlayer implements IPlayer { Object internal = message.getInternal(); if (!(internal instanceof ChatMessageComponent)) { //throw new RuntimeException("Not a valid chat message: " + internal); - MineTweakerAPI.getLogger().logError("not a valid chat message"); + MineTweakerAPI.logError("not a valid chat message"); return; } player.sendChatToPlayer((ChatMessageComponent) internal); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java index 02d35b5..14944ba 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/recipes/MCRecipeManager.java @@ -70,7 +70,7 @@ public class MCRecipeManager implements IRecipeManager { } } - MineTweakerAPI.tweaker.apply(new ActionRemoveRecipes(toRemove, removeIndex)); + MineTweakerAPI.apply(new ActionRemoveRecipes(toRemove, removeIndex)); return toRemove.size(); } @@ -83,14 +83,14 @@ public class MCRecipeManager implements IRecipeManager { public void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, boolean mirrored) { ShapedRecipe recipe = new ShapedRecipe(output, ingredients, function, mirrored); IRecipe irecipe = RecipeConverter.convert(recipe); - MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe, recipe)); + MineTweakerAPI.apply(new ActionAddRecipe(irecipe, recipe)); } @Override public void addShapeless(IItemStack output, IIngredient[] ingredients, IRecipeFunction function) { ShapelessRecipe recipe = new ShapelessRecipe(output, ingredients, function); IRecipe irecipe = RecipeConverter.convert(recipe); - MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe, recipe)); + MineTweakerAPI.apply(new ActionAddRecipe(irecipe, recipe)); } @Override @@ -166,7 +166,7 @@ public class MCRecipeManager implements IRecipeManager { removeIndex.add(i); } - MineTweakerAPI.tweaker.apply(new ActionRemoveRecipes(toRemove, removeIndex)); + MineTweakerAPI.apply(new ActionRemoveRecipes(toRemove, removeIndex)); return toRemove.size(); } @@ -234,7 +234,7 @@ public class MCRecipeManager implements IRecipeManager { removeIndex.add(i); } - MineTweakerAPI.tweaker.apply(new ActionRemoveRecipes(toRemove, removeIndex)); + MineTweakerAPI.apply(new ActionRemoveRecipes(toRemove, removeIndex)); return toRemove.size(); } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java index 4af985f..976969d 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/server/MCServer.java @@ -13,10 +13,10 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; +import minetweaker.api.server.AbstractServer; import minetweaker.api.server.ICommandFunction; import minetweaker.api.server.ICommandTabCompletion; import minetweaker.api.server.ICommandValidator; -import minetweaker.api.server.IServer; import net.minecraft.command.CommandHandler; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; @@ -27,7 +27,7 @@ import net.minecraft.server.MinecraftServer; * * @author Stan */ -public class MCServer implements IServer { +public class MCServer extends AbstractServer { private final MinecraftServer server; public MCServer(MinecraftServer server) { @@ -37,23 +37,18 @@ public class MCServer implements IServer { @Override public void addCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) { ICommand command = new MCCommand(name, usage, aliases, function, validator, completion); - MineTweakerAPI.tweaker.apply(new AddCommandAction(command)); + MineTweakerAPI.apply(new AddCommandAction(command)); } @Override public void removeCommand(String name) { ICommand command = (ICommand)((CommandHandler) server.getCommandManager()).getCommands().get(name); if (command == null) { - MineTweakerAPI.getLogger().logWarning("No such command: " + name); + MineTweakerAPI.logWarning("No such command: " + name); } else { - MineTweakerAPI.tweaker.apply(new RemoveCommandAction(command)); + MineTweakerAPI.apply(new RemoveCommandAction(command)); } } - - @Override - public void addMineTweakerCommand(String name, String[] usage, ICommandFunction function) { - MineTweakerImplementationAPI.addMineTweakerCommand(name, usage, function); - } @Override public boolean isOp(IPlayer player) { diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java index d37cb5c..b343faa 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java @@ -10,6 +10,7 @@ import java.io.File; import java.lang.reflect.Field; import java.util.List; import java.util.Map; +import java.util.Set; import minetweaker.MineTweakerAPI; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -19,6 +20,8 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.StringTranslate; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -64,7 +67,7 @@ public class MineTweakerHacks { try { return (Map>) OREDICTIONARY_ORESTACKS.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("ERROR - could not load ore dictionary stacks!"); + MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); return null; } } @@ -73,7 +76,7 @@ public class MineTweakerHacks { try { return (File) MINECRAFTSERVER_ANVILFILE.get(server); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not load anvil file!"); + MineTweakerAPI.logError("could not load anvil file!"); return null; } } @@ -93,7 +96,7 @@ public class MineTweakerHacks { try { return SHAPEDORERECIPE_WIDTH.getInt(recipe); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not load anvil file!"); + MineTweakerAPI.logError("could not load anvil file!"); return 3; } } @@ -102,7 +105,7 @@ public class MineTweakerHacks { try { return (Container) INVENTORYCRAFTING_EVENTHANDLER.get(inventory); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get inventory eventhandler"); + MineTweakerAPI.logError("could not get inventory eventhandler"); return null; } } @@ -111,7 +114,7 @@ public class MineTweakerHacks { try { return (EntityPlayer) SLOTCRAFTING_PLAYER.get(slot); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get inventory eventhandler"); + MineTweakerAPI.logError("could not get inventory eventhandler"); return null; } } @@ -121,7 +124,37 @@ public class MineTweakerHacks { Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); return (StringTranslate) field.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get string translator"); + MineTweakerAPI.logError("could not get string translator"); + return null; + } + } + + public static Map getFluidContainerMap() { + try { + Field field = getField(FluidContainerRegistry.class, new String[] {"containerFluidMap"}); + return (Map) field.get(null); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logError("could not get fluid container registry"); + return null; + } + } + + public static Map getFilledContainerMap() { + try { + Field field = getField(FluidContainerRegistry.class, new String[] {"filledContainerMap"}); + return (Map) field.get(null); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logError("could not get filled container map"); + return null; + } + } + + public static Set getEmptyContainers() { + try { + Field field = getField(FluidContainerRegistry.class, new String[] {"emptyContainers"}); + return (Set) field.get(null); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logError("could not get filled container map"); return null; } } diff --git a/MineTweaker3-MC164-Mod-IC2/build.gradle b/MineTweaker3-MC164-Mod-IC2/build.gradle new file mode 100644 index 0000000..422ed04 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/build.gradle @@ -0,0 +1,38 @@ +import minetweaker.tasks.RegisterZenClassesTask; + +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + } +} + +apply plugin: 'forge' +minecraft{version = "1.6.4-9.11.1.964"} +version = "1.0" +archivesBaseName = project.projectDir.name + +dependencies { + compile project(':ZenScript') + compile project(':MineTweaker3-API') + compile project(':MineTweaker3-MC164-Main') + compile files('libs/industrialcraft-2_2.0.383-experimental.jar') +} + +task makeRegistry(type: RegisterZenClassesTask) { + inputDir = file('build/classes/main') + outputDir = file('build/classes/main') + className = 'minetweaker.mods.ic2.ClassRegistry' +} + +tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC164-Mod-IC2/libs/industrialcraft-2_2.0.383-experimental.jar b/MineTweaker3-MC164-Mod-IC2/libs/industrialcraft-2_2.0.383-experimental.jar new file mode 100644 index 0000000..ed20267 Binary files /dev/null and b/MineTweaker3-MC164-Mod-IC2/libs/industrialcraft-2_2.0.383-experimental.jar differ diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java new file mode 100644 index 0000000..21217ab --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java @@ -0,0 +1,99 @@ +package minetweaker.mods.ic2; + +import ic2.api.item.Items; +import java.util.List; +import minetweaker.IBracketHandler; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.BracketHandler; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import stanhebben.zenscript.ZenTokener; +import stanhebben.zenscript.expression.ExpressionInt; +import stanhebben.zenscript.expression.ExpressionJavaCallStatic; +import stanhebben.zenscript.expression.ExpressionString; +import stanhebben.zenscript.expression.partial.IPartialExpression; +import stanhebben.zenscript.parser.Token; +import stanhebben.zenscript.symbols.IZenSymbol; +import stanhebben.zenscript.type.ZenType; +import stanhebben.zenscript.type.natives.JavaMethod; +import stanhebben.zenscript.util.ZenPosition; + +/** + * Makes a ic2-item specific item syntax available in the form <item-ic2:name[:meta]>. + * + * @author Stan Hebben + */ +@BracketHandler +@ModOnly("IC2") +public class IC2BracketHandler implements IBracketHandler { + public static IItemStack getItem(String name, int meta) { + ItemStack stack = Items.getItem(name); + stack.setItemDamage(meta); + return getIItemStack(stack); + } + + private final JavaMethod method; + + public IC2BracketHandler() { + method = MineTweakerAPI.getJavaMethod(IC2BracketHandler.class, "getItem", String.class, int.class); + } + + @Override + public IZenSymbol resolve(List tokens) { + if (tokens.size() >= 5) { + 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; + if (tokens.size() > 6 && tokens.get(5).getValue().equals(":")) { + if (tokens.get(6).getType() == ZenTokener.T_INTVALUE) { + meta = Integer.parseInt(tokens.get(6).getValue()); + } else if (tokens.get(6).getValue().equals("*")) { + meta = OreDictionary.WILDCARD_VALUE; + } else { + MineTweakerAPI.logError("Not a valid meta value: " + tokens.get(6).getValue()); + } + } + ItemStack item = Items.getItem(name); + if (item == null) { + MineTweakerAPI.logError("Not a valid IC2 item: " + name); + return null; + } else { + return new ItemReferenceSymbol(name, meta); + } + } else { + return null; + } + } else { + return null; + } + } + + // ############################# + // ### Private inner classes ### + // ############################# + + private class ItemReferenceSymbol implements IZenSymbol { + private final String name; + private final int meta; + + public ItemReferenceSymbol(String name, int meta) { + this.name = name; + this.meta = meta; + } + + @Override + public IPartialExpression instance(ZenPosition position) { + return new ExpressionJavaCallStatic( + position, + method, + new ExpressionString(position, name), + new ExpressionInt(position, meta, ZenType.INT)); + } + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java new file mode 100644 index 0000000..8083b9f --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java @@ -0,0 +1,167 @@ +package minetweaker.mods.ic2; + +import ic2.api.tile.ExplosionWhitelist; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * Manages the explosion whitelist in IC2. Blocks on this whitelist will not resist + * an explosion but won't be destroyed. + * + * The explosion code by default ignores blocks which absorb more than 1000 explosion power to + * prevent abusing personal safes, Trade-O-Mats and other blocks to serve as a cheap and + * invulnerable reactor chambers. Said blocks will not shield the explosion and won't get + * destroyed. + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.ExplosionWhitelist") +@ModOnly("IC2") +public class IC2ExplosionWhitelist { + /** + * Adds a block to the explosion whitelist. + * + * @param item item to add + */ + @ZenMethod + public static void add(IItemStack item) { + ItemStack iStack = getItemStack(item); + Block block = getBlock(iStack.getItem()); + if (block == null) { + MineTweakerAPI.logError("This item is not a block"); + } else { + MineTweakerAPI.apply(new AddAction(block)); + } + } + + /** + * Removes a block from the explosion whitelist. + * + * @param item item to remove + */ + @ZenMethod + public static void remove(IItemStack item) { + ItemStack iStack = getItemStack(item); + Block block = getBlock(iStack.getItem()); + if (block == null) { + MineTweakerAPI.logError("This item is not a block"); + } else { + if (ExplosionWhitelist.isBlockWhitelisted(block)) { + MineTweakerAPI.logWarning("This block is not in the whitelist"); + } else { + MineTweakerAPI.apply(new RemoveAction(block)); + } + } + } + + /** + * Checks if the given item is already whitelisted. + * + * @param item item to check + * @return true if whitelisted + */ + @ZenMethod + public static boolean isWhitelisted(IItemStack item) { + ItemStack iStack = getItemStack(item); + Block block = getBlock(iStack.getItem()); + if (block == null) { + MineTweakerAPI.logWarning("This item is not a block"); + return false; + } else { + return ExplosionWhitelist.isBlockWhitelisted(block); + } + } + + private static Block getBlock(Item item) { + if (item.itemID >= Block.blocksList.length) return null; + return Block.blocksList[item.itemID]; + } + + // ###################### + // ### Action classes ### + // ###################### + + private static class AddAction implements IUndoableAction { + private final Block block; + + public AddAction(Block block) { + this.block = block; + } + + @Override + public void apply() { + ExplosionWhitelist.addWhitelistedBlock(block); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ExplosionWhitelist.removeWhitelistedBlock(block); + } + + @Override + public String describe() { + return "Adding block to IC2 explosion whitelist: " + block.getLocalizedName(); + } + + @Override + public String describeUndo() { + return "Removing block from IC2 explosion whitelist: " + block.getLocalizedName(); + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private static class RemoveAction implements IUndoableAction { + private final Block block; + + public RemoveAction(Block block) { + this.block = block; + } + + @Override + public void apply() { + ExplosionWhitelist.removeWhitelistedBlock(block); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ExplosionWhitelist.addWhitelistedBlock(block); + } + + @Override + public String describe() { + return "Removing block from IC2 explosion whitelist: " + block.getLocalizedName(); + } + + @Override + public String describeUndo() { + return "Adding block to IC2 explosion whitelist: " + block.getLocalizedName(); + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java new file mode 100644 index 0000000..315d0d6 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java @@ -0,0 +1,70 @@ +/* + * 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; + +import ic2.api.recipe.IRecipeInput; +import java.util.ArrayList; +import java.util.List; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import net.minecraft.item.ItemStack; + +/** + * Wrapper class for ITweakerItemStackPatterns to IC2 recipe inputs. + * + * @author Stan Hebben + */ +public class IC2RecipeInput implements IRecipeInput { + private final IIngredient ingredient; + + public IC2RecipeInput(IIngredient ingredient) { + this.ingredient = ingredient; + } + + @Override + public boolean matches(ItemStack subject) { + return ingredient.matches(getIItemStack(subject)); + } + + @Override + public int getAmount() { + return ingredient.getAmount(); + } + + @Override + public List getInputs() { + List items = new ArrayList(); + for (IItemStack item : ingredient.getItems()) { + items.add(getItemStack(item)); + } + return items; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 89 * hash + (this.ingredient != null ? this.ingredient.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final IC2RecipeInput other = (IC2RecipeInput) obj; + if (this.ingredient != other.ingredient && (this.ingredient == null || !this.ingredient.equals(other.ingredient))) { + return false; + } + return true; + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java new file mode 100644 index 0000000..4866974 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java @@ -0,0 +1,100 @@ +package minetweaker.mods.ic2; + +import ic2.api.recipe.IMachineRecipeManager; +import java.util.Arrays; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +/** + * + * @author Stan Hebben + */ +public class MachineAddRecipeAction extends OneWayAction { + private final String name; + private final IMachineRecipeManager machine; + private final ItemStack[] output; + private final IC2RecipeInput input; + private final NBTTagCompound tag; + + public MachineAddRecipeAction(String name, IMachineRecipeManager machine, ItemStack[] output, NBTTagCompound tag, IC2RecipeInput input) { + this.name = name; + this.machine = machine; + this.output = output; + this.input = input; + this.tag = tag; + } + + @Override + public void apply() { + try { + machine.addRecipe(input, tag, output); + } catch (RuntimeException ex) { + MineTweakerAPI.logError(ex.getMessage()); + } + } + + @Override + public String describe() { + if (output.length == 1) { + return "Adding " + name + " recipe for " + output[0].getDisplayName(); + } else { + StringBuilder result = new StringBuilder(); + result.append("Adding ").append(name).append(" recipe for "); + result.append("["); + for (int i = 0; i < output.length; i++) { + if (i == 0) { + result.append(", "); + } else { + result.append(output[i].getDisplayName()); + } + } + result.append("]"); + return result.toString(); + } + } + + @Override + public Object getOverrideKey() { + return null; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0); + hash = 47 * hash + (this.machine != null ? this.machine.hashCode() : 0); + hash = 47 * hash + Arrays.deepHashCode(this.output); + hash = 47 * hash + (this.input != null ? this.input.hashCode() : 0); + hash = 47 * hash + (this.tag != null ? this.tag.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final MachineAddRecipeAction other = (MachineAddRecipeAction) obj; + if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { + return false; + } + if (this.machine != other.machine && (this.machine == null || !this.machine.equals(other.machine))) { + return false; + } + if (!Arrays.deepEquals(this.output, other.output)) { + return false; + } + if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) { + return false; + } + if (this.tag != other.tag && (this.tag == null || !this.tag.equals(other.tag))) { + return false; + } + return true; + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java new file mode 100644 index 0000000..43ba48b --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java @@ -0,0 +1,141 @@ +package minetweaker.mods.ic2.expand; + +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import minetweaker.annotations.ModOnly; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import minetweaker.api.item.IItemStack; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import stanhebben.zenscript.annotations.Optional; +import stanhebben.zenscript.annotations.ZenExpansion; +import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenExpansion("minecraft.item.IItemStack") +@ModOnly("IC2") +public class ItemExpansion { + /** + * Gets the charge level of this item. + * + * @param stack target + * @return charge level + */ + @ZenGetter("ic2getCharge") + public static int getIC2Charge(IItemStack stack) { + return ElectricItem.manager.getCharge(getItemStack(stack)); + } + + /** + * Gets the tier level of this item. + * + * @param stack target + * @return tier level + */ + @ZenGetter("ic2tier") + public static int getIC2Tier(IItemStack stack) { + ItemStack iStack = getItemStack(stack); + if (iStack.getItem() instanceof IElectricItem) { + return ((IElectricItem) iStack.getItem()).getTier(iStack); + } else { + return 0; + } + } + + /** + * Gets the transfer limit of the specified stack. + * + * @param stack target + * @return + */ + @ZenGetter("ic2transferLimit") + public static int getIC2TransferLimit(IItemStack stack) { + ItemStack iStack = getItemStack(stack); + if (iStack.getItem() instanceof IElectricItem) { + return ((IElectricItem) iStack.getItem()).getTransferLimit(iStack); + } else { + return 0; + } + } + + /** + * Gets the fully charged IC2 item. + * + * @param stack target + * @return charged item + */ + @ZenGetter("ic2charged") + public static IItemStack getIC2Charged(IItemStack stack) { + ItemStack iStack = getItemStack(stack); + if (iStack.getItem() instanceof IElectricItem) { + IElectricItem eItem = (IElectricItem) iStack.getItem(); + Item item = Item.itemsList[eItem.getChargedItemId(iStack)]; + ItemStack stack2 = new ItemStack(item, 1, 0); + ElectricItem.manager.charge(stack2, eItem.getMaxCharge(stack2), eItem.getTier(stack2), true, false); + return getIItemStack(stack2); + } else { + return null; + } + } + + /** + * Gets the fully discharged IC2 item. + * + * @param stack target + * @return discharged item + */ + @ZenGetter("ic2discharged") + public static IItemStack getIC2Discharged(IItemStack stack) { + ItemStack iStack = getItemStack(stack); + if (iStack.getItem() instanceof IElectricItem) { + IElectricItem eItem = (IElectricItem) iStack.getItem(); + Item item = Item.itemsList[eItem.getEmptyItemId(iStack)]; + return getItemStack(item, 1, 0); + } else { + return null; + } + } + + /** + * Charges the item with the specified amount and returns the charged item. + * + * @param stack target + * @param amount charge amount + * @param tier charge tier + * @return charged item + */ + @ZenMethod("ic2charge") + public static IItemStack ic2Charge(IItemStack stack, int amount, @Optional int tier) { + if (tier == 0) { + tier = getIC2Tier(stack); + } + + ItemStack iStack = getItemStack(stack).copy(); + ElectricItem.manager.charge(iStack, amount, tier, true, false); + return getIItemStack(iStack); + } + + /** + * Discharges the item with the specified amount and returns the discharged item. + * + * @param stack target + * @param amount discharge amount + * @param tier charge tier + * @return discharged item + */ + @ZenMethod("ic2discharge") + public static IItemStack ic2Discharge(IItemStack stack, int amount, @Optional int tier) { + if (tier == 0) { + tier = getIC2Tier(stack); + } + + ItemStack iStack = getItemStack(stack).copy(); + ElectricItem.manager.discharge(iStack, amount, tier, true, false); + return getIItemStack(iStack); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java new file mode 100644 index 0000000..8f0a46e --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -0,0 +1,165 @@ +/* + * 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.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.api.liquid.ILiquidStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import minetweaker.mods.ic2.IC2RecipeInput; +import net.minecraftforge.fluids.FluidStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenClass("mods.ic2.Canner") +@ModOnly("IC2") +public class Canner { + @ZenMethod + public static void addBottleRecipe(IIngredient container, IIngredient fill, IItemStack output) { + MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); + } + + @ZenMethod + public static void addBottleRecipe(IIngredient container, ILiquidStack liquid, IItemStack output) { + MineTweakerAPI.logError("Not supported in this mod support version"); + } + + @ZenMethod + public static void addEnrichRecipe(ILiquidStack input, IIngredient additive, ILiquidStack output) { + MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); + } + + @ZenMethod + public static void addEnrichRecipe(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { + MineTweakerAPI.logError("Not supported in this mod support version"); + } + + private static class AddBottleIngredientAction extends OneWayAction { + private final IIngredient container; + private final IIngredient fill; + private final IItemStack output; + + public AddBottleIngredientAction(IIngredient container, IIngredient fill, IItemStack output) { + this.container = container; + this.fill = fill; + this.output = output; + } + + @Override + public void apply() { + Recipes.cannerBottle.addRecipe( + new IC2RecipeInput(container), + new IC2RecipeInput(fill), + getItemStack(output)); + } + + @Override + public String describe() { + return "Adding canner bottle recipe " + container + " + " + fill + " => " + output; + } + + @Override + public Object getOverrideKey() { + return null; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 67 * hash + (this.container != null ? this.container.hashCode() : 0); + hash = 67 * hash + (this.fill != null ? this.fill.hashCode() : 0); + hash = 67 * hash + (this.output != null ? this.output.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AddBottleIngredientAction other = (AddBottleIngredientAction) obj; + if (this.container != other.container && (this.container == null || !this.container.equals(other.container))) { + return false; + } + if (this.fill != other.fill && (this.fill == null || !this.fill.equals(other.fill))) { + return false; + } + if (this.output != other.output && (this.output == null || !this.output.equals(other.output))) { + return false; + } + return true; + } + } + + private static class AddEnrichIngredientAction extends OneWayAction { + private final ILiquidStack input; + private final IIngredient additive; + private final ILiquidStack output; + + public AddEnrichIngredientAction(ILiquidStack input, IIngredient additive, ILiquidStack output) { + this.input = input; + this.additive = additive; + this.output = output; + } + + @Override + public void apply() { + Recipes.cannerEnrich.addRecipe((FluidStack) input.getInternal(), new IC2RecipeInput(additive), (FluidStack) output.getInternal()); + } + + @Override + public String describe() { + return "Adding canner enrich recipe " + input + " + " + additive + " => " + output; + } + + @Override + public Object getOverrideKey() { + return null; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 47 * hash + (this.input != null ? this.input.hashCode() : 0); + hash = 47 * hash + (this.additive != null ? this.additive.hashCode() : 0); + hash = 47 * hash + (this.output != null ? this.output.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AddEnrichIngredientAction other = (AddEnrichIngredientAction) obj; + if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) { + return false; + } + if (this.additive != other.additive && (this.additive == null || !this.additive.equals(other.additive))) { + return false; + } + if (this.output != other.output && (this.output == null || !this.output.equals(other.output))) { + return false; + } + return true; + } + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java new file mode 100644 index 0000000..646735f --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java @@ -0,0 +1,69 @@ +package minetweaker.mods.ic2.machines; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +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; + +/** + * Provides access to the IC2 compressor recipes. Recipes can be added but not + * removed, due to IC2 API restrictions. + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.Compressor") +@ModOnly("IC2") +public class Compressor { + /** + * Adds a new recipe to the compressor. + * + * The recipe input can be any pattern, as long as the stack size is determined. + * The output can be any item stack. + * + * @param output recipe output + * @param ingredient recipe input + */ + @ZenMethod + public static void addRecipe( + @NotNull IItemStack output, + @NotNull IIngredient ingredient) { + if (ingredient.getAmount() < 0) { + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + } else { + MineTweakerAPI.apply(new MachineAddRecipeAction( + "compressor", + Recipes.compressor, + getItemStacks(output), + null, + new IC2RecipeInput(ingredient))); + } + } + + /** + * Determines the recipe output for the given input. Will return the output + * of a single item, even if the stack contains multiple items. + * + * @param input recipe input + * @return recipe output + */ + @ZenMethod + public static IItemStack getOutput( + @NotNull IItemStack input) { + RecipeOutput output = Recipes.compressor.getOutputFor(getItemStack(input), false); + if (output == null || output.items.size() > 0) { + System.out.println("No output"); + return null; + } + return getIItemStack(output.items.get(0)); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java new file mode 100644 index 0000000..90b71cb --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java @@ -0,0 +1,71 @@ +/* + * 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.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +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; + +/** + * Provides access to the IC2 Extractor recipes. + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.Extractor") +@ModOnly("IC2") +public class Extractor { + /** + * Adds a new recipe to the extractor. + * + * The recipe input can be any pattern, as long as the stack size is determined. + * The output can be any item stack. + * + * @param output recipe output + * @param ingredient recipe input + */ + @ZenMethod + public static void addRecipe( + @NotNull IItemStack output, + @NotNull IIngredient ingredient) { + if (ingredient.getAmount() < 0) { + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + } else { + MineTweakerAPI.apply(new MachineAddRecipeAction( + "extractor", + Recipes.extractor, + getItemStacks(output), + null, + new IC2RecipeInput(ingredient))); + } + } + + /** + * Determines the recipe output for the given input. Will return the output + * of a single item, even if the stack contains multiple items. + * + * @param input recipe input + * @return recipe output + */ + @ZenMethod + public static IItemStack getOutput( + @NotNull IItemStack input) { + RecipeOutput output = Recipes.extractor.getOutputFor(getItemStack(input), false); + if (output == null || output.items.size() > 0) return null; + return getIItemStack(output.items.get(0)); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java new file mode 100644 index 0000000..772baee --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java @@ -0,0 +1,66 @@ +package minetweaker.mods.ic2.machines; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +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; + +/** + * Provides access to the IC2 macerator recipes. Recipes can be added but not + * removed, due to IC2 API restrictions. + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.Macerator") +@ModOnly("IC2") +public class Macerator { + /** + * Adds a new recipe to the macerator. + * + * The recipe input can be any pattern, as long as the stack size is determined. + * The output can be any item stack. + * + * @param output recipe output + * @param ingredient recipe input + */ + @ZenMethod + public static void addRecipe( + @NotNull IItemStack output, + @NotNull IIngredient ingredient) { + if (ingredient.getAmount() < 0) { + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + } else { + MineTweakerAPI.apply(new MachineAddRecipeAction( + "macerator", + Recipes.macerator, + getItemStacks(output), + null, + new IC2RecipeInput(ingredient))); + } + } + + /** + * Determines the recipe output for the given input. Will return the output + * of a single item, even if the stack contains multiple items. + * + * @param input recipe input + * @return recipe output + */ + @ZenMethod + public static IItemStack getOutput( + @NotNull IItemStack input) { + RecipeOutput output = Recipes.macerator.getOutputFor(getItemStack(input), false); + if (output == null || output.items.size() > 0) return null; + return getIItemStack(output.items.get(0)); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java new file mode 100644 index 0000000..1a63967 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java @@ -0,0 +1,35 @@ +/* + * 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.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +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 + */ +@ZenClass("mods.ic2.MatterAmplifier") +@ModOnly("IC2") +public class MatterAmplifier { + private MatterAmplifier() {} + + @ZenMethod + public static void setAmplifier(IIngredient item, int amplifier) { + NBTTagCompound data = new NBTTagCompound(); + data.setInteger("amplification", amplifier); + MineTweakerAPI.apply(new MachineAddRecipeAction("matter amplifier", Recipes.matterAmplifier, new ItemStack[0], data, new IC2RecipeInput(item))); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java new file mode 100644 index 0000000..6bb83c2 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java @@ -0,0 +1,115 @@ +/* + * 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.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import minetweaker.mods.ic2.IC2RecipeInput; +import minetweaker.mods.ic2.MachineAddRecipeAction; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.MetalFormer") +@ModOnly("IC2") +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.apply(new MachineAddRecipeAction( + "metal former - extruding", + Recipes.metalformerExtruding, + 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(getItemStack(input), false); + if (output == null || output.items.size() > 0) return null; + return getIItemStack(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.apply(new MachineAddRecipeAction( + "metal former - rolling", + Recipes.metalformerRolling, + 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 getRollingOutput(IItemStack input) { + RecipeOutput output = Recipes.metalformerRolling.getOutputFor(getItemStack(input), false); + if (output == null || output.items.size() > 0) return null; + return getIItemStack(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.apply(new MachineAddRecipeAction( + "metal former - cutting", + Recipes.metalformerCutting, + getItemStacks(output), + 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(getItemStack(input), false); + if (output == null || output.items.size() > 0) return null; + return getIItemStack(output.items.get(0)); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java new file mode 100644 index 0000000..a0af2f9 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java @@ -0,0 +1,43 @@ +package minetweaker.mods.ic2.machines; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStacks; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import minetweaker.mods.ic2.IC2RecipeInput; +import minetweaker.mods.ic2.MachineAddRecipeAction; +import net.minecraft.nbt.NBTTagCompound; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.OreWasher") +@ModOnly("IC2") +public class OreWasher { + @ZenMethod + public static void addRecipe(IItemStack[] output, IIngredient input, int millibuckets) { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setInteger("amount", millibuckets); + MineTweakerAPI.apply(new MachineAddRecipeAction( + "ore washer", + Recipes.oreWashing, + getItemStacks(output), + nbt, + new IC2RecipeInput(input))); + } + + @ZenMethod + public static IItemStack[] getOutput(IItemStack input) { + RecipeOutput output = Recipes.oreWashing.getOutputFor(getItemStack(input), false); + if (output == null || output.items.isEmpty()) return null; + return getIItemStacks(output.items); + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java new file mode 100644 index 0000000..5793e12 --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java @@ -0,0 +1,84 @@ +/* + * 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.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import minetweaker.mods.ic2.IC2RecipeInput; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenClass("mods.ic2.Recycler") +@ModOnly("IC2") +public class Recycler { + @ZenMethod + public static void addBlacklist(IIngredient ingredient) { + MineTweakerAPI.apply(new AddBlacklistAction(ingredient)); + } + + @ZenMethod + public static boolean isBlacklisted(IItemStack item) { + return Recipes.recyclerBlacklist.contains(getItemStack(item)); + } + + private static class AddBlacklistAction extends OneWayAction { + private IIngredient ingredient; + + public AddBlacklistAction(IIngredient ingredient) { + this.ingredient = ingredient; + } + + @Override + public void apply() { + for (IItemStack itemStack : ingredient.getItems()) { + Recipes.recyclerBlacklist.add(MineTweakerMC.getItemStack(itemStack)); + } + } + + @Override + public String describe() { + return "Adding " + ingredient + " to the recycler blacklist"; + } + + @Override + public Object getOverrideKey() { + return null; + } + + @Override + public int hashCode() { + int hash = 3; + hash = 29 * hash + (this.ingredient != null ? this.ingredient.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AddBlacklistAction other = (AddBlacklistAction) obj; + if (this.ingredient != other.ingredient && (this.ingredient == null || !this.ingredient.equals(other.ingredient))) { + return false; + } + return true; + } + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java new file mode 100644 index 0000000..943ff5c --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java @@ -0,0 +1,90 @@ +/* + * 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.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.WeightedItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenClass("mods.ic2.ScrapBox") +@ModOnly("IC2") +public class ScrapBox { + /** + * Adds an item drop. + * + * Reference scrap box chance values: + * + * 0.1: Diamond + * 0.5: Cake, Gold Helmet, Iron Ore, Gold Ore + * 1.0: Wooden tools, Soul Sand, Sign, Leather, Feather, Bone + * 1.5: Apple, Bread + * 2.0: Netherrack, Rotten Flesh + * 3.0: Grass, Gravel + * 4.0: Stick + * 5.0: Dirt, Wooden Hoe + * + * @param stack weighted item stack to add + */ + @ZenMethod + public static void addDrop(WeightedItemStack stack) { + MineTweakerAPI.apply(new AddDropAction(stack)); + } + + private static class AddDropAction extends OneWayAction { + private final WeightedItemStack stack; + + public AddDropAction(WeightedItemStack stack) { + this.stack = stack; + } + + @Override + public void apply() { + Recipes.scrapboxDrops.addDrop(getItemStack(stack.getStack()), stack.getChance()); + } + + @Override + public String describe() { + return "Adding scrapbox drop " + stack.getStack(); + } + + @Override + public Object getOverrideKey() { + return null; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 71 * hash + (this.stack != null ? this.stack.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AddDropAction other = (AddDropAction) obj; + if (this.stack != other.stack && (this.stack == null || !this.stack.equals(other.stack))) { + return false; + } + return true; + } + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java new file mode 100644 index 0000000..c1bfe9f --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java @@ -0,0 +1,91 @@ +/* + * 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.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; +import minetweaker.annotations.ModOnly; +import minetweaker.api.liquid.ILiquidStack; +import net.minecraftforge.fluids.FluidRegistry; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenClass("mods.ic2.SemiFluidGenerator") +@ModOnly("IC2") +public class SemiFluidGenerator { + @ZenMethod + public static void addFluid(ILiquidStack liquidPerTick, int energyPerTick) { + MineTweakerAPI.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), energyPerTick)); + } + + @ZenMethod + public static boolean accepts(ILiquidStack liquid) { + return Recipes.semiFluidGenerator.acceptsFluid(FluidRegistry.getFluid(liquid.getName())); + } + + private static class AddFluidAction extends OneWayAction { + private final String name; + private final int liquidPerTick; + private final int energyPerTick; + + public AddFluidAction(String name, int liquidPerTick, int energyPerTick) { + this.name = name; + this.liquidPerTick = liquidPerTick; + this.energyPerTick = energyPerTick; + } + + @Override + public void apply() { + Recipes.semiFluidGenerator.addFluid(name, liquidPerTick, energyPerTick); + } + + @Override + public String describe() { + return "Adding liquid " + name + " as semifluid fuel"; + } + + @Override + public Object getOverrideKey() { + return null; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0); + hash = 47 * hash + this.liquidPerTick; + hash = 47 * hash + this.energyPerTick; + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AddFluidAction other = (AddFluidAction) obj; + if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { + return false; + } + if (this.liquidPerTick != other.liquidPerTick) { + return false; + } + if (this.energyPerTick != other.energyPerTick) { + return false; + } + return true; + } + } +} diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java new file mode 100644 index 0000000..9d7accf --- /dev/null +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java @@ -0,0 +1,81 @@ +package minetweaker.mods.ic2.machines; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import minetweaker.MineTweakerAPI; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getIItemStacks; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import net.minecraft.nbt.NBTTagCompound; +import minetweaker.mods.ic2.IC2RecipeInput; +import minetweaker.mods.ic2.MachineAddRecipeAction; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * Provides access to the IC2 compressor recipes. Recipes can be added but not + * removed, due to IC2 API restrictions. + * + * @author Stan Hebben + */ +@ZenClass("mods.ic2.ThermalCentrifuge") +@ModOnly("IC2") +public class ThermalCentrifuge { + /** + * Adds a new recipe to the centrifuge. + * + * The recipe input can be any ingredient, as long as the stack size is determined. + * The output is an array of item stacks. + * + * @param output recipe outputs + * @param ingredient recipe input + * @param minHeat minimum centrifuge heat level + */ + @ZenMethod + public static void addRecipe(IItemStack[] output, IIngredient ingredient, int minHeat) { + if (ingredient.getAmount() < 0) { + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + } else { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("minHeat", minHeat); + MineTweakerAPI.apply(new MachineAddRecipeAction( + "thermal centrifuge", + Recipes.centrifuge, + getItemStacks(output), + tag, + new IC2RecipeInput(ingredient))); + } + } + + /** + * Adds a new recipe to the centrifuge. + * + * The recipe input can be any ingredient, as long as the stack size is determined. + * The output can be any item stack. + * + * @param output recipe output + * @param ingredient recipe input + * @param minHeat minimum centrifuge heat level + */ + @ZenMethod + public static void addRecipe(IItemStack output, IIngredient ingredient, int minHeat) { + addRecipe(new IItemStack[] { output }, ingredient, minHeat); + } + + /** + * Determines the recipe output for the given input. Will return the output + * of a single item, even if the stack contains multiple items. + * + * @param input recipe input + * @return recipe output + */ + @ZenMethod + public static IItemStack[] getOutput(IItemStack input) { + RecipeOutput output = Recipes.centrifuge.getOutputFor(getItemStack(input), false); + if (output == null || output.items.isEmpty()) return null; + return getIItemStacks(output.items); + } +} diff --git a/MineTweaker3-MC164-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java b/MineTweaker3-MC164-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java index 366b819..2b8c521 100644 --- a/MineTweaker3-MC164-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java +++ b/MineTweaker3-MC164-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java @@ -33,7 +33,7 @@ public class NEI { */ @ZenMethod public static void hide(@NotNull IItemStack item) { - MineTweakerAPI.tweaker.apply(new NEIHideItemAction(getItemStack(item))); + MineTweakerAPI.apply(new NEIHideItemAction(getItemStack(item))); } /** @@ -43,7 +43,7 @@ public class NEI { */ @ZenMethod public static void addEntry(@NotNull IItemStack stack) { - MineTweakerAPI.tweaker.apply(new NEIAddEntryAction(getItemStack(stack))); + MineTweakerAPI.apply(new NEIAddEntryAction(getItemStack(stack))); } /** @@ -55,7 +55,7 @@ public class NEI { */ @ZenMethod public static void overrideName(@NotNull IItemStack item, @NotNull String name) { - MineTweakerAPI.tweaker.apply(new NEIOverrideNameAction(getItemStack(item), name)); + MineTweakerAPI.apply(new NEIOverrideNameAction(getItemStack(item), name)); } // ############################# diff --git a/MineTweaker3-MC1710-Main/build.gradle b/MineTweaker3-MC1710-Main/build.gradle index fc374f4..4cd5aab 100644 --- a/MineTweaker3-MC1710-Main/build.gradle +++ b/MineTweaker3-MC1710-Main/build.gradle @@ -18,7 +18,7 @@ buildscript { } apply plugin: 'forge' -minecraft{version = "1.7.10-10.13.0.1152"} +minecraft{version = "1.7.10-10.13.0.1160"} version = "1.7.10-3.0.0" archivesBaseName = project.projectDir.name diff --git a/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location b/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location index 5b31d2b..e47266f 100644 Binary files a/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location and b/MineTweaker3-MC1710-Main/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location differ diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index 5c75895..85eb9f3 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -35,7 +35,7 @@ public class MineTweakerMC { public static ItemStack getItemStack(IItemStack item) { Object internal = item.getInternal(); if (internal == null || !(internal instanceof ItemStack)) { - MineTweakerAPI.getLogger().logError("Not a valid item stack: " + item); + MineTweakerAPI.logError("Not a valid item stack: " + item); } return (ItemStack) internal; } @@ -50,7 +50,7 @@ public class MineTweakerMC { public static ItemStack getItemStack(IIngredient ingredient) { List items = ingredient.getItems(); if (items.size() != 1) { - MineTweakerAPI.getLogger().logError("Not an ingredient with a single item: " + ingredient); + MineTweakerAPI.logError("Not an ingredient with a single item: " + ingredient); } return getItemStack(items.get(0)); } @@ -142,7 +142,7 @@ public class MineTweakerMC { if (internal != null && internal instanceof ItemStack) { output[i] = (ItemStack) internal; } else { - MineTweakerAPI.getLogger().logError("Invalid item stack: " + items.get(i)); + MineTweakerAPI.logError("Invalid item stack: " + items.get(i)); } } return output; @@ -207,7 +207,7 @@ public class MineTweakerMC { */ public static EntityPlayer getPlayer(IPlayer player) { if (!(player instanceof MCPlayer)) { - MineTweakerAPI.getLogger().logError("Invalid player: " + player); + MineTweakerAPI.logError("Invalid player: " + player); } return ((MCPlayer) player).getInternal(); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index eda4d67..fda49ad 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -47,7 +47,7 @@ import net.minecraftforge.common.MinecraftForge; @Mod(modid = MineTweakerMod.MODID, version = MineTweakerMod.MCVERSION + "-3.0.0") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; - public static final String MCVERSION = "1.7.2"; + public static final String MCVERSION = "1.7.10"; public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(MODID); @@ -83,7 +83,7 @@ public class MineTweakerMod { } scriptsGlobal = new ScriptProviderDirectory(globalDir); - MineTweakerAPI.tweaker.setScriptProvider(scriptsGlobal); + MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); } // ########################## @@ -111,20 +111,17 @@ public class MineTweakerMod { public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { // starts before loading worlds // perfect place to start MineTweaker! - System.out.println("[MineTweaker] Server about to start"); File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); if (!scriptsDir.exists()) { scriptsDir.mkdir(); } - MineTweakerAPI.server = new MCServer(ev.getServer()); - IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); IScriptProvider cascaded = new ScriptProviderCascade(scriptsGlobal, scriptsLocal); - MineTweakerAPI.tweaker.setScriptProvider(cascaded); - MineTweakerImplementationAPI.onServerStart(); + MineTweakerImplementationAPI.setScriptProvider(cascaded); + MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); } @EventHandler @@ -134,9 +131,7 @@ public class MineTweakerMod { @EventHandler public void onServerStopped(FMLServerStoppedEvent ev) { - System.out.println("[MineTweaker] Server stopped"); - - MineTweakerAPI.server = null; MineTweakerImplementationAPI.onServerStop(); + MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java index 41a2f12..ad7b191 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java @@ -47,7 +47,7 @@ public class FuelTweaker { public void addFuelPattern(SetFuelPattern pattern) { List items = pattern.getPattern().getItems(); if (items == null) { - MineTweakerAPI.getLogger().logError("Cannot set fuel for <*>"); + MineTweakerAPI.logError("Cannot set fuel for <*>"); return; } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java index a1819cf..7be0296 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java @@ -47,9 +47,9 @@ public class MCFurnaceManager implements IFurnaceManager { } if (toRemove.isEmpty()) { - MineTweakerAPI.getLogger().logWarning("No furnace recipes for " + output.toString()); + MineTweakerAPI.logWarning("No furnace recipes for " + output.toString()); } else { - MineTweakerAPI.tweaker.apply(new RemoveAction(toRemove, toRemoveValues)); + MineTweakerAPI.apply(new RemoveAction(toRemove, toRemoveValues)); } } @@ -57,17 +57,17 @@ public class MCFurnaceManager implements IFurnaceManager { public void addRecipe(IItemStack output, IIngredient input, double xp) { List items = input.getItems(); if (items == null) { - MineTweakerAPI.getLogger().logError("Cannot turn " + input.toString() + " into a furnace recipe"); + MineTweakerAPI.logError("Cannot turn " + input.toString() + " into a furnace recipe"); } ItemStack[] items2 = getItemStacks(items); ItemStack output2 = getItemStack(output); - MineTweakerAPI.tweaker.apply(new AddRecipeAction(input, items2, output2, xp)); + MineTweakerAPI.apply(new AddRecipeAction(input, items2, output2, xp)); } @Override public void setFuel(IIngredient item, int fuel) { - MineTweakerAPI.tweaker.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); + MineTweakerAPI.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); } @Override diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java index a4aad7f..0937199 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -9,6 +9,7 @@ package minetweaker.mc1710.item; import java.util.Collections; import java.util.List; import minetweaker.MineTweakerAPI; +import minetweaker.api.data.DataMap; import minetweaker.mc1710.data.NBTConverter; import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.api.data.IData; @@ -80,7 +81,7 @@ public class MCItemStack implements IItemStack { @Override public void setDisplayName(String name) { - MineTweakerAPI.tweaker.apply(new SetTranslationAction(getName() + ".name", name)); + MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); } @Override @@ -92,7 +93,7 @@ public class MCItemStack implements IItemStack { public IData getTag() { if (tag == null) { if (stack.stackTagCompound == null) { - return null; + return DataMap.EMPTY; } tag = NBTConverter.from(stack.stackTagCompound, true); @@ -114,7 +115,7 @@ public class MCItemStack implements IItemStack { @Override public IIngredient anyDamage() { if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.getLogger().logWarning("subitems don't have damaged states"); + MineTweakerAPI.logWarning("subitems don't have damaged states"); return this; } else { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, OreDictionary.WILDCARD_VALUE); @@ -126,7 +127,7 @@ public class MCItemStack implements IItemStack { @Override public IItemStack withDamage(int damage) { if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.getLogger().logWarning("subitems don't have damaged states"); + MineTweakerAPI.logWarning("subitems don't have damaged states"); return this; } else { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, damage); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java index 23f5c39..03e3999 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java @@ -6,11 +6,16 @@ package minetweaker.mc1710.liquid; +import java.util.ArrayList; +import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.liquid.ILiquidStack; +import minetweaker.api.minecraft.MineTweakerMC; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; /** @@ -46,7 +51,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setLuminosity(int value) { - MineTweakerAPI.tweaker.apply(new ActionSetLuminosity(value)); + MineTweakerAPI.apply(new ActionSetLuminosity(value)); } @Override @@ -56,7 +61,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setDensity(int density) { - MineTweakerAPI.tweaker.apply(new ActionSetDensity(density)); + MineTweakerAPI.apply(new ActionSetDensity(density)); } @Override @@ -66,7 +71,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setTemperature(int temperature) { - MineTweakerAPI.tweaker.apply(new ActionSetTemperature(temperature)); + MineTweakerAPI.apply(new ActionSetTemperature(temperature)); } @Override @@ -76,7 +81,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setViscosity(int viscosity) { - MineTweakerAPI.tweaker.apply(new ActionSetViscosity(viscosity)); + MineTweakerAPI.apply(new ActionSetViscosity(viscosity)); } @Override @@ -86,13 +91,147 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setGaseous(boolean gaseous) { - MineTweakerAPI.tweaker.apply(new ActionSetGaseous(gaseous)); + MineTweakerAPI.apply(new ActionSetGaseous(gaseous)); } + + @Override + public List getContainers() { + List result = new ArrayList(); + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + if (data.fluid.getFluid() == fluid) { + result.add(MineTweakerMC.getIItemStack(data.filledContainer)); + } + } + return result; + } + + @Override + public void addContainer(IItemStack filled, IItemStack empty, int amount) { + MineTweakerAPI.apply(new AddContainerAction(filled, empty, amount)); + } + + @Override + public void removeContainer(IItemStack filled) { + //MineTweakerAPI.apply(new RemoveContainerAction(filled)); + MineTweakerAPI.logError("Cannot remove container items in MineCraft 1.7.X"); + } + + // ####################### + // ### Private methods ### + // ####################### + + /*private void removeContainerInner(IItemStack filled) { + ItemStack filledItem = MineTweakerMC.getItemStack(filled); + FluidContainerRegistry.FluidContainerData data = filledContainerMap.get(Arrays.asList(filledItem.itemID, filledItem.getItemDamage())); + if (data != null) { + filledContainerMap.remove(Arrays.asList(filledItem.itemID, filledItem.getItemDamage())); + containerFluidMap.remove(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage())); + + // rebuild empty containers set + emptyContainers.clear(); + for (FluidContainerRegistry.FluidContainerData fdata : filledContainerMap.values()) { + emptyContainers.add(Arrays.asList(fdata.emptyContainer.itemID, fdata.emptyContainer.getItemDamage())); + } + } + MineTweakerAPI.logError("Removal of containers is not possible in 1.7.X"); + }*/ + + /*private FluidContainerRegistry.FluidContainerData getData(IItemStack filled) { + ItemStack filledStack = MineTweakerMC.getItemStack(filled); + return filledContainerMap.get(Arrays.asList(filledStack.itemID, filledStack.getItemDamage())); + }*/ // ###################### // ### Action classes ### // ###################### + private class AddContainerAction implements IUndoableAction { + private final IItemStack filled; + private final IItemStack empty; + private final int amount; + + public AddContainerAction(IItemStack filled, IItemStack empty, int amount) { + this.filled = filled; + this.empty = empty; + this.amount = amount; + } + + @Override + public void apply() { + FluidContainerRegistry.registerFluidContainer(new FluidStack(fluid, amount), MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); + } + + @Override + public boolean canUndo() { + return false; + //return true; + } + + @Override + public void undo() { + //removeContainerInner(filled); + } + + @Override + public String describe() { + return "Adding " + filled.getDisplayName() + " as liquid container for " + fluid.getLocalizedName(); + } + + @Override + public String describeUndo() { + return "Removing liquid container " + filled; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + /*private class RemoveContainerAction implements IUndoableAction { + private final IItemStack filled; + private final IItemStack empty; + private final FluidStack amount; + + public RemoveContainerAction(IItemStack filled) { + this.filled = filled; + + FluidContainerRegistry.FluidContainerData data = getData(filled); + empty = MineTweakerMC.getIItemStack(data.emptyContainer); + amount = data.fluid; + } + + @Override + public void apply() { + removeContainerInner(filled); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + FluidContainerRegistry.registerFluidContainer(amount, MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); + } + + @Override + public String describe() { + return "Removing liquid container " + filled; + } + + @Override + public String describeUndo() { + return "Restoring liquid container " + filled; + } + + @Override + public Object getOverrideKey() { + return null; + } + }*/ + private class ActionSetLuminosity implements IUndoableAction { private final int oldValue; private final int newValue; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java index 51410a7..494d711 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java @@ -21,7 +21,7 @@ public class MineTweakerLoadScriptsHandler implements IMessageHandler>) OREDICTIONARY_IDTOSTACK.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("ERROR - could not load ore dictionary stacks!"); + MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); return null; } } @@ -76,7 +76,7 @@ public class MineTweakerHacks { try { return (List>) OREDICTIONARY_IDTOSTACKUN.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("ERROR - could not load ore dictionary stacks!"); + MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); return null; } } @@ -85,7 +85,7 @@ public class MineTweakerHacks { try { return (File) MINECRAFTSERVER_ANVILFILE.get(server); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not load anvil file!"); + MineTweakerAPI.logError("could not load anvil file!"); return null; } } @@ -105,7 +105,7 @@ public class MineTweakerHacks { try { return SHAPEDORERECIPE_WIDTH.getInt(recipe); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not load anvil file!"); + MineTweakerAPI.logError("could not load anvil file!"); return 3; } } @@ -114,7 +114,7 @@ public class MineTweakerHacks { try { return (Container) INVENTORYCRAFTING_EVENTHANDLER.get(inventory); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get inventory eventhandler"); + MineTweakerAPI.logError("could not get inventory eventhandler"); return null; } } @@ -123,7 +123,7 @@ public class MineTweakerHacks { try { return (EntityPlayer) SLOTCRAFTING_PLAYER.get(slot); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get inventory eventhandler"); + MineTweakerAPI.logError("could not get inventory eventhandler"); return null; } } @@ -133,7 +133,7 @@ public class MineTweakerHacks { Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); return (StringTranslate) field.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get string translator"); + MineTweakerAPI.logError("could not get string translator"); return null; } } diff --git a/MineTweaker3-MC1710-Mod-IC2/build.gradle b/MineTweaker3-MC1710-Mod-IC2/build.gradle index 92f2d46..601c8ed 100644 --- a/MineTweaker3-MC1710-Mod-IC2/build.gradle +++ b/MineTweaker3-MC1710-Mod-IC2/build.gradle @@ -18,7 +18,7 @@ buildscript { } apply plugin: 'forge' -minecraft{version = "1.7.10-10.13.0.1152"} +minecraft{version = "1.7.10-10.13.0.1160"} version = "1.0" archivesBaseName = project.projectDir.name diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java index dd7568a..8e96533 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java @@ -56,12 +56,12 @@ public class IC2BracketHandler implements IBracketHandler { } else if (tokens.get(6).getValue().equals("*")) { meta = OreDictionary.WILDCARD_VALUE; } else { - MineTweakerAPI.getLogger().logError("Not a valid meta value: " + tokens.get(6).getValue()); + MineTweakerAPI.logError("Not a valid meta value: " + tokens.get(6).getValue()); } } ItemStack item = IC2Items.getItem(name); if (item == null) { - MineTweakerAPI.getLogger().logError("Not a valid IC2 item: " + name); + MineTweakerAPI.logError("Not a valid IC2 item: " + name); return null; } else { return new ItemReferenceSymbol(name, meta); diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java index fdf7a76..ed5c0a8 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java @@ -35,9 +35,9 @@ public class IC2ExplosionWhitelist { ItemStack iStack = getItemStack(item); Block block = Block.getBlockFromItem(iStack.getItem()); if (block == null) { - MineTweakerAPI.getLogger().logError("This item is not a block"); + MineTweakerAPI.logError("This item is not a block"); } else { - MineTweakerAPI.tweaker.apply(new AddAction(block)); + MineTweakerAPI.apply(new AddAction(block)); } } @@ -51,12 +51,12 @@ public class IC2ExplosionWhitelist { ItemStack iStack = getItemStack(item); Block block = Block.getBlockFromItem(iStack.getItem()); if (block == null) { - MineTweakerAPI.getLogger().logError("This item is not a block"); + MineTweakerAPI.logError("This item is not a block"); } else { if (ExplosionWhitelist.isBlockWhitelisted(block)) { - MineTweakerAPI.getLogger().logWarning("This block is not in the whitelist"); + MineTweakerAPI.logWarning("This block is not in the whitelist"); } else { - MineTweakerAPI.tweaker.apply(new RemoveAction(block)); + MineTweakerAPI.apply(new RemoveAction(block)); } } } @@ -72,7 +72,7 @@ public class IC2ExplosionWhitelist { ItemStack iStack = getItemStack(item); Block block = Block.getBlockFromItem(iStack.getItem()); if (block == null) { - MineTweakerAPI.getLogger().logWarning("This item is not a block"); + MineTweakerAPI.logWarning("This item is not a block"); return false; } else { return ExplosionWhitelist.isBlockWhitelisted(block); diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java index 87778d5..4866974 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java @@ -31,7 +31,7 @@ public class MachineAddRecipeAction extends OneWayAction { try { machine.addRecipe(input, tag, output); } catch (RuntimeException ex) { - MineTweakerAPI.getLogger().logError(ex.getMessage()); + MineTweakerAPI.logError(ex.getMessage()); } } diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java index 0d1c1b7..ffecdc8 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -29,22 +29,22 @@ import stanhebben.zenscript.annotations.ZenMethod; public class Canner { @ZenMethod public static void addBottleRecipe(IIngredient container, IIngredient fill, IItemStack output) { - MineTweakerAPI.tweaker.apply(new AddBottleIngredientAction(container, fill, output)); + MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); } @ZenMethod public static void addBottleRecipe(IIngredient container, ILiquidStack liquid, IItemStack output) { - MineTweakerAPI.tweaker.apply(new AddBottleLiquidAction(container, liquid, output)); + MineTweakerAPI.apply(new AddBottleLiquidAction(container, liquid, output)); } @ZenMethod public static void addEnrichRecipe(ILiquidStack input, IIngredient additive, ILiquidStack output) { - MineTweakerAPI.tweaker.apply(new AddEnrichIngredientAction(input, additive, output)); + MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); } @ZenMethod public static void addEnrichRecipe(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { - MineTweakerAPI.tweaker.apply(new AddEnrichLiquidAction(input, additive, output)); + MineTweakerAPI.apply(new AddEnrichLiquidAction(input, additive, output)); } private static class AddBottleIngredientAction extends OneWayAction { diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java index b5738ef..646735f 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java @@ -38,9 +38,9 @@ public class Compressor { @NotNull IItemStack output, @NotNull IIngredient ingredient) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "compressor", Recipes.compressor, getItemStacks(output), diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java index 94d0b23..90b71cb 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java @@ -43,9 +43,9 @@ public class Extractor { @NotNull IItemStack output, @NotNull IIngredient ingredient) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "extractor", Recipes.extractor, getItemStacks(output), diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java index b817a2c..772baee 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java @@ -38,9 +38,9 @@ public class Macerator { @NotNull IItemStack output, @NotNull IIngredient ingredient) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "macerator", Recipes.macerator, getItemStacks(output), diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java index 780e8a4..1a63967 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java @@ -30,6 +30,6 @@ public class MatterAmplifier { public static void setAmplifier(IIngredient item, int amplifier) { NBTTagCompound data = new NBTTagCompound(); data.setInteger("amplification", amplifier); - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction("matter amplifier", Recipes.matterAmplifier, new ItemStack[0], data, new IC2RecipeInput(item))); + MineTweakerAPI.apply(new MachineAddRecipeAction("matter amplifier", Recipes.matterAmplifier, new ItemStack[0], data, new IC2RecipeInput(item))); } } diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java index 2adb279..6bb83c2 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java @@ -35,7 +35,7 @@ public class MetalFormer { */ @ZenMethod public static void addExtrudingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "metal former - extruding", Recipes.metalformerExtruding, getItemStacks(output), @@ -64,7 +64,7 @@ public class MetalFormer { */ @ZenMethod public static void addRollingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "metal former - rolling", Recipes.metalformerRolling, getItemStacks(output), @@ -92,7 +92,7 @@ public class MetalFormer { */ @ZenMethod public static void addCuttingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "metal former - cutting", Recipes.metalformerCutting, getItemStacks(output), diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java index e723a60..a0af2f9 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java @@ -26,7 +26,7 @@ public class OreWasher { public static void addRecipe(IItemStack[] output, IIngredient input, int millibuckets) { NBTTagCompound nbt = new NBTTagCompound(); nbt.setInteger("amount", millibuckets); - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "ore washer", Recipes.oreWashing, getItemStacks(output), diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java index 8344fad..d7d1d29 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java @@ -26,7 +26,7 @@ import stanhebben.zenscript.annotations.ZenMethod; public class Recycler { @ZenMethod public static void addBlacklist(IIngredient ingredient) { - MineTweakerAPI.tweaker.apply(new AddBlacklistAction(ingredient)); + MineTweakerAPI.apply(new AddBlacklistAction(ingredient)); } @ZenMethod diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java index a6afae6..943ff5c 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java @@ -40,7 +40,7 @@ public class ScrapBox { */ @ZenMethod public static void addDrop(WeightedItemStack stack) { - MineTweakerAPI.tweaker.apply(new AddDropAction(stack)); + MineTweakerAPI.apply(new AddDropAction(stack)); } private static class AddDropAction extends OneWayAction { diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java index 1dd960e..c1bfe9f 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java @@ -24,7 +24,7 @@ import stanhebben.zenscript.annotations.ZenMethod; public class SemiFluidGenerator { @ZenMethod public static void addFluid(ILiquidStack liquidPerTick, int energyPerTick) { - MineTweakerAPI.tweaker.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), energyPerTick)); + MineTweakerAPI.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), energyPerTick)); } @ZenMethod diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java index 45d94b4..9d7accf 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java @@ -37,11 +37,11 @@ public class ThermalCentrifuge { @ZenMethod public static void addRecipe(IItemStack[] output, IIngredient ingredient, int minHeat) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("minHeat", minHeat); - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "thermal centrifuge", Recipes.centrifuge, getItemStacks(output), diff --git a/MineTweaker3-MC1710-Mod-NEI/build.gradle b/MineTweaker3-MC1710-Mod-NEI/build.gradle new file mode 100644 index 0000000..54483f8 --- /dev/null +++ b/MineTweaker3-MC1710-Mod-NEI/build.gradle @@ -0,0 +1,38 @@ +import minetweaker.tasks.RegisterZenClassesTask; + +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +apply plugin: 'forge' +minecraft{version = "1.7.10-10.13.0.1160"} +version = "1.0" +archivesBaseName = project.projectDir.name + +dependencies { + compile project(':ZenScript') + compile project(':MineTweaker3-API') + compile project(':MineTweaker3-MC172-Main') + compile files('libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar') +} + +task makeRegistry(type: RegisterZenClassesTask) { + inputDir = file('build/classes/main') + outputDir = file('build/classes/main') + className = 'minetweaker.mods.nei.ClassRegistry' +} + +tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1710-Mod-NEI/libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar b/MineTweaker3-MC1710-Mod-NEI/libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar new file mode 100644 index 0000000..26b06b6 Binary files /dev/null and b/MineTweaker3-MC1710-Mod-NEI/libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar differ diff --git a/MineTweaker3-MC1710-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java b/MineTweaker3-MC1710-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java new file mode 100644 index 0000000..ed53bca --- /dev/null +++ b/MineTweaker3-MC1710-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java @@ -0,0 +1,165 @@ +package minetweaker.mods.nei; + +import codechicken.nei.api.API; +import stanhebben.zenscript.annotations.NotNull; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import net.minecraft.item.ItemStack; + +/** + * MineTweaker NEI support. + * + * Enables hiding NEI items as well as adding new item stacks. These item stacks + * can then show a custom message or contain NBT data. Can be used to show + * a custom message or lore with certain items, or to provide spawnable items + * with specific NBT tags. + * + * @author Stan Hebben + */ +@ZenClass("mods.nei.NEI") +@ModOnly("NotEnoughItems") +public class NEI { + /** + * Hides a specific item in NEI. Will take into account metadata values, if + * any. + * + * @param item item to be hidden + */ + @ZenMethod + public static void hide(@NotNull IItemStack item) { + MineTweakerAPI.apply(new NEIHideItemAction(getItemStack(item))); + } + + /** + * Adds a NEI entry. The item stack can contain damage values and NBT tags. + * + * @param stack item stack to be added + */ + @ZenMethod + public static void addEntry(@NotNull IItemStack stack) { + MineTweakerAPI.apply(new NEIAddEntryAction(getItemStack(stack))); + } + + /** + * Overrides a name in NEI. Note that this will not change the original + * display name, but it will change the way it is displayed in NEI. + * + * @param item item + * @param name item name + */ + @ZenMethod + public static void overrideName(@NotNull IItemStack item, @NotNull String name) { + MineTweakerAPI.apply(new NEIOverrideNameAction(getItemStack(item), name)); + } + + // ############################# + // ### Private inner classes ### + // ############################# + + private static class NEIAddEntryAction implements IUndoableAction { + private final ItemStack item; + + public NEIAddEntryAction(ItemStack item) { + this.item = item; + } + + @Override + public void apply() { + API.addItemListEntry(item); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + API.hideItem(item); + } + + @Override + public String describe() { + return "Adding " + item.getDisplayName() + " as NEI entry"; + } + + @Override + public String describeUndo() { + return "Removing " + item.getDisplayName() + " as NEI entry"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private static class NEIHideItemAction implements IUndoableAction { + private final ItemStack stack; + + public NEIHideItemAction(ItemStack stack) { + this.stack = stack; + } + + @Override + public void apply() { + API.hideItem(stack); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + API.addItemListEntry(stack); + } + + @Override + public String describe() { + return "Hiding " + stack.getUnlocalizedName() + " in NEI"; + } + + @Override + public String describeUndo() { + return "Displaying " + stack.getUnlocalizedName() + " in NEI"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private static class NEIOverrideNameAction extends OneWayAction { + private final ItemStack item; + private final String name; + + public NEIOverrideNameAction(ItemStack item, String name) { + this.item = item; + this.name = name; + } + + @Override + public void apply() { + API.setOverrideName(item, name); + } + + @Override + public String describe() { + return "Overriding NEI item name of " + item.getUnlocalizedName() + " to " + name; + } + + @Override + public Object getOverrideKey() { + return item; + } + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index 82609b1..8d68ef9 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -35,7 +35,7 @@ public class MineTweakerMC { public static ItemStack getItemStack(IItemStack item) { Object internal = item.getInternal(); if (internal == null || !(internal instanceof ItemStack)) { - MineTweakerAPI.getLogger().logError("Not a valid item stack: " + item); + MineTweakerAPI.logError("Not a valid item stack: " + item); } return (ItemStack) internal; } @@ -50,7 +50,7 @@ public class MineTweakerMC { public static ItemStack getItemStack(IIngredient ingredient) { List items = ingredient.getItems(); if (items.size() != 1) { - MineTweakerAPI.getLogger().logError("Not an ingredient with a single item: " + ingredient); + MineTweakerAPI.logError("Not an ingredient with a single item: " + ingredient); } return getItemStack(items.get(0)); } @@ -143,7 +143,7 @@ public class MineTweakerMC { if (internal != null && internal instanceof ItemStack) { output[i] = (ItemStack) internal; } else { - MineTweakerAPI.getLogger().logError("Invalid item stack: " + items.get(i)); + MineTweakerAPI.logError("Invalid item stack: " + items.get(i)); } } return output; @@ -208,7 +208,7 @@ public class MineTweakerMC { */ public static EntityPlayer getPlayer(IPlayer player) { if (!(player instanceof MCPlayer)) { - MineTweakerAPI.getLogger().logError("Invalid player: " + player); + MineTweakerAPI.logError("Invalid player: " + player); } return ((MCPlayer) player).getInternal(); diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java index 38e9e99..24bcd4d 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java @@ -68,13 +68,14 @@ public class MineTweakerMod { private final IScriptProvider scriptsGlobal; public MineTweakerMod() { - MineTweakerAPI.oreDict = new MCOreDict(); - MineTweakerAPI.recipes = recipes = new MCRecipeManager(); - MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); - MineTweakerAPI.game = MCGame.INSTANCE; - MineTweakerAPI.furnace = new MCFurnaceManager(); - MineTweakerAPI.loadedMods = new MCLoadedMods(); + MineTweakerImplementationAPI.init( + new MCOreDict(), + recipes = new MCRecipeManager(), + new MCFurnaceManager(), + MCGame.INSTANCE, + new MCLoadedMods()); + MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; File globalDir = new File("scripts"); @@ -83,7 +84,7 @@ public class MineTweakerMod { } scriptsGlobal = new ScriptProviderDirectory(globalDir); - MineTweakerAPI.tweaker.setScriptProvider(scriptsGlobal); + MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); } // ########################## @@ -111,20 +112,16 @@ public class MineTweakerMod { public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { // starts before loading worlds // perfect place to start MineTweaker! - System.out.println("[MineTweaker] Server about to start"); File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); if (!scriptsDir.exists()) { scriptsDir.mkdir(); } - MineTweakerAPI.server = new MCServer(ev.getServer()); - IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); IScriptProvider cascaded = new ScriptProviderCascade(scriptsGlobal, scriptsLocal); - MineTweakerAPI.tweaker.setScriptProvider(cascaded); - - MineTweakerImplementationAPI.onServerStart(); + MineTweakerImplementationAPI.setScriptProvider(cascaded); + MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); } @EventHandler @@ -134,9 +131,7 @@ public class MineTweakerMod { @EventHandler public void onServerStopped(FMLServerStoppedEvent ev) { - System.out.println("[MineTweaker] Server stopped"); - - MineTweakerAPI.server = null; MineTweakerImplementationAPI.onServerStop(); + MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java index 37200ee..455ea3f 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java @@ -47,7 +47,7 @@ public class FuelTweaker { public void addFuelPattern(SetFuelPattern pattern) { List items = pattern.getPattern().getItems(); if (items == null) { - MineTweakerAPI.getLogger().logError("Cannot set fuel for <*>"); + MineTweakerAPI.logError("Cannot set fuel for <*>"); return; } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/MCFurnaceManager.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/MCFurnaceManager.java index a192b1d..1e74606 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/MCFurnaceManager.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/MCFurnaceManager.java @@ -47,9 +47,9 @@ public class MCFurnaceManager implements IFurnaceManager { } if (toRemove.isEmpty()) { - MineTweakerAPI.getLogger().logWarning("No furnace recipes for " + output.toString()); + MineTweakerAPI.logWarning("No furnace recipes for " + output.toString()); } else { - MineTweakerAPI.tweaker.apply(new RemoveAction(toRemove, toRemoveValues)); + MineTweakerAPI.apply(new RemoveAction(toRemove, toRemoveValues)); } } @@ -57,17 +57,17 @@ public class MCFurnaceManager implements IFurnaceManager { public void addRecipe(IItemStack output, IIngredient input, double xp) { List items = input.getItems(); if (items == null) { - MineTweakerAPI.getLogger().logError("Cannot turn " + input.toString() + " into a furnace recipe"); + MineTweakerAPI.logError("Cannot turn " + input.toString() + " into a furnace recipe"); } ItemStack[] items2 = getItemStacks(items); ItemStack output2 = getItemStack(output); - MineTweakerAPI.tweaker.apply(new AddRecipeAction(input, items2, output2, xp)); + MineTweakerAPI.apply(new AddRecipeAction(input, items2, output2, xp)); } @Override public void setFuel(IIngredient item, int fuel) { - MineTweakerAPI.tweaker.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); + MineTweakerAPI.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); } @Override diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java index 3ca4e71..fea2199 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java @@ -9,6 +9,7 @@ package minetweaker.mc172.item; import java.util.Collections; import java.util.List; import minetweaker.MineTweakerAPI; +import minetweaker.api.data.DataMap; import minetweaker.mc172.data.NBTConverter; import minetweaker.mc172.liquid.MCLiquidStack; import minetweaker.api.data.IData; @@ -80,7 +81,7 @@ public class MCItemStack implements IItemStack { @Override public void setDisplayName(String name) { - MineTweakerAPI.tweaker.apply(new SetTranslationAction(getName() + ".name", name)); + MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); } @Override @@ -92,7 +93,7 @@ public class MCItemStack implements IItemStack { public IData getTag() { if (tag == null) { if (stack.stackTagCompound == null) { - return null; + return DataMap.EMPTY; } tag = NBTConverter.from(stack.stackTagCompound, true); @@ -114,7 +115,7 @@ public class MCItemStack implements IItemStack { @Override public IIngredient anyDamage() { if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.getLogger().logWarning("subitems don't have damaged states"); + MineTweakerAPI.logWarning("subitems don't have damaged states"); return this; } else { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, OreDictionary.WILDCARD_VALUE); @@ -126,7 +127,7 @@ public class MCItemStack implements IItemStack { @Override public IItemStack withDamage(int damage) { if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.getLogger().logWarning("subitems don't have damaged states"); + MineTweakerAPI.logWarning("subitems don't have damaged states"); return this; } else { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, damage); diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/liquid/MCLiquidDefinition.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/liquid/MCLiquidDefinition.java index 074d38f..a1ee39c 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/liquid/MCLiquidDefinition.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/liquid/MCLiquidDefinition.java @@ -6,11 +6,16 @@ package minetweaker.mc172.liquid; +import java.util.ArrayList; +import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.liquid.ILiquidStack; +import minetweaker.api.minecraft.MineTweakerMC; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; /** @@ -46,7 +51,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setLuminosity(int value) { - MineTweakerAPI.tweaker.apply(new ActionSetLuminosity(value)); + MineTweakerAPI.apply(new ActionSetLuminosity(value)); } @Override @@ -56,7 +61,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setDensity(int density) { - MineTweakerAPI.tweaker.apply(new ActionSetDensity(density)); + MineTweakerAPI.apply(new ActionSetDensity(density)); } @Override @@ -66,7 +71,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setTemperature(int temperature) { - MineTweakerAPI.tweaker.apply(new ActionSetTemperature(temperature)); + MineTweakerAPI.apply(new ActionSetTemperature(temperature)); } @Override @@ -76,7 +81,7 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setViscosity(int viscosity) { - MineTweakerAPI.tweaker.apply(new ActionSetViscosity(viscosity)); + MineTweakerAPI.apply(new ActionSetViscosity(viscosity)); } @Override @@ -86,13 +91,147 @@ public class MCLiquidDefinition implements ILiquidDefinition { @Override public void setGaseous(boolean gaseous) { - MineTweakerAPI.tweaker.apply(new ActionSetGaseous(gaseous)); + MineTweakerAPI.apply(new ActionSetGaseous(gaseous)); } + + @Override + public List getContainers() { + List result = new ArrayList(); + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + if (data.fluid.getFluid() == fluid) { + result.add(MineTweakerMC.getIItemStack(data.filledContainer)); + } + } + return result; + } + + @Override + public void addContainer(IItemStack filled, IItemStack empty, int amount) { + MineTweakerAPI.apply(new AddContainerAction(filled, empty, amount)); + } + + @Override + public void removeContainer(IItemStack filled) { + //MineTweakerAPI.apply(new RemoveContainerAction(filled)); + MineTweakerAPI.logError("Cannot remove container items in MineCraft 1.7.X"); + } + + // ####################### + // ### Private methods ### + // ####################### + + /*private void removeContainerInner(IItemStack filled) { + ItemStack filledItem = MineTweakerMC.getItemStack(filled); + FluidContainerRegistry.FluidContainerData data = filledContainerMap.get(Arrays.asList(filledItem.itemID, filledItem.getItemDamage())); + if (data != null) { + filledContainerMap.remove(Arrays.asList(filledItem.itemID, filledItem.getItemDamage())); + containerFluidMap.remove(Arrays.asList(data.emptyContainer.itemID, data.emptyContainer.getItemDamage())); + + // rebuild empty containers set + emptyContainers.clear(); + for (FluidContainerRegistry.FluidContainerData fdata : filledContainerMap.values()) { + emptyContainers.add(Arrays.asList(fdata.emptyContainer.itemID, fdata.emptyContainer.getItemDamage())); + } + } + MineTweakerAPI.logError("Removal of containers is not possible in 1.7.X"); + }*/ + + /*private FluidContainerRegistry.FluidContainerData getData(IItemStack filled) { + ItemStack filledStack = MineTweakerMC.getItemStack(filled); + return filledContainerMap.get(Arrays.asList(filledStack.itemID, filledStack.getItemDamage())); + }*/ // ###################### // ### Action classes ### // ###################### + private class AddContainerAction implements IUndoableAction { + private final IItemStack filled; + private final IItemStack empty; + private final int amount; + + public AddContainerAction(IItemStack filled, IItemStack empty, int amount) { + this.filled = filled; + this.empty = empty; + this.amount = amount; + } + + @Override + public void apply() { + FluidContainerRegistry.registerFluidContainer(new FluidStack(fluid, amount), MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); + } + + @Override + public boolean canUndo() { + return false; + //return true; + } + + @Override + public void undo() { + //removeContainerInner(filled); + } + + @Override + public String describe() { + return "Adding " + filled.getDisplayName() + " as liquid container for " + fluid.getLocalizedName(); + } + + @Override + public String describeUndo() { + return "Removing liquid container " + filled; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + /*private class RemoveContainerAction implements IUndoableAction { + private final IItemStack filled; + private final IItemStack empty; + private final FluidStack amount; + + public RemoveContainerAction(IItemStack filled) { + this.filled = filled; + + FluidContainerRegistry.FluidContainerData data = getData(filled); + empty = MineTweakerMC.getIItemStack(data.emptyContainer); + amount = data.fluid; + } + + @Override + public void apply() { + removeContainerInner(filled); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + FluidContainerRegistry.registerFluidContainer(amount, MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); + } + + @Override + public String describe() { + return "Removing liquid container " + filled; + } + + @Override + public String describeUndo() { + return "Restoring liquid container " + filled; + } + + @Override + public Object getOverrideKey() { + return null; + } + }*/ + private class ActionSetLuminosity implements IUndoableAction { private final int oldValue; private final int newValue; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java index da8bcab..2a87468 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java @@ -21,7 +21,7 @@ public class MineTweakerLoadScriptsHandler implements IMessageHandler>) OREDICTIONARY_IDTOSTACK.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("ERROR - could not load ore dictionary stacks!"); + MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); return null; } } @@ -76,7 +76,7 @@ public class MineTweakerHacks { try { return (List>) OREDICTIONARY_IDTOSTACKUN.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("ERROR - could not load ore dictionary stacks!"); + MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); return null; } } @@ -85,7 +85,7 @@ public class MineTweakerHacks { try { return (File) MINECRAFTSERVER_ANVILFILE.get(server); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not load anvil file!"); + MineTweakerAPI.logError("could not load anvil file!"); return null; } } @@ -105,7 +105,7 @@ public class MineTweakerHacks { try { return SHAPEDORERECIPE_WIDTH.getInt(recipe); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not load anvil file!"); + MineTweakerAPI.logError("could not load anvil file!"); return 3; } } @@ -114,7 +114,7 @@ public class MineTweakerHacks { try { return (Container) INVENTORYCRAFTING_EVENTHANDLER.get(inventory); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get inventory eventhandler"); + MineTweakerAPI.logError("could not get inventory eventhandler"); return null; } } @@ -123,7 +123,7 @@ public class MineTweakerHacks { try { return (EntityPlayer) SLOTCRAFTING_PLAYER.get(slot); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get inventory eventhandler"); + MineTweakerAPI.logError("could not get inventory eventhandler"); return null; } } @@ -133,7 +133,7 @@ public class MineTweakerHacks { Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); return (StringTranslate) field.get(null); } catch (IllegalAccessException ex) { - MineTweakerAPI.getLogger().logError("could not get string translator"); + MineTweakerAPI.logError("could not get string translator"); return null; } } diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java index dd7568a..8e96533 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java @@ -56,12 +56,12 @@ public class IC2BracketHandler implements IBracketHandler { } else if (tokens.get(6).getValue().equals("*")) { meta = OreDictionary.WILDCARD_VALUE; } else { - MineTweakerAPI.getLogger().logError("Not a valid meta value: " + tokens.get(6).getValue()); + MineTweakerAPI.logError("Not a valid meta value: " + tokens.get(6).getValue()); } } ItemStack item = IC2Items.getItem(name); if (item == null) { - MineTweakerAPI.getLogger().logError("Not a valid IC2 item: " + name); + MineTweakerAPI.logError("Not a valid IC2 item: " + name); return null; } else { return new ItemReferenceSymbol(name, meta); diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java index fdf7a76..ed5c0a8 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java @@ -35,9 +35,9 @@ public class IC2ExplosionWhitelist { ItemStack iStack = getItemStack(item); Block block = Block.getBlockFromItem(iStack.getItem()); if (block == null) { - MineTweakerAPI.getLogger().logError("This item is not a block"); + MineTweakerAPI.logError("This item is not a block"); } else { - MineTweakerAPI.tweaker.apply(new AddAction(block)); + MineTweakerAPI.apply(new AddAction(block)); } } @@ -51,12 +51,12 @@ public class IC2ExplosionWhitelist { ItemStack iStack = getItemStack(item); Block block = Block.getBlockFromItem(iStack.getItem()); if (block == null) { - MineTweakerAPI.getLogger().logError("This item is not a block"); + MineTweakerAPI.logError("This item is not a block"); } else { if (ExplosionWhitelist.isBlockWhitelisted(block)) { - MineTweakerAPI.getLogger().logWarning("This block is not in the whitelist"); + MineTweakerAPI.logWarning("This block is not in the whitelist"); } else { - MineTweakerAPI.tweaker.apply(new RemoveAction(block)); + MineTweakerAPI.apply(new RemoveAction(block)); } } } @@ -72,7 +72,7 @@ public class IC2ExplosionWhitelist { ItemStack iStack = getItemStack(item); Block block = Block.getBlockFromItem(iStack.getItem()); if (block == null) { - MineTweakerAPI.getLogger().logWarning("This item is not a block"); + MineTweakerAPI.logWarning("This item is not a block"); return false; } else { return ExplosionWhitelist.isBlockWhitelisted(block); diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java index 87778d5..4866974 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java @@ -31,7 +31,7 @@ public class MachineAddRecipeAction extends OneWayAction { try { machine.addRecipe(input, tag, output); } catch (RuntimeException ex) { - MineTweakerAPI.getLogger().logError(ex.getMessage()); + MineTweakerAPI.logError(ex.getMessage()); } } diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java index 0d1c1b7..ffecdc8 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -29,22 +29,22 @@ import stanhebben.zenscript.annotations.ZenMethod; public class Canner { @ZenMethod public static void addBottleRecipe(IIngredient container, IIngredient fill, IItemStack output) { - MineTweakerAPI.tweaker.apply(new AddBottleIngredientAction(container, fill, output)); + MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); } @ZenMethod public static void addBottleRecipe(IIngredient container, ILiquidStack liquid, IItemStack output) { - MineTweakerAPI.tweaker.apply(new AddBottleLiquidAction(container, liquid, output)); + MineTweakerAPI.apply(new AddBottleLiquidAction(container, liquid, output)); } @ZenMethod public static void addEnrichRecipe(ILiquidStack input, IIngredient additive, ILiquidStack output) { - MineTweakerAPI.tweaker.apply(new AddEnrichIngredientAction(input, additive, output)); + MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); } @ZenMethod public static void addEnrichRecipe(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { - MineTweakerAPI.tweaker.apply(new AddEnrichLiquidAction(input, additive, output)); + MineTweakerAPI.apply(new AddEnrichLiquidAction(input, additive, output)); } private static class AddBottleIngredientAction extends OneWayAction { diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java index b5738ef..646735f 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java @@ -38,9 +38,9 @@ public class Compressor { @NotNull IItemStack output, @NotNull IIngredient ingredient) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "compressor", Recipes.compressor, getItemStacks(output), diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java index 94d0b23..90b71cb 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java @@ -43,9 +43,9 @@ public class Extractor { @NotNull IItemStack output, @NotNull IIngredient ingredient) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "extractor", Recipes.extractor, getItemStacks(output), diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java index b817a2c..772baee 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java @@ -38,9 +38,9 @@ public class Macerator { @NotNull IItemStack output, @NotNull IIngredient ingredient) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "macerator", Recipes.macerator, getItemStacks(output), diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java index 780e8a4..1a63967 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java @@ -30,6 +30,6 @@ public class MatterAmplifier { public static void setAmplifier(IIngredient item, int amplifier) { NBTTagCompound data = new NBTTagCompound(); data.setInteger("amplification", amplifier); - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction("matter amplifier", Recipes.matterAmplifier, new ItemStack[0], data, new IC2RecipeInput(item))); + MineTweakerAPI.apply(new MachineAddRecipeAction("matter amplifier", Recipes.matterAmplifier, new ItemStack[0], data, new IC2RecipeInput(item))); } } diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java index 2adb279..6bb83c2 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java @@ -35,7 +35,7 @@ public class MetalFormer { */ @ZenMethod public static void addExtrudingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "metal former - extruding", Recipes.metalformerExtruding, getItemStacks(output), @@ -64,7 +64,7 @@ public class MetalFormer { */ @ZenMethod public static void addRollingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "metal former - rolling", Recipes.metalformerRolling, getItemStacks(output), @@ -92,7 +92,7 @@ public class MetalFormer { */ @ZenMethod public static void addCuttingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "metal former - cutting", Recipes.metalformerCutting, getItemStacks(output), diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java index e723a60..a0af2f9 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java @@ -26,7 +26,7 @@ public class OreWasher { public static void addRecipe(IItemStack[] output, IIngredient input, int millibuckets) { NBTTagCompound nbt = new NBTTagCompound(); nbt.setInteger("amount", millibuckets); - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "ore washer", Recipes.oreWashing, getItemStacks(output), diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java index 8344fad..d7d1d29 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java @@ -26,7 +26,7 @@ import stanhebben.zenscript.annotations.ZenMethod; public class Recycler { @ZenMethod public static void addBlacklist(IIngredient ingredient) { - MineTweakerAPI.tweaker.apply(new AddBlacklistAction(ingredient)); + MineTweakerAPI.apply(new AddBlacklistAction(ingredient)); } @ZenMethod diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java index a6afae6..943ff5c 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java @@ -40,7 +40,7 @@ public class ScrapBox { */ @ZenMethod public static void addDrop(WeightedItemStack stack) { - MineTweakerAPI.tweaker.apply(new AddDropAction(stack)); + MineTweakerAPI.apply(new AddDropAction(stack)); } private static class AddDropAction extends OneWayAction { diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java index 1dd960e..c1bfe9f 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java @@ -24,7 +24,7 @@ import stanhebben.zenscript.annotations.ZenMethod; public class SemiFluidGenerator { @ZenMethod public static void addFluid(ILiquidStack liquidPerTick, int energyPerTick) { - MineTweakerAPI.tweaker.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), energyPerTick)); + MineTweakerAPI.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), energyPerTick)); } @ZenMethod diff --git a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java index 45d94b4..9d7accf 100644 --- a/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java +++ b/MineTweaker3-MC172-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java @@ -37,11 +37,11 @@ public class ThermalCentrifuge { @ZenMethod public static void addRecipe(IItemStack[] output, IIngredient ingredient, int minHeat) { if (ingredient.getAmount() < 0) { - MineTweakerAPI.getLogger().logWarning("invalid ingredient: " + ingredient + " - stack size not known"); + MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); } else { NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("minHeat", minHeat); - MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction( + MineTweakerAPI.apply(new MachineAddRecipeAction( "thermal centrifuge", Recipes.centrifuge, getItemStacks(output), diff --git a/MineTweaker3-MC172-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java b/MineTweaker3-MC172-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java index e9d0a61..ed53bca 100644 --- a/MineTweaker3-MC172-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java +++ b/MineTweaker3-MC172-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java @@ -33,7 +33,7 @@ public class NEI { */ @ZenMethod public static void hide(@NotNull IItemStack item) { - MineTweakerAPI.tweaker.apply(new NEIHideItemAction(getItemStack(item))); + MineTweakerAPI.apply(new NEIHideItemAction(getItemStack(item))); } /** @@ -43,7 +43,7 @@ public class NEI { */ @ZenMethod public static void addEntry(@NotNull IItemStack stack) { - MineTweakerAPI.tweaker.apply(new NEIAddEntryAction(getItemStack(stack))); + MineTweakerAPI.apply(new NEIAddEntryAction(getItemStack(stack))); } /** @@ -55,7 +55,7 @@ public class NEI { */ @ZenMethod public static void overrideName(@NotNull IItemStack item, @NotNull String name) { - MineTweakerAPI.tweaker.apply(new NEIOverrideNameAction(getItemStack(item), name)); + MineTweakerAPI.apply(new NEIOverrideNameAction(getItemStack(item), name)); } // ############################# diff --git a/MineTweaker3-Web/index.html b/MineTweaker3-Web/index.html index 8a7c8cb..3eaa3ea 100644 --- a/MineTweaker3-Web/index.html +++ b/MineTweaker3-Web/index.html @@ -95,9 +95,9 @@

GitHub

diff --git a/build.gradle b/build.gradle index 2ae3bc4..45ca9ea 100644 --- a/build.gradle +++ b/build.gradle @@ -54,12 +54,12 @@ task assembleMC172(type: Jar, dependsOn: [\ task assembleMC164(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build', - ':MineTweaker3-MC164-Main:build'/*, - ':MineTweaker3-MC164-Mod-IC2:build'*/, + ':MineTweaker3-MC164-Main:build', + ':MineTweaker3-MC164-Mod-IC2:build', ':MineTweaker3-MC164-Mod-NEI:build']) { from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) from zipTree(project(':MineTweaker3-MC164-Main').jar.archivePath) -/* from zipTree(project(':MineTweaker3-MC164-Mod-IC2').jar.archivePath)*/ + from zipTree(project(':MineTweaker3-MC164-Mod-IC2').jar.archivePath) from zipTree(project(':MineTweaker3-MC164-Mod-NEI').jar.archivePath) }