mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-19 11:49:05 +00:00
- Extending API with chat functionality
- Refactoring towards MineTweakerMC calls - Added IC2 matter amplifier support
This commit is contained in:
1 parent
7c478da1a2
commit
ea0d369519
95 files changed
+1828
-547
No files matched your search
@@ -0,0 +1,17 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public interface IPlatformFunctions {
|
||||
public IChatMessage getMessage(String message);
|
||||
}
|
||||
@@ -11,6 +11,14 @@ package minetweaker;
|
||||
* canUndo(), the action is undoable, otherwise it is permanent. Permanent
|
||||
* actions cannot be used in server scripts.
|
||||
*
|
||||
* There also exist semi-permanent actions. Those actions can return an override
|
||||
* key; if a newer action has the same override key as an old action, the new
|
||||
* action is considered to override the old one.
|
||||
*
|
||||
* Likewise, actions can implement hashCode and equals methods to indicate that
|
||||
* they are equal. If an action is equal to a non-undoable stuck action, it will
|
||||
* be omitted from execution.
|
||||
*
|
||||
* @author Stan Hebben
|
||||
*/
|
||||
public interface IUndoableAction {
|
||||
@@ -60,4 +68,16 @@ public interface IUndoableAction {
|
||||
* @return the description of this action, when undone
|
||||
*/
|
||||
public String describeUndo();
|
||||
|
||||
/**
|
||||
* Returns the override key. Two actions are considered to override each
|
||||
* other if their override key is equal. You can return null to indicate
|
||||
* that an action can never be overridden.
|
||||
*
|
||||
* This value only makes sense for recipes that are not undoable. For
|
||||
* undoable recipes, you should return null.
|
||||
*
|
||||
* @return override key (null for actions that are undoable or which can never be overridden by another action)
|
||||
*/
|
||||
public Object getOverrideKey();
|
||||
}
|
||||
@@ -110,6 +110,11 @@ public class MineTweakerAPI {
|
||||
*/
|
||||
public static IResourceManager resources = null;
|
||||
|
||||
/**
|
||||
* Access point to general platform functions.
|
||||
*/
|
||||
public static IPlatformFunctions platform = null;
|
||||
|
||||
/**
|
||||
* Register a class registry class. Such class must have (at least) a public
|
||||
* static method called "getClasses" with accepts a List of classes and which
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
/*
|
||||
* 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;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenOperator;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
@ZenClass("minetweaker.chat.IChatMessage")
|
||||
public interface IChatMessage {
|
||||
@ZenOperator(OperatorType.ADD)
|
||||
public IChatMessage add(IChatMessage other);
|
||||
|
||||
public Object getInternal();
|
||||
}
|
||||
@@ -118,7 +118,9 @@ public interface IIngredient {
|
||||
/**
|
||||
* Gets the internal item backing this ingredient.
|
||||
*
|
||||
* The value is implementation-dependent.
|
||||
* The value is implementation-dependent and should only be handled by
|
||||
* the internal code. Don't use this value - instead, use the version-specific
|
||||
* helper methods.
|
||||
*
|
||||
* @return internal item
|
||||
*/
|
||||
|
||||
@@ -9,6 +9,7 @@ package minetweaker.api.oredict;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenGetter;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
|
||||
/**
|
||||
@@ -17,6 +18,9 @@ import stanhebben.zenscript.annotations.ZenMethod;
|
||||
*/
|
||||
@ZenClass("minetweaker.oredict.IOreDictEntry")
|
||||
public interface IOreDictEntry extends IIngredient {
|
||||
@ZenGetter("empty")
|
||||
public boolean isEmpty();
|
||||
|
||||
@ZenMethod
|
||||
public void add(IItemStack item);
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.api.player;
|
||||
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.api.data.IData;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenGetter;
|
||||
@@ -25,4 +26,7 @@ public interface IPlayer {
|
||||
|
||||
@ZenMethod
|
||||
public void update(IData data);
|
||||
|
||||
@ZenMethod
|
||||
public void sendChat(IChatMessage message);
|
||||
}
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
package minetweaker.expand;
|
||||
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.api.data.DataString;
|
||||
import minetweaker.api.data.IData;
|
||||
import stanhebben.zenscript.annotations.ZenCaster;
|
||||
@@ -21,4 +23,9 @@ public class ExpandString {
|
||||
public static IData asData(String value) {
|
||||
return new DataString(value);
|
||||
}
|
||||
|
||||
@ZenCaster
|
||||
public static IChatMessage asChatMessage(String value) {
|
||||
return MineTweakerAPI.platform.getMessage(value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
package minetweaker.api.minecraft;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.mc164.data.NBTConverter;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.mc164.oredict.MCOreDictEntry;
|
||||
import minetweaker.mc164.player.MCPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
/**
|
||||
* MineTweaker - MineCraft API bridge.
|
||||
*
|
||||
* @author Stan Hebben
|
||||
*/
|
||||
public class MineTweakerMC {
|
||||
private MineTweakerMC() {}
|
||||
|
||||
/**
|
||||
* Returns the Minecraft item for this MineTweaker item.
|
||||
*
|
||||
* @param item minetweaker item stack
|
||||
* @return minecraft item stack
|
||||
*/
|
||||
public static ItemStack getItemStack(IItemStack item) {
|
||||
Object internal = item.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
MineTweakerAPI.logger.logError("Not a valid item stack: " + item);
|
||||
}
|
||||
return (ItemStack) internal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Minecraft ingredient for this ingredient. This method is only
|
||||
* useful for ingredients that represent a single item stack.
|
||||
*
|
||||
* @param ingredient item ingredient
|
||||
* @return minecraft item stack
|
||||
*/
|
||||
public static ItemStack getItemStack(IIngredient ingredient) {
|
||||
List<IItemStack> items = ingredient.getItems();
|
||||
if (items.size() != 1) {
|
||||
MineTweakerAPI.logger.logError("Not an ingredient with a single item: " + ingredient);
|
||||
}
|
||||
return getItemStack(items.get(0));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the MineTweaker item stack for this item.
|
||||
*
|
||||
* @param item minecraft item stack
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getIItemStack(ItemStack item) {
|
||||
return new MCItemStack(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with wildcard size.
|
||||
*
|
||||
* @param item
|
||||
* @param meta
|
||||
* @return minetweaker stack
|
||||
*/
|
||||
public static IItemStack getIItemStackWildcardSize(Item item, int meta) {
|
||||
return new MCItemStack(new ItemStack(item, 1, meta), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with wildcard damage.
|
||||
*
|
||||
* @param item stack item
|
||||
* @param amount stack size
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getIItemStackWildcard(Item item, int amount) {
|
||||
return new MCItemStack(new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE));
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with given item, damage and amount.
|
||||
*
|
||||
* @param item stack item
|
||||
* @param damage stack damage
|
||||
* @param amount stack amount
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getItemStack(Item item, int amount, int damage) {
|
||||
return new MCItemStack(new ItemStack(item, amount, damage));
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an array of minetweaker item stacks into an array of minecraft
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minetweker item stacks
|
||||
* @return minecraft item stacks
|
||||
*/
|
||||
public static ItemStack[] getItemStacks(IItemStack... items) {
|
||||
ItemStack[] output = new ItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
Object internal = items[i].getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of minetweaker item stacks into an array of minecraft
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minetweaker items
|
||||
* @return minecraft items
|
||||
*/
|
||||
public static ItemStack[] getItemStacks(List<IItemStack> items) {
|
||||
ItemStack[] output = new ItemStack[items.size()];
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
Object internal = items.get(i).getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
} else {
|
||||
MineTweakerAPI.logger.logError("Invalid item stack: " + items.get(i));
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an array of minecraft item stacks into an array of minetweaker
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minecraft item stacks
|
||||
* @return minetweaker item stacks
|
||||
*/
|
||||
public static IItemStack[] getIItemStacks(ItemStack... items) {
|
||||
IItemStack[] result = new IItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
result[i] = new MCItemStack(items[i]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of minecraft item stacks into an array of minetweaker
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minecraft item stacks
|
||||
* @return minetweaker item stacks
|
||||
*/
|
||||
public static IItemStack[] getIItemStacks(List<ItemStack> items) {
|
||||
IItemStack[] result = new IItemStack[items.size()];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new MCItemStack(items.get(i));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the ore dictionary entry with the given name. If the entry didn't
|
||||
* exist yet, it will create it and return an empty entry.
|
||||
*
|
||||
* @param name ore entry name
|
||||
* @return ore dictionary entry
|
||||
*/
|
||||
public static IOreDictEntry getOreDict(String name) {
|
||||
return new MCOreDictEntry(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft player into a MineTweaker player.
|
||||
*
|
||||
* @param player minecraft player
|
||||
* @return minetweaker player
|
||||
*/
|
||||
public static IPlayer getIPlayer(EntityPlayer player) {
|
||||
return new MCPlayer(player);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a MineTweaker player into a Minecraft player.
|
||||
*
|
||||
* @param player minetweaker player
|
||||
* @return minecraft player
|
||||
*/
|
||||
public static EntityPlayer getPlayer(IPlayer player) {
|
||||
if (!(player instanceof MCPlayer)) {
|
||||
MineTweakerAPI.logger.logError("Invalid player: " + player);
|
||||
}
|
||||
|
||||
return ((MCPlayer) player).getInternal();
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft NBT to an IData instance. The IData instance is
|
||||
* immutable (not modifyiable).
|
||||
*
|
||||
* @param nbt nbt data
|
||||
* @return IData value
|
||||
*/
|
||||
public static IData getIData(NBTBase nbt) {
|
||||
return NBTConverter.from(nbt, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft NBT to a modifyable IData instance.
|
||||
*
|
||||
* @param nbt nbt data
|
||||
* @return mutable IData value
|
||||
*/
|
||||
public static IData getIDataModifyable(NBTBase nbt) {
|
||||
return NBTConverter.from(nbt, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an IData instance to an NBT value.
|
||||
*
|
||||
* @param data IData value
|
||||
* @return nbt data
|
||||
*/
|
||||
public static NBTBase getNBT(IData data) {
|
||||
return NBTConverter.from(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an IData instance to an NBT Tag compound.
|
||||
*
|
||||
* @param data IData value
|
||||
* @return nbt compound data
|
||||
*/
|
||||
public static NBTTagCompound getNBTCompound(IData data) {
|
||||
return (NBTTagCompound) NBTConverter.from(data);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* 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.mc164;
|
||||
|
||||
import minetweaker.IPlatformFunctions;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.mc164.chat.MCChatMessage;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MCPlatformFunctions implements IPlatformFunctions {
|
||||
public static final MCPlatformFunctions INSTANCE = new MCPlatformFunctions();
|
||||
|
||||
private MCPlatformFunctions() {}
|
||||
|
||||
@Override
|
||||
public IChatMessage getMessage(String message) {
|
||||
return new MCChatMessage(message);
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,10 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getOreDict;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
|
||||
import net.minecraft.command.ICommand;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
@@ -135,7 +138,7 @@ public class MineTweakerCommand implements ICommand {
|
||||
description.append('*').append(stack.stackSize);
|
||||
}
|
||||
|
||||
sendChatMessage(icommandsender, new MCItemStack(stack).toString());
|
||||
sendChatMessage(icommandsender, getIItemStack(stack).toString());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -158,7 +161,7 @@ public class MineTweakerCommand implements ICommand {
|
||||
description.append('*').append(stack.stackSize);
|
||||
}
|
||||
|
||||
sendChatMessage(icommandsender, new MCItemStack(stack).toString());
|
||||
sendChatMessage(icommandsender, getIItemStack(stack).toString());
|
||||
}
|
||||
} else {
|
||||
sendChatMessage(icommandsender, "Hand command can only be executed by players");
|
||||
@@ -166,22 +169,24 @@ public class MineTweakerCommand implements ICommand {
|
||||
} else if (arguments[0].equals("oredict")) {
|
||||
if (arguments.length > 2) {
|
||||
String entryName = arguments[2];
|
||||
List<ItemStack> ores = OreDictionary.getOres(entryName);
|
||||
if (ores.isEmpty()) {
|
||||
IOreDictEntry entry = getOreDict(entryName);
|
||||
if (entry.isEmpty()) {
|
||||
sendChatMessage(icommandsender, "Entry doesn't exist");
|
||||
return;
|
||||
} else {
|
||||
MineTweakerAPI.logger.logCommand("Ore entries for " + entryName + ":");
|
||||
for (ItemStack ore : ores) {
|
||||
MineTweakerAPI.logger.logCommand(" " + new MCItemStack(ore).toString());
|
||||
for (IItemStack ore : entry.getItems()) {
|
||||
MineTweakerAPI.logger.logCommand(" " + ore);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (String entryName : OreDictionary.getOreNames()) {
|
||||
MineTweakerAPI.logger.logCommand("Ore entries for " + entryName + ":");
|
||||
List<ItemStack> ores = OreDictionary.getOres(entryName);
|
||||
for (ItemStack ore : ores) {
|
||||
MineTweakerAPI.logger.logCommand(" " + new MCItemStack(ore).toString());
|
||||
IOreDictEntry entry = getOreDict(entryName);
|
||||
if (!entry.isEmpty()) {
|
||||
for (IItemStack ore : entry.getItems()) {
|
||||
MineTweakerAPI.logger.logCommand(" " + ore);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,11 @@ import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.Writer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.runtime.ILogger;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ChatMessageComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -20,11 +24,16 @@ import minetweaker.runtime.ILogger;
|
||||
*/
|
||||
public class MineTweakerLogger implements ILogger {
|
||||
private Writer writer;
|
||||
private final List<String> unreportedErrors;
|
||||
private final List<EntityPlayer> players;
|
||||
|
||||
public MineTweakerLogger() {
|
||||
File logFile = new File("minetweaker.log");
|
||||
if (logFile.exists()) logFile.delete();
|
||||
|
||||
unreportedErrors = new ArrayList<String>();
|
||||
players = new ArrayList<EntityPlayer>();
|
||||
|
||||
try {
|
||||
writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(logFile)));
|
||||
} catch (IOException ex) {
|
||||
@@ -32,6 +41,26 @@ public class MineTweakerLogger implements ILogger {
|
||||
}
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
unreportedErrors.clear();
|
||||
}
|
||||
|
||||
public void addPlayer(EntityPlayer player) {
|
||||
players.add(player);
|
||||
|
||||
if (!unreportedErrors.isEmpty()) {
|
||||
for (String error : unreportedErrors) {
|
||||
player.sendChatToPlayer(ChatMessageComponent.createFromText(error));
|
||||
}
|
||||
|
||||
unreportedErrors.clear();
|
||||
}
|
||||
}
|
||||
|
||||
public void removePlayer(EntityPlayer player) {
|
||||
players.remove(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void logCommand(String message) {
|
||||
try {
|
||||
@@ -62,22 +91,16 @@ public class MineTweakerLogger implements ILogger {
|
||||
|
||||
@Override
|
||||
public void logWarning(String message) {
|
||||
try {
|
||||
writer.append("WARNING: ");
|
||||
writer.append(message);
|
||||
writer.append('\n');
|
||||
writer.flush();
|
||||
} catch (IOException ex) {
|
||||
|
||||
}
|
||||
|
||||
System.out.println("WARNING: " + message);
|
||||
report("WARNING: " + message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void logError(String message) {
|
||||
report("ERROR: " + message);
|
||||
}
|
||||
|
||||
private void report(String message) {
|
||||
try {
|
||||
writer.append("ERROR: ");
|
||||
writer.append(message);
|
||||
writer.append('\n');
|
||||
writer.flush();
|
||||
@@ -85,6 +108,15 @@ public class MineTweakerLogger implements ILogger {
|
||||
|
||||
}
|
||||
|
||||
System.out.println("ERROR: " + message);
|
||||
System.out.println(message);
|
||||
|
||||
if (players.isEmpty()) {
|
||||
unreportedErrors.add(message);
|
||||
} else {
|
||||
ChatMessageComponent text = ChatMessageComponent.createFromText(message);
|
||||
for (EntityPlayer player : players) {
|
||||
player.sendChatToPlayer(text);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,12 +13,16 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
|
||||
import cpw.mods.fml.common.event.FMLServerStartingEvent;
|
||||
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc164.furnace.FuelTweaker;
|
||||
import minetweaker.mc164.furnace.MCFurnaceManager;
|
||||
import minetweaker.mc164.mods.MCLoadedMods;
|
||||
import minetweaker.mc164.network.MCConnectionHandler;
|
||||
import minetweaker.mc164.network.MCPacketHandler;
|
||||
import minetweaker.mc164.oredict.MCOreDict;
|
||||
import minetweaker.mc164.recipes.MCRecipeManager;
|
||||
@@ -26,8 +30,11 @@ import minetweaker.mc164.util.MineTweakerHacks;
|
||||
import minetweaker.runtime.IScriptProvider;
|
||||
import minetweaker.runtime.providers.ScriptProviderCascade;
|
||||
import minetweaker.runtime.providers.ScriptProviderDirectory;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
/**
|
||||
* Main mod class. Performs some general logic, initialization of the API and
|
||||
@@ -48,17 +55,21 @@ public class MineTweakerMod {
|
||||
@Mod.Instance(MODID)
|
||||
public static MineTweakerMod INSTANCE;
|
||||
|
||||
private final MineTweakerLogger logger;
|
||||
private final IScriptProvider scriptsGlobal;
|
||||
private final Map<INetworkManager, EntityPlayer> onlinePlayers;
|
||||
|
||||
private boolean iAmServer = false;
|
||||
|
||||
public MineTweakerMod() {
|
||||
MineTweakerAPI.oreDict = new MCOreDict();
|
||||
MineTweakerAPI.recipes = new MCRecipeManager();
|
||||
MineTweakerAPI.logger = new MineTweakerLogger();
|
||||
MineTweakerAPI.logger = logger = new MineTweakerLogger();
|
||||
MineTweakerAPI.furnace = new MCFurnaceManager();
|
||||
MineTweakerAPI.loadedMods = new MCLoadedMods();
|
||||
|
||||
MineTweakerAPI.platform = MCPlatformFunctions.INSTANCE;
|
||||
|
||||
File globalDir = new File("scripts");
|
||||
if (!globalDir.exists()) {
|
||||
globalDir.mkdirs();
|
||||
@@ -66,6 +77,8 @@ public class MineTweakerMod {
|
||||
|
||||
scriptsGlobal = new ScriptProviderDirectory(globalDir);
|
||||
MineTweakerAPI.tweaker.setScriptProvider(scriptsGlobal);
|
||||
|
||||
onlinePlayers = new HashMap<INetworkManager, EntityPlayer>();
|
||||
}
|
||||
|
||||
public boolean iAmServer() {
|
||||
@@ -88,6 +101,20 @@ public class MineTweakerMod {
|
||||
}
|
||||
}
|
||||
|
||||
public void onPlayerLoggedIn(INetworkManager networkManager, EntityPlayer player) {
|
||||
onlinePlayers.put(networkManager, player);
|
||||
if (iAmServer || MinecraftServer.getServer().getConfigurationManager().getOps().contains(player.getCommandSenderName())) {
|
||||
System.out.println("Op logged in");
|
||||
|
||||
logger.addPlayer(player);
|
||||
}
|
||||
}
|
||||
|
||||
public void onPlayerLoggedOut(INetworkManager networkManager) {
|
||||
logger.removePlayer(onlinePlayers.get(networkManager));
|
||||
onlinePlayers.remove(networkManager);
|
||||
}
|
||||
|
||||
// ##########################
|
||||
// ### FML Event Handlers ###
|
||||
// ##########################
|
||||
@@ -106,6 +133,7 @@ public class MineTweakerMod {
|
||||
}
|
||||
|
||||
FuelTweaker.INSTANCE.register();
|
||||
NetworkRegistry.instance().registerConnectionHandler(new MCConnectionHandler());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
||||
+5
@@ -58,4 +58,9 @@ public class SetTranslationAction implements IUndoableAction {
|
||||
private static void set(String key, String value) {
|
||||
StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+6
-5
@@ -12,11 +12,10 @@ import java.util.Map;
|
||||
import minetweaker.IBracketHandler;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.BracketHandler;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IngredientAny;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import stanhebben.zenscript.ZenTokener;
|
||||
import stanhebben.zenscript.expression.ExpressionInt;
|
||||
@@ -49,7 +48,7 @@ public class ItemBracketHandler implements IBracketHandler {
|
||||
public static IItemStack getItem(String name, int meta) {
|
||||
Item item = itemNames.get(name);
|
||||
if (item != null) {
|
||||
return new MCItemStack(new ItemStack(item, 1, meta), true);
|
||||
return getIItemStackWildcardSize(item, meta);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
@@ -58,7 +57,7 @@ public class ItemBracketHandler implements IBracketHandler {
|
||||
public static IItemStack getItem(int id, int meta) {
|
||||
Item item = Item.itemsList[id];
|
||||
if (item != null) {
|
||||
return new MCItemStack(new ItemStack(item, 1, meta), true);
|
||||
return getIItemStackWildcardSize(item, meta);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
@@ -69,7 +68,9 @@ public class ItemBracketHandler implements IBracketHandler {
|
||||
private final JavaMethod method2;
|
||||
|
||||
public ItemBracketHandler() {
|
||||
symbolAny = MineTweakerAPI.getJavaStaticFieldSymbol(IngredientAny.class, "INSTANCE");
|
||||
symbolAny = MineTweakerAPI.getJavaStaticFieldSymbol(
|
||||
IngredientAny.class,
|
||||
"INSTANCE");
|
||||
method = MineTweakerAPI.getJavaMethod(
|
||||
ItemBracketHandler.class,
|
||||
"getItem",
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ package minetweaker.mc164.brackets;
|
||||
import java.util.List;
|
||||
import minetweaker.IBracketHandler;
|
||||
import minetweaker.annotations.BracketHandler;
|
||||
import minetweaker.mc164.oredict.MCOreDictEntry;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getOreDict;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.runtime.GlobalRegistry;
|
||||
import stanhebben.zenscript.expression.ExpressionJavaCallStatic;
|
||||
@@ -27,7 +27,7 @@ import stanhebben.zenscript.util.ZenPosition;
|
||||
@BracketHandler
|
||||
public class OreBracketHandler implements IBracketHandler {
|
||||
public static IOreDictEntry getOre(String name) {
|
||||
return new MCOreDictEntry(name);
|
||||
return getOreDict(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +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.mc164.chat;
|
||||
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import net.minecraft.util.ChatMessageComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MCChatMessage implements IChatMessage {
|
||||
private final ChatMessageComponent data;
|
||||
|
||||
public MCChatMessage(String message) {
|
||||
data = ChatMessageComponent.createFromText(message);
|
||||
}
|
||||
|
||||
public MCChatMessage(ChatMessageComponent data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IChatMessage add(IChatMessage other) {
|
||||
return new MCChatMessage(data.appendComponent((ChatMessageComponent) other.getInternal()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getInternal() {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@ import cpw.mods.fml.common.IFuelHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
|
||||
public class FuelTweaker {
|
||||
public static final FuelTweaker INSTANCE = new FuelTweaker();
|
||||
@@ -71,7 +71,7 @@ public class FuelTweaker {
|
||||
private class OverridingFuelHandler implements IFuelHandler {
|
||||
@Override
|
||||
public int getBurnTime(ItemStack fuel) {
|
||||
IItemStack stack = new MCItemStack(fuel);
|
||||
IItemStack stack = getIItemStack(fuel);
|
||||
String name = fuel.getUnlocalizedName();
|
||||
if (quickList.containsKey(name)) {
|
||||
for (SetFuelPattern override : quickList.get(name)) {
|
||||
|
||||
+25
-9
@@ -14,9 +14,10 @@ import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
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.api.recipes.IFurnaceManager;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.mc164.util.MineTweakerUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
@@ -43,16 +44,16 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
List<ItemStack> toRemoveMetaValues = new ArrayList<ItemStack>();
|
||||
|
||||
for (Map.Entry<Integer, ItemStack> entry : smeltingList.entrySet()) {
|
||||
if (output.matches(new MCItemStack(entry.getValue()))
|
||||
&& (input == null || input.matches(new MCItemStack(new ItemStack(entry.getKey(), 1, 0))))) {
|
||||
if (output.matches(getIItemStack(entry.getValue()))
|
||||
&& (input == null || input.matches(getIItemStack(new ItemStack(entry.getKey(), 1, 0))))) {
|
||||
toRemove.add(entry.getKey());
|
||||
toRemoveValues.add(entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
for (Map.Entry<List<Integer>, ItemStack> entry : metaSmeltingList.entrySet()) {
|
||||
if (output.matches(new MCItemStack(entry.getValue()))
|
||||
&& (input == null || input.matches(new MCItemStack(new ItemStack(entry.getKey().get(0), 1, entry.getKey().get(1)))))) {
|
||||
if (output.matches(getIItemStack(entry.getValue()))
|
||||
&& (input == null || input.matches(getIItemStack(new ItemStack(entry.getKey().get(0), 1, entry.getKey().get(1)))))) {
|
||||
toRemoveMeta.add(entry.getKey());
|
||||
toRemoveMetaValues.add(entry.getValue());
|
||||
}
|
||||
@@ -72,8 +73,8 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
MineTweakerAPI.logger.logError("Cannot turn " + input.toString() + " into a furnace recipe");
|
||||
}
|
||||
|
||||
ItemStack[] items2 = MineTweakerUtil.getItemStacks(items);
|
||||
ItemStack output2 = (ItemStack) output.getInternal();
|
||||
ItemStack[] items2 = getItemStacks(items);
|
||||
ItemStack output2 = getItemStack(output);
|
||||
MineTweakerAPI.tweaker.apply(new AddRecipeAction(input, items2, output2, xp));
|
||||
}
|
||||
|
||||
@@ -84,7 +85,7 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
|
||||
@Override
|
||||
public int getFuel(IItemStack item) {
|
||||
return GameRegistry.getFuelValue((ItemStack) item.getInternal());
|
||||
return GameRegistry.getFuelValue(getItemStack(item));
|
||||
}
|
||||
|
||||
// ######################
|
||||
@@ -138,6 +139,11 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + items.size() + " furnace recipes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class AddRecipeAction implements IUndoableAction {
|
||||
@@ -185,6 +191,11 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Removing furnace recipe for " + ingredient;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class SetFuelAction implements IUndoableAction {
|
||||
@@ -218,5 +229,10 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Removing fuel for " + pattern.getPattern();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientItem;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.mc164.actions.SetTranslationAction;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -199,7 +200,7 @@ public class MCItemStack implements IItemStack {
|
||||
|
||||
@Override
|
||||
public boolean matches(IItemStack item) {
|
||||
ItemStack internal = (ItemStack) item.getInternal();
|
||||
ItemStack internal = getItemStack(item);
|
||||
if (internal == null) {
|
||||
throw new RuntimeException("Invalid item: " + item);
|
||||
}
|
||||
|
||||
+25
@@ -126,6 +126,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " luminosity to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetDensity implements IUndoableAction {
|
||||
@@ -161,6 +166,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " density to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetTemperature implements IUndoableAction {
|
||||
@@ -196,6 +206,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " temperature to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetViscosity implements IUndoableAction {
|
||||
@@ -231,6 +246,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " viscosity to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetGaseous implements IUndoableAction {
|
||||
@@ -266,5 +286,10 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " gaseous to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-20
@@ -15,33 +15,18 @@ import net.minecraft.server.MinecraftServer;
|
||||
import cpw.mods.fml.common.network.IConnectionHandler;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc164.MineTweakerMod;
|
||||
|
||||
public class MCConnectionHandler implements IConnectionHandler {
|
||||
@Override
|
||||
public void playerLoggedIn(Player player, NetHandler netHandler,
|
||||
INetworkManager manager) {
|
||||
/*String[] admins = MineTweaker.instance.getAdmins();
|
||||
boolean canSendErrors = false;
|
||||
if (admins.length == 0) {
|
||||
canSendErrors = true;
|
||||
} else {
|
||||
for (String s : admins) {
|
||||
if (s.equals(netHandler.getPlayer().getEntityName())) canSendErrors = true;
|
||||
}
|
||||
}
|
||||
if (canSendErrors) {
|
||||
for (String s : MineTweaker.instance.getErrorMessages()) {
|
||||
//#ifdef MC152
|
||||
//+netHandler.getPlayer().sendChatToPlayer(s);
|
||||
//#else
|
||||
netHandler.getPlayer().sendChatToPlayer(ChatMessageComponent.createFromText(s));
|
||||
//#endif
|
||||
}
|
||||
MineTweaker.instance.onAdminLogin(manager, netHandler);
|
||||
}*/
|
||||
System.out.println("Player logged in: " + netHandler.getPlayer().username);
|
||||
|
||||
manager.addToSendQueue(new Packet250CustomPayload(
|
||||
MCPacketHandler.CHANNEL_SERVERSCRIPT,
|
||||
MineTweakerAPI.tweaker.getScriptData()));
|
||||
MineTweakerMod.INSTANCE.onPlayerLoggedIn(manager, netHandler.getPlayer());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,7 +47,7 @@ public class MCConnectionHandler implements IConnectionHandler {
|
||||
|
||||
@Override
|
||||
public void connectionClosed(INetworkManager manager) {
|
||||
//MineTweaker.instance.onLogout(manager);
|
||||
MineTweakerMod.INSTANCE.onPlayerLoggedOut(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+31
-5
@@ -10,13 +10,14 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.mc164.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemCondition;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.oredict.IngredientOreDict;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
@@ -41,10 +42,15 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
// ####################################
|
||||
// ### IOreDictEntry implementation ###
|
||||
// ####################################
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return OreDictionary.getOres(id).isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(IItemStack item) {
|
||||
ItemStack stack = (ItemStack) item.getInternal();
|
||||
ItemStack stack = getItemStack(item);
|
||||
if (stack == null) {
|
||||
MineTweakerAPI.logger.logError("not a valid item");
|
||||
} else {
|
||||
@@ -65,7 +71,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public void remove(IItemStack item) {
|
||||
ItemStack result = null;
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(new MCItemStack(itemStack))) {
|
||||
if (item.matches(getIItemStack(itemStack))) {
|
||||
result = itemStack;
|
||||
break;
|
||||
}
|
||||
@@ -79,7 +85,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
@Override
|
||||
public boolean contains(IItemStack item) {
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(new MCItemStack(itemStack))) {
|
||||
if (item.matches(getIItemStack(itemStack))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -110,7 +116,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public List<IItemStack> getItems() {
|
||||
List<IItemStack> result = new ArrayList<IItemStack>();
|
||||
for (ItemStack item : OreDictionary.getOres(id)) {
|
||||
result.add(new MCItemStack(item));
|
||||
result.add(getIItemStack(item));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -197,6 +203,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionMirror implements IUndoableAction {
|
||||
@@ -236,6 +247,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Undoing mirror of " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionRemoveItem implements IUndoableAction {
|
||||
@@ -271,6 +287,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionAddAll implements IUndoableAction {
|
||||
@@ -312,5 +333,10 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Removing contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " from " + OreDictionary.getOreName(idTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,10 +6,13 @@
|
||||
|
||||
package minetweaker.mc164.player;
|
||||
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.mc164.data.NBTConverter;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ChatMessageComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -21,6 +24,10 @@ public class MCPlayer implements IPlayer {
|
||||
public MCPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public EntityPlayer getInternal() {
|
||||
return player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
@@ -36,4 +43,14 @@ public class MCPlayer implements IPlayer {
|
||||
public void update(IData data) {
|
||||
NBTConverter.updateMap(player.getEntityData(), data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendChat(IChatMessage message) {
|
||||
Object internal = message;
|
||||
if (!(internal instanceof ChatMessageComponent)) {
|
||||
MineTweakerAPI.logger.logError("not a valid chat message");
|
||||
return;
|
||||
}
|
||||
player.sendChatToPlayer((ChatMessageComponent) internal);
|
||||
}
|
||||
}
|
||||
+5
-4
@@ -7,9 +7,10 @@
|
||||
package minetweaker.mc164.recipes;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.mc164.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.api.recipes.ICraftingInventory;
|
||||
import minetweaker.mc164.player.MCPlayer;
|
||||
@@ -80,7 +81,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
original[i] = inventory.getStackInSlot(i);
|
||||
if (inventory.getStackInSlot(i) != null) {
|
||||
if (stacks[i] == null) stackCount++;
|
||||
stacks[i] = new MCItemStack(original[i]);
|
||||
stacks[i] = getIItemStack(original[i]);
|
||||
} else {
|
||||
if (stacks[i] != null) stackCount--;
|
||||
stacks[i] = null;
|
||||
@@ -135,7 +136,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
stackCount--;
|
||||
inventory.setInventorySlotContents(ix, null);
|
||||
} else {
|
||||
inventory.setInventorySlotContents(ix, (ItemStack) stack.getInternal());
|
||||
inventory.setInventorySlotContents(ix, getItemStack(stack));
|
||||
|
||||
if (stacks[ix] == null) {
|
||||
stackCount++;
|
||||
@@ -154,7 +155,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
stackCount--;
|
||||
inventory.setInventorySlotContents(i, null);
|
||||
} else {
|
||||
inventory.setInventorySlotContents(i, (ItemStack) stack.getInternal());
|
||||
inventory.setInventorySlotContents(i, getItemStack(stack));
|
||||
|
||||
if (stacks[i] == null) {
|
||||
stackCount++;
|
||||
|
||||
+20
-22
@@ -6,11 +6,12 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import minetweaker.mc164.oredict.MCOreDictEntry;
|
||||
import minetweaker.mc164.util.MineTweakerHacks;
|
||||
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.getOreDict;
|
||||
import minetweaker.api.recipes.IRecipeFunction;
|
||||
import minetweaker.api.recipes.IRecipeManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -45,7 +46,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
// certain special recipes have no predefined output. ignore those
|
||||
// since these cannot be removed with MineTweaker scripts
|
||||
if (recipe.getRecipeOutput() != null) {
|
||||
if (output.matches(new MCItemStack(recipe.getRecipeOutput()))) {
|
||||
if (output.matches(getIItemStack(recipe.getRecipeOutput()))) {
|
||||
toRemove.add(recipe);
|
||||
removeIndex.add(i);
|
||||
}
|
||||
@@ -63,11 +64,6 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
|
||||
@Override
|
||||
public void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, boolean mirrored) {
|
||||
if (output.getInternal() == null) {
|
||||
MineTweakerAPI.logger.logError("invalid output item");
|
||||
return;
|
||||
}
|
||||
|
||||
ShapedRecipe recipe = new ShapedRecipe(output, ingredients, function, mirrored);
|
||||
IRecipe irecipe = RecipeConverter.convert(recipe);
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe));
|
||||
@@ -75,11 +71,6 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
|
||||
@Override
|
||||
public void addShapeless(IItemStack output, IIngredient[] ingredients, IRecipeFunction function) {
|
||||
if (output.getInternal() == null) {
|
||||
MineTweakerAPI.logger.logError("invalid output item");
|
||||
return;
|
||||
}
|
||||
|
||||
ShapelessRecipe recipe = new ShapelessRecipe(output, ingredients, function);
|
||||
IRecipe irecipe = RecipeConverter.convert(recipe);
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe));
|
||||
@@ -103,7 +94,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
outer: for (int i = 0; i < recipes.size(); i++) {
|
||||
IRecipe recipe = recipes.get(i);
|
||||
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(new MCItemStack(recipe.getRecipeOutput()))) {
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(getIItemStack(recipe.getRecipeOutput()))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -169,7 +160,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
outer: for (int i = 0; i < recipes.size(); i++) {
|
||||
IRecipe recipe = recipes.get(i);
|
||||
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(new MCItemStack(recipe.getRecipeOutput()))) {
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(getIItemStack(recipe.getRecipeOutput()))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -244,10 +235,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
for (int i = 0; i < height; i++) {
|
||||
for (int j = 0; j < contents[i].length; j++) {
|
||||
if (contents[i][j] != null) {
|
||||
Object internal = contents[i][j].getInternal();
|
||||
if (internal != null && (internal instanceof ItemStack)) {
|
||||
iContents[i * width + j] = (ItemStack) internal;
|
||||
}
|
||||
iContents[i * width + j] = getItemStack(contents[j][j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -260,7 +248,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
if (result == null) {
|
||||
return null;
|
||||
} else {
|
||||
return new MCItemStack(result);
|
||||
return getIItemStack(result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,6 +296,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + removingIndices.size() + " recipes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionAddRecipe implements IUndoableAction {
|
||||
@@ -341,6 +334,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
public String describeUndo() {
|
||||
return "Removing recipe for " + recipe.getRecipeOutput().getDisplayName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean matches(Object input, IIngredient ingredient) {
|
||||
@@ -348,11 +346,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
return false;
|
||||
} else if (ingredient != null) {
|
||||
if (input instanceof ItemStack) {
|
||||
if (!ingredient.matches(new MCItemStack((ItemStack) input))) {
|
||||
if (!ingredient.matches(getIItemStack((ItemStack) input))) {
|
||||
return false;
|
||||
}
|
||||
} else if (input instanceof String) {
|
||||
if (!ingredient.contains(new MCOreDictEntry((String) input))) {
|
||||
if (!ingredient.contains(getOreDict((String) input))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -11,6 +11,7 @@ import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
|
||||
@@ -51,7 +52,7 @@ public class RecipeConverter {
|
||||
if (type == TYPE_BASIC) {
|
||||
ItemStack[] items = new ItemStack[ingredients.length];
|
||||
for (int i = 0; i < ingredients.length; i++) {
|
||||
items[i] = (ItemStack) ingredients[i].getInternal();
|
||||
items[i] = getItemStack(ingredients[i]);
|
||||
}
|
||||
return new ShapelessRecipeBasic(items, recipe);
|
||||
} else if (type == TYPE_ORE) {
|
||||
@@ -78,7 +79,7 @@ public class RecipeConverter {
|
||||
System.out.println("Converted to basic recipe");
|
||||
ItemStack[] basicIngredients = new ItemStack[recipe.getHeight() * recipe.getWidth()];
|
||||
for (int i = 0; i < ingredients.length; i++) {
|
||||
basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = (ItemStack) ingredients[i].getInternal();
|
||||
basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = getItemStack(ingredients[i]);
|
||||
}
|
||||
|
||||
return new ShapedRecipeBasic(basicIngredients, recipe);
|
||||
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc164.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -31,7 +32,7 @@ public class ShapedRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -41,6 +42,6 @@ public class ShapedRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getRecipeOutput() {
|
||||
return (ItemStack) recipe.getOutput().getInternal();
|
||||
return getItemStack(recipe.getOutput());
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -7,6 +7,7 @@
|
||||
package minetweaker.mc164.recipes;
|
||||
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -21,7 +22,7 @@ public class ShapedRecipeBasic extends ShapedRecipes {
|
||||
private final ShapedRecipe recipe;
|
||||
|
||||
public ShapedRecipeBasic(ItemStack[] basicInputs, ShapedRecipe recipe) {
|
||||
super(recipe.getWidth(), recipe.getHeight(), basicInputs, (ItemStack) recipe.getOutput().getInternal());
|
||||
super(recipe.getWidth(), recipe.getHeight(), basicInputs, getItemStack(recipe.getOutput()));
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -37,7 +38,7 @@ public class ShapedRecipeBasic extends ShapedRecipes {
|
||||
if (result == null) {
|
||||
return null;
|
||||
} else {
|
||||
return ((ItemStack) result.getInternal()).copy();
|
||||
return getItemStack(result).copy();
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc164.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,7 +21,7 @@ public class ShapedRecipeOre extends ShapedOreRecipe {
|
||||
private final ShapedRecipe recipe;
|
||||
|
||||
public ShapedRecipeOre(Object[] contents, ShapedRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), contents);
|
||||
super(getItemStack(recipe.getOutput()), contents);
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -32,6 +33,6 @@ public class ShapedRecipeOre extends ShapedOreRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc164.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -30,7 +31,7 @@ public class ShapelessRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -40,6 +41,6 @@ public class ShapelessRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getRecipeOutput() {
|
||||
return (ItemStack) recipe.getOutput().getInternal();
|
||||
return getItemStack(recipe.getOutput());
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -8,6 +8,7 @@ package minetweaker.mc164.recipes;
|
||||
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import java.util.Arrays;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
@@ -21,7 +22,7 @@ public class ShapelessRecipeBasic extends ShapelessRecipes {
|
||||
private final ShapelessRecipe recipe;
|
||||
|
||||
public ShapelessRecipeBasic(ItemStack[] ingredients, ShapelessRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), Arrays.asList(ingredients));
|
||||
super(getItemStack(recipe.getOutput()), Arrays.asList(ingredients));
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -33,6 +34,6 @@ public class ShapelessRecipeBasic extends ShapelessRecipes {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc164.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,7 +21,7 @@ public class ShapelessRecipeOre extends ShapelessOreRecipe {
|
||||
private final ShapelessRecipe recipe;
|
||||
|
||||
public ShapelessRecipeOre(Object[] ingredients, ShapelessRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), ingredients);
|
||||
super(getItemStack(recipe.getOutput()), ingredients);
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -32,6 +33,6 @@ public class ShapelessRecipeOre extends ShapelessOreRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* 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.mc164.util;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc164.item.MCItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MineTweakerUtil {
|
||||
public static ItemStack[] getItemStacks(IItemStack... items) {
|
||||
ItemStack[] output = new ItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
Object internal = items[i].getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public static ItemStack[] getItemStacks(List<IItemStack> items) {
|
||||
ItemStack[] output = new ItemStack[items.size()];
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
Object internal = items.get(i).getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public static IItemStack[] getIItemStacks(ItemStack... items) {
|
||||
IItemStack[] result = new IItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
result[i] = new MCItemStack(items[i]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static IItemStack[] getIItemStacks(List<ItemStack> items) {
|
||||
IItemStack[] result = new IItemStack[items.size()];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new MCItemStack(items.get(i));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.OneWayAction;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
|
||||
/**
|
||||
* MineTweaker NEI support.
|
||||
@@ -32,7 +33,7 @@ public class NEI {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void hide(@NotNull IItemStack item) {
|
||||
MineTweakerAPI.tweaker.apply(new NEIHideItemAction((ItemStack) item.getInternal()));
|
||||
MineTweakerAPI.tweaker.apply(new NEIHideItemAction(getItemStack(item)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -42,7 +43,7 @@ public class NEI {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void addEntry(@NotNull IItemStack stack) {
|
||||
MineTweakerAPI.tweaker.apply(new NEIAddEntryAction((ItemStack) stack.getInternal()));
|
||||
MineTweakerAPI.tweaker.apply(new NEIAddEntryAction(getItemStack(stack)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,7 +55,7 @@ public class NEI {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void overrideName(@NotNull IItemStack item, @NotNull String name) {
|
||||
MineTweakerAPI.tweaker.apply(new NEIOverrideNameAction((ItemStack) item.getInternal(), name));
|
||||
MineTweakerAPI.tweaker.apply(new NEIOverrideNameAction(getItemStack(item), name));
|
||||
}
|
||||
|
||||
// #############################
|
||||
@@ -92,6 +93,11 @@ public class NEI {
|
||||
public String describeUndo() {
|
||||
return "Removing " + item.getDisplayName() + " as NEI entry";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class NEIHideItemAction implements IUndoableAction {
|
||||
@@ -125,6 +131,11 @@ public class NEI {
|
||||
public String describeUndo() {
|
||||
return "Displaying " + stack.getUnlocalizedName() + " in NEI";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class NEIOverrideNameAction extends OneWayAction {
|
||||
@@ -145,5 +156,10 @@ public class NEI {
|
||||
public String describe() {
|
||||
return "Overriding NEI item name of " + item.getUnlocalizedName() + " to " + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
package minetweaker.api.minecraft;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.mc1710.data.NBTConverter;
|
||||
import minetweaker.mc1710.item.MCItemStack;
|
||||
import minetweaker.mc1710.oredict.MCOreDictEntry;
|
||||
import minetweaker.mc1710.player.MCPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
/**
|
||||
* MineTweaker - MineCraft API bridge.
|
||||
*
|
||||
* @author Stan Hebben
|
||||
*/
|
||||
public class MineTweakerMC {
|
||||
private MineTweakerMC() {}
|
||||
|
||||
/**
|
||||
* Returns the Minecraft item for this MineTweaker item.
|
||||
*
|
||||
* @param item minetweaker item stack
|
||||
* @return minecraft item stack
|
||||
*/
|
||||
public static ItemStack getItemStack(IItemStack item) {
|
||||
Object internal = item.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
MineTweakerAPI.logger.logError("Not a valid item stack: " + item);
|
||||
}
|
||||
return (ItemStack) internal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Minecraft ingredient for this ingredient. This method is only
|
||||
* useful for ingredients that represent a single item stack.
|
||||
*
|
||||
* @param ingredient item ingredient
|
||||
* @return minecraft item stack
|
||||
*/
|
||||
public static ItemStack getItemStack(IIngredient ingredient) {
|
||||
List<IItemStack> items = ingredient.getItems();
|
||||
if (items.size() != 1) {
|
||||
MineTweakerAPI.logger.logError("Not an ingredient with a single item: " + ingredient);
|
||||
}
|
||||
return getItemStack(items.get(0));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the MineTweaker item stack for this item.
|
||||
*
|
||||
* @param item minecraft item stack
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getIItemStack(ItemStack item) {
|
||||
return new MCItemStack(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with wildcard size.
|
||||
*
|
||||
* @param item
|
||||
* @param meta
|
||||
* @return minetweaker stack
|
||||
*/
|
||||
public static IItemStack getIItemStackWildcardSize(Item item, int meta) {
|
||||
return new MCItemStack(new ItemStack(item, 1, meta), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with wildcard damage.
|
||||
*
|
||||
* @param item stack item
|
||||
* @param amount stack size
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getIItemStackWildcard(Item item, int amount) {
|
||||
return new MCItemStack(new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE));
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with given item, damage and amount.
|
||||
*
|
||||
* @param item stack item
|
||||
* @param damage stack damage
|
||||
* @param amount stack amount
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getItemStack(Item item, int amount, int damage) {
|
||||
return new MCItemStack(new ItemStack(item, amount, damage));
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an array of minetweaker item stacks into an array of minecraft
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minetweker item stacks
|
||||
* @return minecraft item stacks
|
||||
*/
|
||||
public static ItemStack[] getItemStacks(IItemStack... items) {
|
||||
ItemStack[] output = new ItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
Object internal = items[i].getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of minetweaker item stacks into an array of minecraft
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minetweaker items
|
||||
* @return minecraft items
|
||||
*/
|
||||
public static ItemStack[] getItemStacks(List<IItemStack> items) {
|
||||
ItemStack[] output = new ItemStack[items.size()];
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
Object internal = items.get(i).getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
} else {
|
||||
MineTweakerAPI.logger.logError("Invalid item stack: " + items.get(i));
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an array of minecraft item stacks into an array of minetweaker
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minecraft item stacks
|
||||
* @return minetweaker item stacks
|
||||
*/
|
||||
public static IItemStack[] getIItemStacks(ItemStack... items) {
|
||||
IItemStack[] result = new IItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
result[i] = new MCItemStack(items[i]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of minecraft item stacks into an array of minetweaker
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minecraft item stacks
|
||||
* @return minetweaker item stacks
|
||||
*/
|
||||
public static IItemStack[] getIItemStacks(List<ItemStack> items) {
|
||||
IItemStack[] result = new IItemStack[items.size()];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new MCItemStack(items.get(i));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the ore dictionary entry with the given name. If the entry didn't
|
||||
* exist yet, it will create it and return an empty entry.
|
||||
*
|
||||
* @param name ore entry name
|
||||
* @return ore dictionary entry
|
||||
*/
|
||||
public static IOreDictEntry getOreDict(String name) {
|
||||
return new MCOreDictEntry(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft player into a MineTweaker player.
|
||||
*
|
||||
* @param player minecraft player
|
||||
* @return minetweaker player
|
||||
*/
|
||||
public static IPlayer getIPlayer(EntityPlayer player) {
|
||||
return new MCPlayer(player);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a MineTweaker player into a Minecraft player.
|
||||
*
|
||||
* @param player minetweaker player
|
||||
* @return minecraft player
|
||||
*/
|
||||
public static EntityPlayer getPlayer(IPlayer player) {
|
||||
if (!(player instanceof MCPlayer)) {
|
||||
MineTweakerAPI.logger.logError("Invalid player: " + player);
|
||||
}
|
||||
|
||||
return ((MCPlayer) player).getInternal();
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft NBT to an IData instance. The IData instance is
|
||||
* immutable (not modifyiable).
|
||||
*
|
||||
* @param nbt nbt data
|
||||
* @return IData value
|
||||
*/
|
||||
public static IData getIData(NBTBase nbt) {
|
||||
return NBTConverter.from(nbt, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft NBT to a modifyable IData instance.
|
||||
*
|
||||
* @param nbt nbt data
|
||||
* @return mutable IData value
|
||||
*/
|
||||
public static IData getIDataModifyable(NBTBase nbt) {
|
||||
return NBTConverter.from(nbt, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an IData instance to an NBT value.
|
||||
*
|
||||
* @param data IData value
|
||||
* @return nbt data
|
||||
*/
|
||||
public static NBTBase getNBT(IData data) {
|
||||
return NBTConverter.from(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an IData instance to an NBT Tag compound.
|
||||
*
|
||||
* @param data IData value
|
||||
* @return nbt compound data
|
||||
*/
|
||||
public static NBTTagCompound getNBTCompound(IData data) {
|
||||
return (NBTTagCompound) NBTConverter.from(data);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* 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.mc1710;
|
||||
|
||||
import minetweaker.IPlatformFunctions;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.mc1710.chat.MCChatMessage;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MCPlatformFunctions implements IPlatformFunctions {
|
||||
public static final MCPlatformFunctions INSTANCE = new MCPlatformFunctions();
|
||||
|
||||
private MCPlatformFunctions() {}
|
||||
|
||||
@Override
|
||||
public IChatMessage getMessage(String message) {
|
||||
return new MCChatMessage(message);
|
||||
}
|
||||
}
|
||||
@@ -68,6 +68,8 @@ public class MineTweakerMod {
|
||||
MineTweakerAPI.furnace = new MCFurnaceManager();
|
||||
MineTweakerAPI.loadedMods = new MCLoadedMods();
|
||||
|
||||
MineTweakerAPI.platform = MCPlatformFunctions.INSTANCE;
|
||||
|
||||
File globalDir = new File("scripts");
|
||||
if (!globalDir.exists()) {
|
||||
globalDir.mkdirs();
|
||||
|
||||
+5
@@ -58,4 +58,9 @@ public class SetTranslationAction implements IUndoableAction {
|
||||
private static void set(String key, String value) {
|
||||
StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* 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.mc1710.chat;
|
||||
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MCChatMessage implements IChatMessage {
|
||||
private final IChatComponent data;
|
||||
|
||||
public MCChatMessage(String message) {
|
||||
data = new ChatComponentText(message);
|
||||
}
|
||||
|
||||
public MCChatMessage(IChatComponent data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IChatMessage add(IChatMessage other) {
|
||||
return new MCChatMessage(data.appendSibling((IChatComponent) other.getInternal()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getInternal() {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
+20
-4
@@ -14,9 +14,10 @@ import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks;
|
||||
import minetweaker.api.recipes.IFurnaceManager;
|
||||
import minetweaker.mc1710.item.MCItemStack;
|
||||
import minetweaker.mc1710.util.MineTweakerUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
|
||||
@@ -59,8 +60,8 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
MineTweakerAPI.logger.logError("Cannot turn " + input.toString() + " into a furnace recipe");
|
||||
}
|
||||
|
||||
ItemStack[] items2 = MineTweakerUtil.getItemStacks(items);
|
||||
ItemStack output2 = (ItemStack) output.getInternal();
|
||||
ItemStack[] items2 = getItemStacks(items);
|
||||
ItemStack output2 = getItemStack(output);
|
||||
MineTweakerAPI.tweaker.apply(new AddRecipeAction(input, items2, output2, xp));
|
||||
}
|
||||
|
||||
@@ -71,7 +72,7 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
|
||||
@Override
|
||||
public int getFuel(IItemStack item) {
|
||||
return GameRegistry.getFuelValue((ItemStack) item.getInternal());
|
||||
return GameRegistry.getFuelValue(getItemStack(item));
|
||||
}
|
||||
|
||||
// ######################
|
||||
@@ -115,6 +116,11 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + items.size() + " furnace recipes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class AddRecipeAction implements IUndoableAction {
|
||||
@@ -158,6 +164,11 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Removing furnace recipe for " + ingredient;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class SetFuelAction implements IUndoableAction {
|
||||
@@ -191,5 +202,10 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Removing fuel for " + pattern.getPattern();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientItem;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.mc1710.actions.SetTranslationAction;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -200,11 +201,7 @@ public class MCItemStack implements IItemStack {
|
||||
|
||||
@Override
|
||||
public boolean matches(IItemStack item) {
|
||||
ItemStack internal = (ItemStack) item.getInternal();
|
||||
if (internal == null) {
|
||||
throw new RuntimeException("Invalid item: " + item);
|
||||
}
|
||||
|
||||
ItemStack internal = getItemStack(item);
|
||||
return internal.getItem() == stack.getItem()
|
||||
&& (wildcardSize || internal.stackSize == stack.stackSize)
|
||||
&& (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
||||
|
||||
+25
@@ -126,6 +126,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " luminosity to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetDensity implements IUndoableAction {
|
||||
@@ -161,6 +166,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " density to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetTemperature implements IUndoableAction {
|
||||
@@ -196,6 +206,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " temperature to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetViscosity implements IUndoableAction {
|
||||
@@ -231,6 +246,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " viscosity to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetGaseous implements IUndoableAction {
|
||||
@@ -266,5 +286,10 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " gaseous to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
+28
-4
@@ -17,6 +17,7 @@ import minetweaker.api.item.IItemCondition;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.oredict.IngredientOreDict;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
@@ -44,13 +45,16 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
// ####################################
|
||||
// ### IOreDictEntry implementation ###
|
||||
// ####################################
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return OreDictionary.getOres(id).isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(IItemStack item) {
|
||||
ItemStack stack = (ItemStack) item.getInternal();
|
||||
if (stack == null) {
|
||||
MineTweakerAPI.logger.logError("not a valid item");
|
||||
} else {
|
||||
ItemStack stack = getItemStack(item);
|
||||
if (stack != null) {
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddItem(id, stack));
|
||||
}
|
||||
}
|
||||
@@ -200,6 +204,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionMirror implements IUndoableAction {
|
||||
@@ -243,6 +252,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Undoing mirror of " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionRemoveItem implements IUndoableAction {
|
||||
@@ -278,6 +292,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionAddAll implements IUndoableAction {
|
||||
@@ -319,5 +338,10 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Removing contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " from " + OreDictionary.getOreName(idTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,10 +6,13 @@
|
||||
|
||||
package minetweaker.mc1710.player;
|
||||
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.mc1710.data.NBTConverter;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -21,6 +24,10 @@ public class MCPlayer implements IPlayer {
|
||||
public MCPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public EntityPlayer getInternal() {
|
||||
return player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
@@ -36,4 +43,14 @@ public class MCPlayer implements IPlayer {
|
||||
public void update(IData data) {
|
||||
NBTConverter.updateMap(player.getEntityData(), data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendChat(IChatMessage message) {
|
||||
Object internal = message;
|
||||
if (!(internal instanceof IChatComponent)) {
|
||||
MineTweakerAPI.logger.logError("not a valid chat message");
|
||||
return;
|
||||
}
|
||||
player.addChatMessage((IChatComponent) internal);
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -10,6 +10,7 @@ import java.util.List;
|
||||
import minetweaker.mc1710.item.MCItemStack;
|
||||
import minetweaker.mc1710.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.api.recipes.ICraftingInventory;
|
||||
import minetweaker.mc1710.player.MCPlayer;
|
||||
@@ -135,7 +136,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
stackCount--;
|
||||
inventory.setInventorySlotContents(ix, null);
|
||||
} else {
|
||||
inventory.setInventorySlotContents(ix, (ItemStack) stack.getInternal());
|
||||
inventory.setInventorySlotContents(ix, getItemStack(stack));
|
||||
|
||||
if (stacks[ix] == null) {
|
||||
stackCount++;
|
||||
@@ -154,7 +155,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
stackCount--;
|
||||
inventory.setInventorySlotContents(i, null);
|
||||
} else {
|
||||
inventory.setInventorySlotContents(i, (ItemStack) stack.getInternal());
|
||||
inventory.setInventorySlotContents(i, getItemStack(stack));
|
||||
|
||||
if (stacks[i] == null) {
|
||||
stackCount++;
|
||||
|
||||
+12
-14
@@ -11,6 +11,7 @@ import minetweaker.mc1710.oredict.MCOreDictEntry;
|
||||
import minetweaker.mc1710.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.IRecipeFunction;
|
||||
import minetweaker.api.recipes.IRecipeManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -63,11 +64,6 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
|
||||
@Override
|
||||
public void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, boolean mirrored) {
|
||||
if (output.getInternal() == null) {
|
||||
MineTweakerAPI.logger.logError("invalid output item");
|
||||
return;
|
||||
}
|
||||
|
||||
ShapedRecipe recipe = new ShapedRecipe(output, ingredients, function, mirrored);
|
||||
IRecipe irecipe = RecipeConverter.convert(recipe);
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe));
|
||||
@@ -75,11 +71,6 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
|
||||
@Override
|
||||
public void addShapeless(IItemStack output, IIngredient[] ingredients, IRecipeFunction function) {
|
||||
if (output.getInternal() == null) {
|
||||
MineTweakerAPI.logger.logError("invalid output item");
|
||||
return;
|
||||
}
|
||||
|
||||
ShapelessRecipe recipe = new ShapelessRecipe(output, ingredients, function);
|
||||
IRecipe irecipe = RecipeConverter.convert(recipe);
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe));
|
||||
@@ -244,10 +235,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
for (int i = 0; i < height; i++) {
|
||||
for (int j = 0; j < contents[i].length; j++) {
|
||||
if (contents[i][j] != null) {
|
||||
Object internal = contents[i][j].getInternal();
|
||||
if (internal != null && (internal instanceof ItemStack)) {
|
||||
iContents[i * width + j] = (ItemStack) internal;
|
||||
}
|
||||
iContents[i * width + j] = getItemStack(contents[i][j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -308,6 +296,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + removingIndices.size() + " recipes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionAddRecipe implements IUndoableAction {
|
||||
@@ -341,6 +334,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
public String describeUndo() {
|
||||
return "Removing recipe for " + recipe.getRecipeOutput().getDisplayName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean matches(Object input, IIngredient ingredient) {
|
||||
|
||||
+3
-2
@@ -11,6 +11,7 @@ import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
|
||||
@@ -51,7 +52,7 @@ public class RecipeConverter {
|
||||
if (type == TYPE_BASIC) {
|
||||
ItemStack[] items = new ItemStack[ingredients.length];
|
||||
for (int i = 0; i < ingredients.length; i++) {
|
||||
items[i] = (ItemStack) ingredients[i].getInternal();
|
||||
items[i] = getItemStack(ingredients[i]);
|
||||
}
|
||||
return new ShapelessRecipeBasic(items, recipe);
|
||||
} else if (type == TYPE_ORE) {
|
||||
@@ -78,7 +79,7 @@ public class RecipeConverter {
|
||||
System.out.println("Converted to basic recipe");
|
||||
ItemStack[] basicIngredients = new ItemStack[recipe.getHeight() * recipe.getWidth()];
|
||||
for (int i = 0; i < ingredients.length; i++) {
|
||||
basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = (ItemStack) ingredients[i].getInternal();
|
||||
basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = getItemStack(ingredients[i]);
|
||||
}
|
||||
|
||||
return new ShapedRecipeBasic(basicIngredients, recipe);
|
||||
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc1710.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -31,7 +32,7 @@ public class ShapedRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -41,6 +42,6 @@ public class ShapedRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getRecipeOutput() {
|
||||
return (ItemStack) recipe.getOutput().getInternal();
|
||||
return getItemStack(recipe.getOutput());
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -7,6 +7,7 @@
|
||||
package minetweaker.mc1710.recipes;
|
||||
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -21,7 +22,7 @@ public class ShapedRecipeBasic extends ShapedRecipes {
|
||||
private final ShapedRecipe recipe;
|
||||
|
||||
public ShapedRecipeBasic(ItemStack[] basicInputs, ShapedRecipe recipe) {
|
||||
super(recipe.getWidth(), recipe.getHeight(), basicInputs, (ItemStack) recipe.getOutput().getInternal());
|
||||
super(recipe.getWidth(), recipe.getHeight(), basicInputs, getItemStack(recipe.getOutput()));
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -37,7 +38,7 @@ public class ShapedRecipeBasic extends ShapedRecipes {
|
||||
if (result == null) {
|
||||
return null;
|
||||
} else {
|
||||
return ((ItemStack) result.getInternal()).copy();
|
||||
return getItemStack(result).copy();
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc1710.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,7 +21,7 @@ public class ShapedRecipeOre extends ShapedOreRecipe {
|
||||
private final ShapedRecipe recipe;
|
||||
|
||||
public ShapedRecipeOre(Object[] contents, ShapedRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), contents);
|
||||
super(getItemStack(recipe.getOutput()), contents);
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -32,6 +33,6 @@ public class ShapedRecipeOre extends ShapedOreRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc1710.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -30,7 +31,7 @@ public class ShapelessRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -40,6 +41,6 @@ public class ShapelessRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getRecipeOutput() {
|
||||
return (ItemStack) recipe.getOutput().getInternal();
|
||||
return getItemStack(recipe.getOutput());
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -8,6 +8,7 @@ package minetweaker.mc1710.recipes;
|
||||
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import java.util.Arrays;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
@@ -21,7 +22,7 @@ public class ShapelessRecipeBasic extends ShapelessRecipes {
|
||||
private final ShapelessRecipe recipe;
|
||||
|
||||
public ShapelessRecipeBasic(ItemStack[] ingredients, ShapelessRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), Arrays.asList(ingredients));
|
||||
super(getItemStack(recipe.getOutput()), Arrays.asList(ingredients));
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -33,6 +34,6 @@ public class ShapelessRecipeBasic extends ShapelessRecipes {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc1710.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,7 +21,7 @@ public class ShapelessRecipeOre extends ShapelessOreRecipe {
|
||||
private final ShapelessRecipe recipe;
|
||||
|
||||
public ShapelessRecipeOre(Object[] ingredients, ShapelessRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), ingredients);
|
||||
super(getItemStack(recipe.getOutput()), ingredients);
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -32,6 +33,6 @@ public class ShapelessRecipeOre extends ShapelessOreRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* 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.mc1710.util;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc1710.item.MCItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MineTweakerUtil {
|
||||
public static ItemStack[] getItemStacks(IItemStack... items) {
|
||||
ItemStack[] output = new ItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
Object internal = items[i].getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public static ItemStack[] getItemStacks(List<IItemStack> items) {
|
||||
ItemStack[] output = new ItemStack[items.size()];
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
Object internal = items.get(i).getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public static IItemStack[] getIItemStacks(ItemStack... items) {
|
||||
IItemStack[] result = new IItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
result[i] = new MCItemStack(items[i]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static IItemStack[] getIItemStacks(List<ItemStack> items) {
|
||||
IItemStack[] result = new IItemStack[items.size()];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new MCItemStack(items.get(i));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
package minetweaker.api.minecraft;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.mc172.data.NBTConverter;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.mc172.oredict.MCOreDictEntry;
|
||||
import minetweaker.mc172.player.MCPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
/**
|
||||
* MineTweaker - MineCraft API bridge.
|
||||
*
|
||||
* @author Stan Hebben
|
||||
*/
|
||||
public class MineTweakerMC {
|
||||
private MineTweakerMC() {}
|
||||
|
||||
/**
|
||||
* Returns the Minecraft item for this MineTweaker item.
|
||||
*
|
||||
* @param item minetweaker item stack
|
||||
* @return minecraft item stack
|
||||
*/
|
||||
public static ItemStack getItemStack(IItemStack item) {
|
||||
Object internal = item.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
MineTweakerAPI.logger.logError("Not a valid item stack: " + item);
|
||||
}
|
||||
return (ItemStack) internal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Minecraft ingredient for this ingredient. This method is only
|
||||
* useful for ingredients that represent a single item stack.
|
||||
*
|
||||
* @param ingredient item ingredient
|
||||
* @return minecraft item stack
|
||||
*/
|
||||
public static ItemStack getItemStack(IIngredient ingredient) {
|
||||
List<IItemStack> items = ingredient.getItems();
|
||||
if (items.size() != 1) {
|
||||
MineTweakerAPI.logger.logError("Not an ingredient with a single item: " + ingredient);
|
||||
}
|
||||
return getItemStack(items.get(0));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the MineTweaker item stack for this item.
|
||||
*
|
||||
* @param item minecraft item stack
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getIItemStack(ItemStack item) {
|
||||
return new MCItemStack(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with wildcard size.
|
||||
*
|
||||
* @param item
|
||||
* @param meta
|
||||
* @return minetweaker stack
|
||||
*/
|
||||
public static IItemStack getIItemStackWildcardSize(Item item, int meta) {
|
||||
return new MCItemStack(new ItemStack(item, 1, meta), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with wildcard damage.
|
||||
*
|
||||
* @param item stack item
|
||||
* @param amount stack size
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getIItemStackWildcard(Item item, int amount) {
|
||||
return new MCItemStack(new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE));
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an item stack with given item, damage and amount.
|
||||
*
|
||||
* @param item stack item
|
||||
* @param damage stack damage
|
||||
* @param amount stack amount
|
||||
* @return minetweaker item stack
|
||||
*/
|
||||
public static IItemStack getItemStack(Item item, int amount, int damage) {
|
||||
return new MCItemStack(new ItemStack(item, amount, damage));
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an array of minetweaker item stacks into an array of minecraft
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minetweker item stacks
|
||||
* @return minecraft item stacks
|
||||
*/
|
||||
public static ItemStack[] getItemStacks(IItemStack... items) {
|
||||
ItemStack[] output = new ItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
Object internal = items[i].getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of minetweaker item stacks into an array of minecraft
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minetweaker items
|
||||
* @return minecraft items
|
||||
*/
|
||||
public static ItemStack[] getItemStacks(List<IItemStack> items) {
|
||||
ItemStack[] output = new ItemStack[items.size()];
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
Object internal = items.get(i).getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
} else {
|
||||
MineTweakerAPI.logger.logError("Invalid item stack: " + items.get(i));
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an array of minecraft item stacks into an array of minetweaker
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minecraft item stacks
|
||||
* @return minetweaker item stacks
|
||||
*/
|
||||
public static IItemStack[] getIItemStacks(ItemStack... items) {
|
||||
IItemStack[] result = new IItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
result[i] = new MCItemStack(items[i]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a list of minecraft item stacks into an array of minetweaker
|
||||
* item stacks.
|
||||
*
|
||||
* @param items minecraft item stacks
|
||||
* @return minetweaker item stacks
|
||||
*/
|
||||
public static IItemStack[] getIItemStacks(List<ItemStack> items) {
|
||||
IItemStack[] result = new IItemStack[items.size()];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new MCItemStack(items.get(i));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the ore dictionary entry with the given name. If the entry didn't
|
||||
* exist yet, it will create it and return an empty entry.
|
||||
*
|
||||
* @param name ore entry name
|
||||
* @return ore dictionary entry
|
||||
*/
|
||||
public static IOreDictEntry getOreDict(String name) {
|
||||
return new MCOreDictEntry(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft player into a MineTweaker player.
|
||||
*
|
||||
* @param player minecraft player
|
||||
* @return minetweaker player
|
||||
*/
|
||||
public static IPlayer getIPlayer(EntityPlayer player) {
|
||||
return new MCPlayer(player);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a MineTweaker player into a Minecraft player.
|
||||
*
|
||||
* @param player minetweaker player
|
||||
* @return minecraft player
|
||||
*/
|
||||
public static EntityPlayer getPlayer(IPlayer player) {
|
||||
if (!(player instanceof MCPlayer)) {
|
||||
MineTweakerAPI.logger.logError("Invalid player: " + player);
|
||||
}
|
||||
|
||||
return ((MCPlayer) player).getInternal();
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft NBT to an IData instance. The IData instance is
|
||||
* immutable (not modifyiable).
|
||||
*
|
||||
* @param nbt nbt data
|
||||
* @return IData value
|
||||
*/
|
||||
public static IData getIData(NBTBase nbt) {
|
||||
return NBTConverter.from(nbt, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a Minecraft NBT to a modifyable IData instance.
|
||||
*
|
||||
* @param nbt nbt data
|
||||
* @return mutable IData value
|
||||
*/
|
||||
public static IData getIDataModifyable(NBTBase nbt) {
|
||||
return NBTConverter.from(nbt, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an IData instance to an NBT value.
|
||||
*
|
||||
* @param data IData value
|
||||
* @return nbt data
|
||||
*/
|
||||
public static NBTBase getNBT(IData data) {
|
||||
return NBTConverter.from(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an IData instance to an NBT Tag compound.
|
||||
*
|
||||
* @param data IData value
|
||||
* @return nbt compound data
|
||||
*/
|
||||
public static NBTTagCompound getNBTCompound(IData data) {
|
||||
return (NBTTagCompound) NBTConverter.from(data);
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,12 @@ public class FMLEventHandler {
|
||||
MineTweakerMod.NETWORK.sendTo(
|
||||
new MineTweakerLoadScriptsPacket(MineTweakerAPI.tweaker.getScriptData()),
|
||||
player);
|
||||
MineTweakerMod.INSTANCE.onPlayerLoggedIn(player);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent ev) {
|
||||
MineTweakerMod.INSTANCE.onPlayerLoggedOut(ev.player);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* 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.mc172;
|
||||
|
||||
import minetweaker.IPlatformFunctions;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.mc172.chat.MCChatMessage;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MCPlatformFunctions implements IPlatformFunctions {
|
||||
public static final MCPlatformFunctions INSTANCE = new MCPlatformFunctions();
|
||||
|
||||
private MCPlatformFunctions() {}
|
||||
|
||||
@Override
|
||||
public IChatMessage getMessage(String message) {
|
||||
return new MCChatMessage(message);
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,10 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.minecraft.MineTweakerMC;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
|
||||
import net.minecraft.command.ICommand;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
@@ -140,7 +143,7 @@ public class MineTweakerCommand implements ICommand {
|
||||
description.append('*').append(stack.stackSize);
|
||||
}
|
||||
|
||||
sendChatMessage(icommandsender, new MCItemStack(stack).toString());
|
||||
sendChatMessage(icommandsender, getIItemStack(stack).toString());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -163,7 +166,7 @@ public class MineTweakerCommand implements ICommand {
|
||||
description.append('*').append(stack.stackSize);
|
||||
}
|
||||
|
||||
sendChatMessage(icommandsender, new MCItemStack(stack).toString());
|
||||
sendChatMessage(icommandsender, getIItemStack(stack).toString());
|
||||
}
|
||||
} else {
|
||||
sendChatMessage(icommandsender, "Hand command can only be executed by players");
|
||||
@@ -171,22 +174,24 @@ public class MineTweakerCommand implements ICommand {
|
||||
} else if (arguments[0].equals("oredict")) {
|
||||
if (arguments.length > 2) {
|
||||
String entryName = arguments[2];
|
||||
List<ItemStack> ores = OreDictionary.getOres(entryName);
|
||||
if (ores.isEmpty()) {
|
||||
IOreDictEntry entry = MineTweakerMC.getOreDict(entryName);
|
||||
if (entry.isEmpty()) {
|
||||
sendChatMessage(icommandsender, "Entry doesn't exist");
|
||||
return;
|
||||
} else {
|
||||
MineTweakerAPI.logger.logCommand("Ore entries for " + entryName + ":");
|
||||
for (ItemStack ore : ores) {
|
||||
MineTweakerAPI.logger.logCommand(" " + new MCItemStack(ore).toString());
|
||||
for (IItemStack ore : entry.getItems()) {
|
||||
MineTweakerAPI.logger.logCommand(" " + ore);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (String entryName : OreDictionary.getOreNames()) {
|
||||
MineTweakerAPI.logger.logCommand("Ore entries for " + entryName + ":");
|
||||
List<ItemStack> ores = OreDictionary.getOres(entryName);
|
||||
for (ItemStack ore : ores) {
|
||||
MineTweakerAPI.logger.logCommand(" " + new MCItemStack(ore).toString());
|
||||
IOreDictEntry entry = MineTweakerMC.getOreDict(entryName);
|
||||
if (!entry.isEmpty()) {
|
||||
MineTweakerAPI.logger.logCommand("Ore entries for " + entryName + ":");
|
||||
for (IItemStack ore : entry.getItems()) {
|
||||
MineTweakerAPI.logger.logCommand(" " + ore);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,11 @@ import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.Writer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.runtime.ILogger;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -20,11 +24,16 @@ import minetweaker.runtime.ILogger;
|
||||
*/
|
||||
public class MineTweakerLogger implements ILogger {
|
||||
private Writer writer;
|
||||
private List<String> unreportedErrors;
|
||||
private List<EntityPlayer> players;
|
||||
|
||||
public MineTweakerLogger() {
|
||||
File logFile = new File("minetweaker.log");
|
||||
if (logFile.exists()) logFile.delete();
|
||||
|
||||
unreportedErrors = new ArrayList<String>();
|
||||
players = new ArrayList<EntityPlayer>();
|
||||
|
||||
try {
|
||||
writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(logFile)));
|
||||
} catch (IOException ex) {
|
||||
@@ -32,6 +41,26 @@ public class MineTweakerLogger implements ILogger {
|
||||
}
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
unreportedErrors.clear();
|
||||
}
|
||||
|
||||
public void addPlayer(EntityPlayer player) {
|
||||
players.add(player);
|
||||
|
||||
if (!unreportedErrors.isEmpty()) {
|
||||
for (String error : unreportedErrors) {
|
||||
player.addChatMessage(new ChatComponentText(error));
|
||||
}
|
||||
|
||||
unreportedErrors.clear();
|
||||
}
|
||||
}
|
||||
|
||||
public void removePlayer(EntityPlayer player) {
|
||||
players.remove(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void logCommand(String message) {
|
||||
try {
|
||||
@@ -62,22 +91,16 @@ public class MineTweakerLogger implements ILogger {
|
||||
|
||||
@Override
|
||||
public void logWarning(String message) {
|
||||
try {
|
||||
writer.append("WARNING: ");
|
||||
writer.append(message);
|
||||
writer.append('\n');
|
||||
writer.flush();
|
||||
} catch (IOException ex) {
|
||||
|
||||
}
|
||||
|
||||
System.out.println("WARNING: " + message);
|
||||
report("WARNING: " + message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void logError(String message) {
|
||||
report("ERROR: " + message);
|
||||
}
|
||||
|
||||
private void report(String message) {
|
||||
try {
|
||||
writer.append("ERROR: ");
|
||||
writer.append(message);
|
||||
writer.append('\n');
|
||||
writer.flush();
|
||||
@@ -85,6 +108,15 @@ public class MineTweakerLogger implements ILogger {
|
||||
|
||||
}
|
||||
|
||||
System.out.println("ERROR: " + message);
|
||||
System.out.println(message);
|
||||
|
||||
if (players.isEmpty()) {
|
||||
unreportedErrors.add(message);
|
||||
} else {
|
||||
ChatComponentText text = new ChatComponentText(message);
|
||||
for (EntityPlayer player : players) {
|
||||
player.addChatMessage(text);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -30,6 +30,8 @@ import minetweaker.mc172.util.MineTweakerHacks;
|
||||
import minetweaker.runtime.IScriptProvider;
|
||||
import minetweaker.runtime.providers.ScriptProviderCascade;
|
||||
import minetweaker.runtime.providers.ScriptProviderDirectory;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
/**
|
||||
@@ -57,6 +59,7 @@ public class MineTweakerMod {
|
||||
@Mod.Instance(MODID)
|
||||
public static MineTweakerMod INSTANCE;
|
||||
|
||||
public final MineTweakerLogger logger;
|
||||
private final IScriptProvider scriptsGlobal;
|
||||
|
||||
private boolean iAmServer = false;
|
||||
@@ -64,10 +67,12 @@ public class MineTweakerMod {
|
||||
public MineTweakerMod() {
|
||||
MineTweakerAPI.oreDict = new MCOreDict();
|
||||
MineTweakerAPI.recipes = new MCRecipeManager();
|
||||
MineTweakerAPI.logger = new MineTweakerLogger();
|
||||
MineTweakerAPI.logger = logger = new MineTweakerLogger();
|
||||
MineTweakerAPI.furnace = new MCFurnaceManager();
|
||||
MineTweakerAPI.loadedMods = new MCLoadedMods();
|
||||
|
||||
MineTweakerAPI.platform = MCPlatformFunctions.INSTANCE;
|
||||
|
||||
File globalDir = new File("scripts");
|
||||
if (!globalDir.exists()) {
|
||||
globalDir.mkdirs();
|
||||
@@ -85,6 +90,7 @@ public class MineTweakerMod {
|
||||
* Reloads all scripts.
|
||||
*/
|
||||
public void reload() {
|
||||
logger.clear();
|
||||
MineTweakerAPI.tweaker.rollback();
|
||||
MineTweakerAPI.tweaker.load();
|
||||
|
||||
@@ -94,6 +100,18 @@ public class MineTweakerMod {
|
||||
}
|
||||
}
|
||||
|
||||
public void onPlayerLoggedIn(EntityPlayer player) {
|
||||
if (iAmServer || MinecraftServer.getServer().getConfigurationManager().getOps().contains(player.getCommandSenderName())) {
|
||||
logger.addPlayer(player);
|
||||
}
|
||||
}
|
||||
|
||||
public void onPlayerLoggedOut(EntityPlayer player) {
|
||||
if (iAmServer || MinecraftServer.getServer().getConfigurationManager().getOps().contains(player.getCommandSenderName())) {
|
||||
logger.removePlayer(player);
|
||||
}
|
||||
}
|
||||
|
||||
// ##########################
|
||||
// ### FML Event Handlers ###
|
||||
// ##########################
|
||||
|
||||
+5
-1
@@ -10,7 +10,6 @@ import java.io.ByteArrayInputStream;
|
||||
import java.nio.charset.Charset;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.mc172.util.MineTweakerHacks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.StringTranslate;
|
||||
|
||||
/**
|
||||
@@ -59,4 +58,9 @@ public class SetTranslationAction implements IUndoableAction {
|
||||
private static void set(String key, String value) {
|
||||
StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+2
-3
@@ -10,11 +10,10 @@ import java.util.List;
|
||||
import minetweaker.IBracketHandler;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.BracketHandler;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IngredientAny;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import stanhebben.zenscript.ZenTokener;
|
||||
import stanhebben.zenscript.expression.ExpressionInt;
|
||||
@@ -36,7 +35,7 @@ public class ItemBracketHandler implements IBracketHandler {
|
||||
public static IItemStack getItem(String name, int meta) {
|
||||
Item item = (Item) Item.itemRegistry.getObject(name);
|
||||
if (item != null) {
|
||||
return new MCItemStack(new ItemStack(item, 1, meta), true);
|
||||
return getIItemStackWildcardSize(item, meta);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
||||
+4
-5
@@ -8,10 +8,10 @@ package minetweaker.mc172.brackets;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.IBracketHandler;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.BracketHandler;
|
||||
import minetweaker.mc172.oredict.MCOreDictEntry;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getOreDict;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.runtime.GlobalRegistry;
|
||||
import stanhebben.zenscript.expression.ExpressionJavaCallStatic;
|
||||
import stanhebben.zenscript.expression.ExpressionString;
|
||||
import stanhebben.zenscript.expression.partial.IPartialExpression;
|
||||
@@ -27,7 +27,7 @@ import stanhebben.zenscript.util.ZenPosition;
|
||||
@BracketHandler
|
||||
public class OreBracketHandler implements IBracketHandler {
|
||||
public static IOreDictEntry getOre(String name) {
|
||||
return new MCOreDictEntry(name);
|
||||
return getOreDict(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -60,8 +60,7 @@ public class OreBracketHandler implements IBracketHandler {
|
||||
|
||||
@Override
|
||||
public IPartialExpression instance(ZenPosition position) {
|
||||
JavaMethod method = JavaMethod.get(
|
||||
GlobalRegistry.getTypeRegistry(),
|
||||
JavaMethod method = MineTweakerAPI.getJavaMethod(
|
||||
OreBracketHandler.class,
|
||||
"getOre",
|
||||
String.class);
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* 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.mc172.chat;
|
||||
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MCChatMessage implements IChatMessage {
|
||||
private final IChatComponent data;
|
||||
|
||||
public MCChatMessage(String message) {
|
||||
data = new ChatComponentText(message);
|
||||
}
|
||||
|
||||
public MCChatMessage(IChatComponent data) {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IChatMessage add(IChatMessage other) {
|
||||
return new MCChatMessage(data.appendSibling((IChatComponent) other.getInternal()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getInternal() {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@ import cpw.mods.fml.common.IFuelHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
|
||||
public class FuelTweaker {
|
||||
public static final FuelTweaker INSTANCE = new FuelTweaker();
|
||||
@@ -71,7 +71,7 @@ public class FuelTweaker {
|
||||
private class OverridingFuelHandler implements IFuelHandler {
|
||||
@Override
|
||||
public int getBurnTime(ItemStack fuel) {
|
||||
IItemStack stack = new MCItemStack(fuel);
|
||||
IItemStack stack = getIItemStack(fuel);
|
||||
String name = fuel.getUnlocalizedName();
|
||||
if (quickList.containsKey(name)) {
|
||||
for (SetFuelPattern override : quickList.get(name)) {
|
||||
|
||||
+23
-7
@@ -14,9 +14,10 @@ import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
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.api.recipes.IFurnaceManager;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
|
||||
@@ -38,8 +39,8 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
List<ItemStack> toRemove = new ArrayList<ItemStack>();
|
||||
List<ItemStack> toRemoveValues = new ArrayList<ItemStack>();
|
||||
for (Map.Entry<ItemStack, ItemStack> entry : smeltingList.entrySet()) {
|
||||
if (output.matches(new MCItemStack(entry.getValue()))
|
||||
&& (input == null || input.matches(new MCItemStack(entry.getKey())))) {
|
||||
if (output.matches(getIItemStack(entry.getValue()))
|
||||
&& (input == null || input.matches(getIItemStack(entry.getKey())))) {
|
||||
toRemove.add(entry.getKey());
|
||||
toRemoveValues.add(entry.getValue());
|
||||
}
|
||||
@@ -59,8 +60,8 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
MineTweakerAPI.logger.logError("Cannot turn " + input.toString() + " into a furnace recipe");
|
||||
}
|
||||
|
||||
ItemStack[] items2 = MineTweakerUtil.getItemStacks(items);
|
||||
ItemStack output2 = (ItemStack) output.getInternal();
|
||||
ItemStack[] items2 = getItemStacks(items);
|
||||
ItemStack output2 = getItemStack(output);
|
||||
MineTweakerAPI.tweaker.apply(new AddRecipeAction(input, items2, output2, xp));
|
||||
}
|
||||
|
||||
@@ -71,7 +72,7 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
|
||||
@Override
|
||||
public int getFuel(IItemStack item) {
|
||||
return GameRegistry.getFuelValue((ItemStack) item.getInternal());
|
||||
return GameRegistry.getFuelValue(getItemStack(item));
|
||||
}
|
||||
|
||||
// ######################
|
||||
@@ -115,6 +116,11 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + items.size() + " furnace recipes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class AddRecipeAction implements IUndoableAction {
|
||||
@@ -158,6 +164,11 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Removing furnace recipe for " + ingredient;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class SetFuelAction implements IUndoableAction {
|
||||
@@ -191,5 +202,10 @@ public class MCFurnaceManager implements IFurnaceManager {
|
||||
public String describeUndo() {
|
||||
return "Removing fuel for " + pattern.getPattern();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientItem;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.mc172.actions.SetTranslationAction;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -200,11 +201,7 @@ public class MCItemStack implements IItemStack {
|
||||
|
||||
@Override
|
||||
public boolean matches(IItemStack item) {
|
||||
ItemStack internal = (ItemStack) item.getInternal();
|
||||
if (internal == null) {
|
||||
throw new RuntimeException("Invalid item: " + item);
|
||||
}
|
||||
|
||||
ItemStack internal = getItemStack(item);
|
||||
return internal.getItem() == stack.getItem()
|
||||
&& (wildcardSize || internal.stackSize == stack.stackSize)
|
||||
&& (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
||||
|
||||
+25
@@ -126,6 +126,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " luminosity to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetDensity implements IUndoableAction {
|
||||
@@ -161,6 +166,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " density to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetTemperature implements IUndoableAction {
|
||||
@@ -196,6 +206,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " temperature to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetViscosity implements IUndoableAction {
|
||||
@@ -231,6 +246,11 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " viscosity to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionSetGaseous implements IUndoableAction {
|
||||
@@ -266,5 +286,10 @@ public class MCLiquidDefinition implements ILiquidDefinition {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + fluid.getName() + " gaseous to " + oldValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
package minetweaker.mc172.liquid;
|
||||
|
||||
import minetweaker.mc172.data.NBTConverter;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.liquid.ILiquidDefinition;
|
||||
import minetweaker.api.liquid.ILiquidStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIData;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getNBTCompound;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
/**
|
||||
@@ -57,7 +57,7 @@ public class MCLiquidStack implements ILiquidStack {
|
||||
return null;
|
||||
}
|
||||
|
||||
tag = NBTConverter.from(stack.tag, true);
|
||||
tag = getIData(stack.tag);
|
||||
}
|
||||
|
||||
return tag;
|
||||
@@ -66,7 +66,7 @@ public class MCLiquidStack implements ILiquidStack {
|
||||
@Override
|
||||
public ILiquidStack withTag(IData data) {
|
||||
FluidStack result = new FluidStack(stack.fluidID, stack.amount);
|
||||
result.tag = (NBTTagCompound) NBTConverter.from(data);
|
||||
result.tag = getNBTCompound(data);
|
||||
return new MCLiquidStack(result, data.immutable());
|
||||
}
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
package minetweaker.mc172.oredict;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getOreDict;
|
||||
import minetweaker.api.oredict.IOreDict;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -17,6 +17,6 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
public class MCOreDict implements IOreDict {
|
||||
@Override
|
||||
public IOreDictEntry get(String name) {
|
||||
return new MCOreDictEntry(OreDictionary.getOreID(name));
|
||||
return getOreDict(name);
|
||||
}
|
||||
}
|
||||
+32
-8
@@ -10,13 +10,14 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemCondition;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.api.item.IItemTransformer;
|
||||
import minetweaker.api.item.IngredientStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.oredict.IOreDictEntry;
|
||||
import minetweaker.api.oredict.IngredientOreDict;
|
||||
import minetweaker.util.ArrayUtil;
|
||||
@@ -44,13 +45,16 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
// ####################################
|
||||
// ### IOreDictEntry implementation ###
|
||||
// ####################################
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return OreDictionary.getOres(id).isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(IItemStack item) {
|
||||
ItemStack stack = (ItemStack) item.getInternal();
|
||||
if (stack == null) {
|
||||
MineTweakerAPI.logger.logError("not a valid item");
|
||||
} else {
|
||||
ItemStack stack = getItemStack(item);
|
||||
if (stack != null) {
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddItem(id, stack));
|
||||
}
|
||||
}
|
||||
@@ -68,7 +72,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public void remove(IItemStack item) {
|
||||
ItemStack result = null;
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(new MCItemStack(itemStack))) {
|
||||
if (item.matches(getIItemStack(itemStack))) {
|
||||
result = itemStack;
|
||||
break;
|
||||
}
|
||||
@@ -82,7 +86,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
@Override
|
||||
public boolean contains(IItemStack item) {
|
||||
for (ItemStack itemStack : OreDictionary.getOres(id)) {
|
||||
if (item.matches(new MCItemStack(itemStack))) {
|
||||
if (item.matches(getIItemStack(itemStack))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -113,7 +117,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public List<IItemStack> getItems() {
|
||||
List<IItemStack> result = new ArrayList<IItemStack>();
|
||||
for (ItemStack item : OreDictionary.getOres(id)) {
|
||||
result.add(new MCItemStack(item));
|
||||
result.add(getIItemStack(item));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -200,6 +204,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Removing " + item.getDisplayName() + " from ore dictionary entry " + OreDictionary.getOreName(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionMirror implements IUndoableAction {
|
||||
@@ -243,6 +252,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Undoing mirror of " + OreDictionary.getOreName(idSource) + " to " + OreDictionary.getOreName(idTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionRemoveItem implements IUndoableAction {
|
||||
@@ -278,6 +292,11 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + OreDictionary.getOreName(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class ActionAddAll implements IUndoableAction {
|
||||
@@ -319,5 +338,10 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
public String describeUndo() {
|
||||
return "Removing contents of ore dictionary entry " + OreDictionary.getOreName(idSource) + " from " + OreDictionary.getOreName(idTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,10 +6,13 @@
|
||||
|
||||
package minetweaker.mc172.player;
|
||||
|
||||
import minetweaker.mc172.data.NBTConverter;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.api.chat.IChatMessage;
|
||||
import minetweaker.api.data.IData;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.mc172.data.NBTConverter;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -21,6 +24,10 @@ public class MCPlayer implements IPlayer {
|
||||
public MCPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public EntityPlayer getInternal() {
|
||||
return player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
@@ -36,4 +43,14 @@ public class MCPlayer implements IPlayer {
|
||||
public void update(IData data) {
|
||||
NBTConverter.updateMap(player.getEntityData(), data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendChat(IChatMessage message) {
|
||||
Object internal = message.getInternal();
|
||||
if (!(internal instanceof IChatComponent)) {
|
||||
MineTweakerAPI.logger.logError("not a valid chat message");
|
||||
return;
|
||||
}
|
||||
player.addChatMessage((IChatComponent) internal);
|
||||
}
|
||||
}
|
||||
+8
-7
@@ -7,12 +7,13 @@
|
||||
package minetweaker.mc172.recipes;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerHacks;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getIPlayer;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.player.IPlayer;
|
||||
import minetweaker.api.recipes.ICraftingInventory;
|
||||
import minetweaker.mc172.player.MCPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
@@ -45,7 +46,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
private IItemStack[] stacks;
|
||||
private ItemStack[] original;
|
||||
private int stackCount;
|
||||
private MCPlayer player;
|
||||
private IPlayer player;
|
||||
|
||||
private MCCraftingInventory(InventoryCrafting inventory) {
|
||||
this.inventory = inventory;
|
||||
@@ -60,7 +61,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) {
|
||||
SlotCrafting slotCrafting = (SlotCrafting) slots.get(0);
|
||||
EntityPlayer playerEntity = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting);
|
||||
player = new MCPlayer(playerEntity);
|
||||
player = getIPlayer(playerEntity);
|
||||
} else {
|
||||
player = null;
|
||||
}
|
||||
@@ -80,7 +81,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
original[i] = inventory.getStackInSlot(i);
|
||||
if (inventory.getStackInSlot(i) != null) {
|
||||
if (stacks[i] == null) stackCount++;
|
||||
stacks[i] = new MCItemStack(original[i]);
|
||||
stacks[i] = getIItemStack(original[i]);
|
||||
} else {
|
||||
if (stacks[i] != null) stackCount--;
|
||||
stacks[i] = null;
|
||||
@@ -135,7 +136,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
stackCount--;
|
||||
inventory.setInventorySlotContents(ix, null);
|
||||
} else {
|
||||
inventory.setInventorySlotContents(ix, (ItemStack) stack.getInternal());
|
||||
inventory.setInventorySlotContents(ix, getItemStack(stack));
|
||||
|
||||
if (stacks[ix] == null) {
|
||||
stackCount++;
|
||||
@@ -154,7 +155,7 @@ public class MCCraftingInventory implements ICraftingInventory {
|
||||
stackCount--;
|
||||
inventory.setInventorySlotContents(i, null);
|
||||
} else {
|
||||
inventory.setInventorySlotContents(i, (ItemStack) stack.getInternal());
|
||||
inventory.setInventorySlotContents(i, getItemStack(stack));
|
||||
|
||||
if (stacks[i] == null) {
|
||||
stackCount++;
|
||||
|
||||
+20
-22
@@ -6,11 +6,12 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.IUndoableAction;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.mc172.oredict.MCOreDictEntry;
|
||||
import minetweaker.mc172.util.MineTweakerHacks;
|
||||
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.getOreDict;
|
||||
import minetweaker.api.recipes.IRecipeFunction;
|
||||
import minetweaker.api.recipes.IRecipeManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -45,7 +46,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
// certain special recipes have no predefined output. ignore those
|
||||
// since these cannot be removed with MineTweaker scripts
|
||||
if (recipe.getRecipeOutput() != null) {
|
||||
if (output.matches(new MCItemStack(recipe.getRecipeOutput()))) {
|
||||
if (output.matches(getIItemStack(recipe.getRecipeOutput()))) {
|
||||
toRemove.add(recipe);
|
||||
removeIndex.add(i);
|
||||
}
|
||||
@@ -63,11 +64,6 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
|
||||
@Override
|
||||
public void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, boolean mirrored) {
|
||||
if (output.getInternal() == null) {
|
||||
MineTweakerAPI.logger.logError("invalid output item");
|
||||
return;
|
||||
}
|
||||
|
||||
ShapedRecipe recipe = new ShapedRecipe(output, ingredients, function, mirrored);
|
||||
IRecipe irecipe = RecipeConverter.convert(recipe);
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe));
|
||||
@@ -75,11 +71,6 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
|
||||
@Override
|
||||
public void addShapeless(IItemStack output, IIngredient[] ingredients, IRecipeFunction function) {
|
||||
if (output.getInternal() == null) {
|
||||
MineTweakerAPI.logger.logError("invalid output item");
|
||||
return;
|
||||
}
|
||||
|
||||
ShapelessRecipe recipe = new ShapelessRecipe(output, ingredients, function);
|
||||
IRecipe irecipe = RecipeConverter.convert(recipe);
|
||||
MineTweakerAPI.tweaker.apply(new ActionAddRecipe(irecipe));
|
||||
@@ -103,7 +94,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
outer: for (int i = 0; i < recipes.size(); i++) {
|
||||
IRecipe recipe = recipes.get(i);
|
||||
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(new MCItemStack(recipe.getRecipeOutput()))) {
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(getIItemStack(recipe.getRecipeOutput()))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -169,7 +160,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
outer: for (int i = 0; i < recipes.size(); i++) {
|
||||
IRecipe recipe = recipes.get(i);
|
||||
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(new MCItemStack(recipe.getRecipeOutput()))) {
|
||||
if (recipe.getRecipeOutput() == null || !output.matches(getIItemStack(recipe.getRecipeOutput()))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -244,10 +235,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
for (int i = 0; i < height; i++) {
|
||||
for (int j = 0; j < contents[i].length; j++) {
|
||||
if (contents[i][j] != null) {
|
||||
Object internal = contents[i][j].getInternal();
|
||||
if (internal != null && (internal instanceof ItemStack)) {
|
||||
iContents[i * width + j] = (ItemStack) internal;
|
||||
}
|
||||
iContents[i * width + j] = getItemStack(contents[i][j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -260,7 +248,7 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
if (result == null) {
|
||||
return null;
|
||||
} else {
|
||||
return new MCItemStack(result);
|
||||
return getIItemStack(result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,6 +296,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
public String describeUndo() {
|
||||
return "Restoring " + removingIndices.size() + " recipes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private class ActionAddRecipe implements IUndoableAction {
|
||||
@@ -341,6 +334,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
public String describeUndo() {
|
||||
return "Removing recipe for " + recipe.getRecipeOutput().getDisplayName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean matches(Object input, IIngredient ingredient) {
|
||||
@@ -348,11 +346,11 @@ public class MCRecipeManager implements IRecipeManager {
|
||||
return false;
|
||||
} else if (ingredient != null) {
|
||||
if (input instanceof ItemStack) {
|
||||
if (!ingredient.matches(new MCItemStack((ItemStack) input))) {
|
||||
if (!ingredient.matches(getIItemStack((ItemStack) input))) {
|
||||
return false;
|
||||
}
|
||||
} else if (input instanceof String) {
|
||||
if (!ingredient.contains(new MCOreDictEntry((String) input))) {
|
||||
if (!ingredient.contains(getOreDict((String) input))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -11,6 +11,7 @@ import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
|
||||
@@ -51,7 +52,7 @@ public class RecipeConverter {
|
||||
if (type == TYPE_BASIC) {
|
||||
ItemStack[] items = new ItemStack[ingredients.length];
|
||||
for (int i = 0; i < ingredients.length; i++) {
|
||||
items[i] = (ItemStack) ingredients[i].getInternal();
|
||||
items[i] = getItemStack(ingredients[i]);
|
||||
}
|
||||
return new ShapelessRecipeBasic(items, recipe);
|
||||
} else if (type == TYPE_ORE) {
|
||||
@@ -77,7 +78,7 @@ public class RecipeConverter {
|
||||
if (type == TYPE_BASIC && !recipe.isMirrored()) {
|
||||
ItemStack[] basicIngredients = new ItemStack[recipe.getHeight() * recipe.getWidth()];
|
||||
for (int i = 0; i < ingredients.length; i++) {
|
||||
basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = (ItemStack) ingredients[i].getInternal();
|
||||
basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = getItemStack(ingredients[i]);
|
||||
}
|
||||
|
||||
return new ShapedRecipeBasic(basicIngredients, recipe);
|
||||
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc172.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -31,7 +32,7 @@ public class ShapedRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -41,6 +42,6 @@ public class ShapedRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getRecipeOutput() {
|
||||
return (ItemStack) recipe.getOutput().getInternal();
|
||||
return getItemStack(recipe.getOutput());
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -7,6 +7,7 @@
|
||||
package minetweaker.mc172.recipes;
|
||||
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -21,7 +22,7 @@ public class ShapedRecipeBasic extends ShapedRecipes {
|
||||
private final ShapedRecipe recipe;
|
||||
|
||||
public ShapedRecipeBasic(ItemStack[] basicInputs, ShapedRecipe recipe) {
|
||||
super(recipe.getWidth(), recipe.getHeight(), basicInputs, (ItemStack) recipe.getOutput().getInternal());
|
||||
super(recipe.getWidth(), recipe.getHeight(), basicInputs, getItemStack(recipe.getOutput()));
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -37,7 +38,7 @@ public class ShapedRecipeBasic extends ShapedRecipes {
|
||||
if (result == null) {
|
||||
return null;
|
||||
} else {
|
||||
return ((ItemStack) result.getInternal()).copy();
|
||||
return getItemStack(result).copy();
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc172.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapedRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,7 +21,7 @@ public class ShapedRecipeOre extends ShapedOreRecipe {
|
||||
private final ShapedRecipe recipe;
|
||||
|
||||
public ShapedRecipeOre(Object[] contents, ShapedRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), contents);
|
||||
super(getItemStack(recipe.getOutput()), contents);
|
||||
|
||||
if (recipe.isMirrored()) {
|
||||
setMirrored(true);
|
||||
@@ -36,6 +37,6 @@ public class ShapedRecipeOre extends ShapedOreRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc172.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -30,7 +31,7 @@ public class ShapelessRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -40,6 +41,6 @@ public class ShapelessRecipeAdvanced implements IRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getRecipeOutput() {
|
||||
return (ItemStack) recipe.getOutput().getInternal();
|
||||
return getItemStack(recipe.getOutput());
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -8,6 +8,7 @@ package minetweaker.mc172.recipes;
|
||||
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import java.util.Arrays;
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
@@ -21,7 +22,7 @@ public class ShapelessRecipeBasic extends ShapelessRecipes {
|
||||
private final ShapelessRecipe recipe;
|
||||
|
||||
public ShapelessRecipeBasic(ItemStack[] ingredients, ShapelessRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), Arrays.asList(ingredients));
|
||||
super(getItemStack(recipe.getOutput()), Arrays.asList(ingredients));
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -33,6 +34,6 @@ public class ShapelessRecipeBasic extends ShapelessRecipes {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@
|
||||
|
||||
package minetweaker.mc172.recipes;
|
||||
|
||||
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
|
||||
import minetweaker.api.recipes.ShapelessRecipe;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,7 +21,7 @@ public class ShapelessRecipeOre extends ShapelessOreRecipe {
|
||||
private final ShapelessRecipe recipe;
|
||||
|
||||
public ShapelessRecipeOre(Object[] ingredients, ShapelessRecipe recipe) {
|
||||
super((ItemStack) recipe.getOutput().getInternal(), ingredients);
|
||||
super(getItemStack(recipe.getOutput()), ingredients);
|
||||
|
||||
this.recipe = recipe;
|
||||
}
|
||||
@@ -32,6 +33,6 @@ public class ShapelessRecipeOre extends ShapelessOreRecipe {
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventory) {
|
||||
return ((ItemStack) recipe.getCraftingResult(MCCraftingInventory.get(inventory)).getInternal()).copy();
|
||||
return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy();
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* 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.mc172.util;
|
||||
|
||||
import java.util.List;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Stan
|
||||
*/
|
||||
public class MineTweakerUtil {
|
||||
public static ItemStack[] getItemStacks(IItemStack... items) {
|
||||
ItemStack[] output = new ItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
Object internal = items[i].getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public static ItemStack[] getItemStacks(List<IItemStack> items) {
|
||||
ItemStack[] output = new ItemStack[items.size()];
|
||||
for (int i = 0; i < items.size(); i++) {
|
||||
Object internal = items.get(i).getInternal();
|
||||
if (internal != null && internal instanceof ItemStack) {
|
||||
output[i] = (ItemStack) internal;
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
public static IItemStack[] getIItemStacks(ItemStack... items) {
|
||||
IItemStack[] result = new IItemStack[items.length];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
result[i] = new MCItemStack(items[i]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static IItemStack[] getIItemStacks(List<ItemStack> items) {
|
||||
IItemStack[] result = new IItemStack[items.size()];
|
||||
for (int i = 0; i < result.length; i++) {
|
||||
result[i] = new MCItemStack(items.get(i));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -6,8 +6,8 @@ import minetweaker.IBracketHandler;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.BracketHandler;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
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;
|
||||
@@ -32,7 +32,7 @@ public class IC2BracketHandler implements IBracketHandler {
|
||||
public static IItemStack getItem(String name, int meta) {
|
||||
ItemStack stack = IC2Items.getItem(name);
|
||||
stack.setItemDamage(meta);
|
||||
return new MCItemStack(stack);
|
||||
return getIItemStack(stack);
|
||||
}
|
||||
|
||||
private final JavaMethod method;
|
||||
|
||||
+14
-18
@@ -5,6 +5,7 @@ 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.ItemStack;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
@@ -31,12 +32,7 @@ public class IC2ExplosionWhitelist {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void add(IItemStack item) {
|
||||
Object internal = item.getInternal();
|
||||
if (internal == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(item);
|
||||
Block block = Block.getBlockFromItem(iStack.getItem());
|
||||
if (block == null) {
|
||||
MineTweakerAPI.logger.logError("This item is not a block");
|
||||
@@ -52,12 +48,7 @@ public class IC2ExplosionWhitelist {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void remove(IItemStack item) {
|
||||
Object internal = item.getInternal();
|
||||
if (internal == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(item);
|
||||
Block block = Block.getBlockFromItem(iStack.getItem());
|
||||
if (block == null) {
|
||||
MineTweakerAPI.logger.logError("This item is not a block");
|
||||
@@ -78,12 +69,7 @@ public class IC2ExplosionWhitelist {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static boolean isWhitelisted(IItemStack item) {
|
||||
Object internal = item.getInternal();
|
||||
if (internal == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(item);
|
||||
Block block = Block.getBlockFromItem(iStack.getItem());
|
||||
if (block == null) {
|
||||
MineTweakerAPI.logger.logWarning("This item is not a block");
|
||||
@@ -128,6 +114,11 @@ public class IC2ExplosionWhitelist {
|
||||
public String describeUndo() {
|
||||
return "Removing block from IC2 explosion whitelist: " + block.getLocalizedName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class RemoveAction implements IUndoableAction {
|
||||
@@ -161,5 +152,10 @@ public class IC2ExplosionWhitelist {
|
||||
public String describeUndo() {
|
||||
return "Adding block to IC2 explosion whitelist: " + block.getLocalizedName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,8 @@ package minetweaker.mods.ic2;
|
||||
import ic2.api.recipe.IRecipeInput;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
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;
|
||||
@@ -28,7 +29,7 @@ public class IC2RecipeInput implements IRecipeInput {
|
||||
|
||||
@Override
|
||||
public boolean matches(ItemStack subject) {
|
||||
return ingredient.matches(new MCItemStack(subject));
|
||||
return ingredient.matches(getIItemStack(subject));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -40,8 +41,30 @@ public class IC2RecipeInput implements IRecipeInput {
|
||||
public List<ItemStack> getInputs() {
|
||||
List<ItemStack> items = new ArrayList<ItemStack>();
|
||||
for (IItemStack item : ingredient.getItems()) {
|
||||
items.add((ItemStack) item.getInternal());
|
||||
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;
|
||||
}
|
||||
}
|
||||
+44
-6
@@ -1,12 +1,7 @@
|
||||
/*
|
||||
* 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.IMachineRecipeManager;
|
||||
import java.util.Arrays;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.OneWayAction;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -59,4 +54,47 @@ public class MachineAddRecipeAction extends OneWayAction {
|
||||
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;
|
||||
}
|
||||
}
|
||||
+13
-47
@@ -3,7 +3,8 @@ package minetweaker.mods.ic2.expand;
|
||||
import ic2.api.item.ElectricItem;
|
||||
import ic2.api.item.IElectricItem;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
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;
|
||||
@@ -27,12 +28,7 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenGetter("ic2getCharge")
|
||||
public static int getIC2Charge(IItemStack stack) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return ElectricItem.manager.getCharge((ItemStack) internal);
|
||||
return ElectricItem.manager.getCharge(getItemStack(stack));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -43,12 +39,7 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenGetter("ic2tier")
|
||||
public static int getIC2Tier(IItemStack stack) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(stack);
|
||||
if (iStack.getItem() instanceof IElectricItem) {
|
||||
return ((IElectricItem) iStack.getItem()).getTier(iStack);
|
||||
} else {
|
||||
@@ -64,12 +55,7 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenGetter("ic2transferLimit")
|
||||
public static int getIC2TransferLimit(IItemStack stack) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(stack);
|
||||
if (iStack.getItem() instanceof IElectricItem) {
|
||||
return ((IElectricItem) iStack.getItem()).getTransferLimit(iStack);
|
||||
} else {
|
||||
@@ -85,18 +71,13 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenGetter("ic2charged")
|
||||
public static IItemStack getIC2Charged(IItemStack stack) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(stack);
|
||||
if (iStack.getItem() instanceof IElectricItem) {
|
||||
IElectricItem eItem = (IElectricItem) iStack.getItem();
|
||||
Item item = eItem.getChargedItem(iStack);
|
||||
ItemStack stack2 = new ItemStack(item, 1, 0);
|
||||
ElectricItem.manager.charge(stack2, eItem.getMaxCharge(stack2), eItem.getTier(stack2), true, false);
|
||||
return new MCItemStack(stack2);
|
||||
return getIItemStack(stack2);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
@@ -110,16 +91,11 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenGetter("ic2discharged")
|
||||
public static IItemStack getIC2Discharged(IItemStack stack) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
ItemStack iStack = (ItemStack) internal;
|
||||
ItemStack iStack = getItemStack(stack);
|
||||
if (iStack.getItem() instanceof IElectricItem) {
|
||||
IElectricItem eItem = (IElectricItem) iStack.getItem();
|
||||
Item item = eItem.getEmptyItem(iStack);
|
||||
return new MCItemStack(new ItemStack(item, 1, 0));
|
||||
return getItemStack(item, 1, 0);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
@@ -135,18 +111,13 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenMethod("ic2charge")
|
||||
public static IItemStack ic2Charge(IItemStack stack, int amount, @Optional int tier) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return stack;
|
||||
}
|
||||
|
||||
if (tier == 0) {
|
||||
tier = getIC2Tier(stack);
|
||||
}
|
||||
|
||||
ItemStack iStack = ((ItemStack) internal).copy();
|
||||
ItemStack iStack = getItemStack(stack).copy();
|
||||
ElectricItem.manager.charge(iStack, amount, tier, true, false);
|
||||
return new MCItemStack(iStack);
|
||||
return getIItemStack(iStack);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -159,17 +130,12 @@ public class ItemExpansion {
|
||||
*/
|
||||
@ZenMethod("ic2discharge")
|
||||
public static IItemStack ic2Discharge(IItemStack stack, int amount, @Optional int tier) {
|
||||
Object internal = stack.getInternal();
|
||||
if (internal == null || !(internal instanceof ItemStack)) {
|
||||
return stack;
|
||||
}
|
||||
|
||||
if (tier == 0) {
|
||||
tier = getIC2Tier(stack);
|
||||
}
|
||||
|
||||
ItemStack iStack = ((ItemStack) internal).copy();
|
||||
ItemStack iStack = getItemStack(stack).copy();
|
||||
ElectricItem.manager.discharge(iStack, amount, tier, true, false);
|
||||
return new MCItemStack(iStack);
|
||||
return getIItemStack(iStack);
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -4,11 +4,11 @@ import ic2.api.recipe.RecipeOutput;
|
||||
import ic2.api.recipe.Recipes;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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;
|
||||
@@ -43,7 +43,7 @@ public class Compressor {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"compressor",
|
||||
Recipes.compressor,
|
||||
MineTweakerUtil.getItemStacks(output),
|
||||
getItemStacks(output),
|
||||
null,
|
||||
new IC2RecipeInput(ingredient)));
|
||||
}
|
||||
@@ -59,11 +59,11 @@ public class Compressor {
|
||||
@ZenMethod
|
||||
public static IItemStack getOutput(
|
||||
@NotNull IItemStack input) {
|
||||
RecipeOutput output = Recipes.compressor.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.compressor.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.size() > 0) {
|
||||
System.out.println("No output");
|
||||
return null;
|
||||
}
|
||||
return new MCItemStack(output.items.get(0));
|
||||
return getIItemStack(output.items.get(0));
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -10,11 +10,11 @@ import ic2.api.recipe.RecipeOutput;
|
||||
import ic2.api.recipe.Recipes;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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;
|
||||
@@ -48,7 +48,7 @@ public class Extractor {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"extractor",
|
||||
Recipes.extractor,
|
||||
MineTweakerUtil.getItemStacks(output),
|
||||
getItemStacks(output),
|
||||
null,
|
||||
new IC2RecipeInput(ingredient)));
|
||||
}
|
||||
@@ -64,8 +64,8 @@ public class Extractor {
|
||||
@ZenMethod
|
||||
public static IItemStack getOutput(
|
||||
@NotNull IItemStack input) {
|
||||
RecipeOutput output = Recipes.extractor.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.extractor.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.size() > 0) return null;
|
||||
return new MCItemStack(output.items.get(0));
|
||||
return getIItemStack(output.items.get(0));
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -4,11 +4,11 @@ import ic2.api.recipe.RecipeOutput;
|
||||
import ic2.api.recipe.Recipes;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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;
|
||||
@@ -43,7 +43,7 @@ public class Macerator {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"macerator",
|
||||
Recipes.macerator,
|
||||
MineTweakerUtil.getItemStacks(output),
|
||||
getItemStacks(output),
|
||||
null,
|
||||
new IC2RecipeInput(ingredient)));
|
||||
}
|
||||
@@ -59,8 +59,8 @@ public class Macerator {
|
||||
@ZenMethod
|
||||
public static IItemStack getOutput(
|
||||
@NotNull IItemStack input) {
|
||||
RecipeOutput output = Recipes.macerator.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.macerator.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.size() > 0) return null;
|
||||
return new MCItemStack(output.items.get(0));
|
||||
return getIItemStack(output.items.get(0));
|
||||
}
|
||||
}
|
||||
+12
-12
@@ -12,11 +12,11 @@ import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.item.MCItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
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 net.minecraft.item.ItemStack;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class MetalFormer {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"metal former - extruding",
|
||||
Recipes.metalformerExtruding,
|
||||
MineTweakerUtil.getItemStacks(output),
|
||||
getItemStacks(output),
|
||||
null,
|
||||
new IC2RecipeInput(input)));
|
||||
}
|
||||
@@ -51,9 +51,9 @@ public class MetalFormer {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static IItemStack getExtrudingOutput(IItemStack input) {
|
||||
RecipeOutput output = Recipes.metalformerExtruding.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.metalformerExtruding.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.size() > 0) return null;
|
||||
return new MCItemStack(output.items.get(0));
|
||||
return getIItemStack(output.items.get(0));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -67,7 +67,7 @@ public class MetalFormer {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"metal former - rolling",
|
||||
Recipes.metalformerRolling,
|
||||
new ItemStack[] { (ItemStack) output.getInternal() },
|
||||
getItemStacks(output),
|
||||
null,
|
||||
new IC2RecipeInput(input)));
|
||||
}
|
||||
@@ -80,9 +80,9 @@ public class MetalFormer {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static IItemStack getRollingOutput(IItemStack input) {
|
||||
RecipeOutput output = Recipes.metalformerRolling.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.metalformerRolling.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.size() > 0) return null;
|
||||
return new MCItemStack(output.items.get(0));
|
||||
return getIItemStack(output.items.get(0));
|
||||
}
|
||||
/**
|
||||
* Adds a extruding recipe to the metal former.
|
||||
@@ -95,7 +95,7 @@ public class MetalFormer {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"metal former - cutting",
|
||||
Recipes.metalformerCutting,
|
||||
new ItemStack[] { (ItemStack) output.getInternal() },
|
||||
getItemStacks(output),
|
||||
null,
|
||||
new IC2RecipeInput(input)));
|
||||
}
|
||||
@@ -108,8 +108,8 @@ public class MetalFormer {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static IItemStack getCuttingOutput(IItemStack input) {
|
||||
RecipeOutput output = Recipes.metalformerCutting.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.metalformerCutting.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.size() > 0) return null;
|
||||
return new MCItemStack(output.items.get(0));
|
||||
return getIItemStack(output.items.get(0));
|
||||
}
|
||||
}
|
||||
+6
-5
@@ -6,10 +6,11 @@ import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
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.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
@@ -28,15 +29,15 @@ public class OreWasher {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"ore washer",
|
||||
Recipes.oreWashing,
|
||||
MineTweakerUtil.getItemStacks(output),
|
||||
getItemStacks(output),
|
||||
nbt,
|
||||
new IC2RecipeInput(input)));
|
||||
}
|
||||
|
||||
@ZenMethod
|
||||
public static IItemStack[] getOutput(IItemStack input) {
|
||||
RecipeOutput output = Recipes.oreWashing.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.oreWashing.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.isEmpty()) return null;
|
||||
return MineTweakerUtil.getIItemStacks(output.items);
|
||||
return getIItemStacks(output.items);
|
||||
}
|
||||
}
|
||||
+6
-5
@@ -4,10 +4,11 @@ import ic2.api.recipe.RecipeOutput;
|
||||
import ic2.api.recipe.Recipes;
|
||||
import minetweaker.MineTweakerAPI;
|
||||
import minetweaker.annotations.ModOnly;
|
||||
import minetweaker.mc172.util.MineTweakerUtil;
|
||||
import minetweaker.api.item.IIngredient;
|
||||
import minetweaker.api.item.IItemStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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;
|
||||
@@ -43,7 +44,7 @@ public class ThermalCentrifuge {
|
||||
MineTweakerAPI.tweaker.apply(new MachineAddRecipeAction(
|
||||
"thermal centrifuge",
|
||||
Recipes.centrifuge,
|
||||
MineTweakerUtil.getItemStacks(output),
|
||||
getItemStacks(output),
|
||||
tag,
|
||||
new IC2RecipeInput(ingredient)));
|
||||
}
|
||||
@@ -73,8 +74,8 @@ public class ThermalCentrifuge {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static IItemStack[] getOutput(IItemStack input) {
|
||||
RecipeOutput output = Recipes.centrifuge.getOutputFor((ItemStack) input.getInternal(), false);
|
||||
RecipeOutput output = Recipes.centrifuge.getOutputFor(getItemStack(input), false);
|
||||
if (output == null || output.items.isEmpty()) return null;
|
||||
return MineTweakerUtil.getIItemStacks(output.items);
|
||||
return getIItemStacks(output.items);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package minetweaker.mods.nei;
|
||||
|
||||
import codechicken.nei.api.API;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import stanhebben.zenscript.annotations.NotNull;
|
||||
import stanhebben.zenscript.annotations.ZenClass;
|
||||
import stanhebben.zenscript.annotations.ZenMethod;
|
||||
@@ -10,6 +9,8 @@ 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.
|
||||
@@ -32,7 +33,7 @@ public class NEI {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void hide(@NotNull IItemStack item) {
|
||||
MineTweakerAPI.tweaker.apply(new NEIHideItemAction((ItemStack) item.getInternal()));
|
||||
MineTweakerAPI.tweaker.apply(new NEIHideItemAction(getItemStack(item)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -42,7 +43,7 @@ public class NEI {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void addEntry(@NotNull IItemStack stack) {
|
||||
MineTweakerAPI.tweaker.apply(new NEIAddEntryAction((ItemStack) stack.getInternal()));
|
||||
MineTweakerAPI.tweaker.apply(new NEIAddEntryAction(getItemStack(stack)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,7 +55,7 @@ public class NEI {
|
||||
*/
|
||||
@ZenMethod
|
||||
public static void overrideName(@NotNull IItemStack item, @NotNull String name) {
|
||||
MineTweakerAPI.tweaker.apply(new NEIOverrideNameAction((ItemStack) item.getInternal(), name));
|
||||
MineTweakerAPI.tweaker.apply(new NEIOverrideNameAction(getItemStack(item), name));
|
||||
}
|
||||
|
||||
// #############################
|
||||
@@ -92,6 +93,11 @@ public class NEI {
|
||||
public String describeUndo() {
|
||||
return "Removing " + item.getDisplayName() + " as NEI entry";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class NEIHideItemAction implements IUndoableAction {
|
||||
@@ -125,6 +131,11 @@ public class NEI {
|
||||
public String describeUndo() {
|
||||
return "Displaying " + stack.getUnlocalizedName() + " in NEI";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class NEIOverrideNameAction extends OneWayAction {
|
||||
@@ -145,5 +156,10 @@ public class NEI {
|
||||
public String describe() {
|
||||
return "Overriding NEI item name of " + item.getUnlocalizedName() + " to " + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getOverrideKey() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user