diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index f091d92..c86c6fc 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -1,26 +1,10 @@ package minetweaker; -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.StringSelection; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import static minetweaker.MineTweakerAPI.server; import minetweaker.api.block.IBlock; import minetweaker.api.block.IBlockDefinition; import minetweaker.api.data.IData; import minetweaker.api.entity.IEntityDefinition; -import minetweaker.api.event.IEventHandle; -import minetweaker.api.event.MTEventManager; -import minetweaker.api.event.PlayerInteractEvent; -import minetweaker.api.event.PlayerLoggedInEvent; -import minetweaker.api.event.PlayerLoggedOutEvent; +import minetweaker.api.event.*; import minetweaker.api.formatting.IFormatter; import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; @@ -33,11 +17,7 @@ import minetweaker.api.mods.IMod; import minetweaker.api.oredict.IOreDict; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; -import minetweaker.api.recipes.ICraftingRecipe; -import minetweaker.api.recipes.IFurnaceManager; -import minetweaker.api.recipes.IRecipeManager; -import minetweaker.api.recipes.ShapedRecipe; -import minetweaker.api.recipes.ShapelessRecipe; +import minetweaker.api.recipes.*; import minetweaker.api.server.ICommandFunction; import minetweaker.api.server.ICommandValidator; import minetweaker.api.server.IServer; @@ -47,6 +27,15 @@ import minetweaker.api.world.IBiome; import minetweaker.runtime.IScriptProvider; import minetweaker.util.EventList; import minetweaker.util.IEventHandler; +import sun.awt.HeadlessToolkit; + +import java.awt.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.StringSelection; +import java.util.*; +import java.util.List; + +import static minetweaker.MineTweakerAPI.server; /** * The implementation API is used by API implementations for internal @@ -697,8 +686,10 @@ public class MineTweakerImplementationAPI { private static void copyToClipboard(String value) { StringSelection stringSelection = new StringSelection(value); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(stringSelection, null); + if(!(Toolkit.getDefaultToolkit() instanceof HeadlessToolkit)) { + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + clipboard.setContents(stringSelection, null); + } } // ############################ diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index b48cf2c..478d668 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -15,16 +15,16 @@ import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; import minetweaker.api.world.IBiome; import minetweaker.api.world.IDimension; -import minetweaker.mc1710.block.MCBlockDefinition; -import minetweaker.mc1710.block.MCSpecificBlock; -import minetweaker.mc1710.data.NBTConverter; -import minetweaker.mc1710.item.MCItemStack; -import minetweaker.mc1710.oredict.MCOreDictEntry; -import minetweaker.mc1710.player.MCPlayer; -import minetweaker.mc1710.world.MCDimension; -import minetweaker.mc1710.block.MCWorldBlock; -import minetweaker.mc1710.liquid.MCLiquidStack; -import minetweaker.mc1710.world.MCBiome; +import minetweaker.mc19.block.MCBlockDefinition; +import minetweaker.mc19.block.MCSpecificBlock; +import minetweaker.mc19.data.NBTConverter; +import minetweaker.mc19.item.MCItemStack; +import minetweaker.mc19.oredict.MCOreDictEntry; +import minetweaker.mc19.player.MCPlayer; +import minetweaker.mc19.world.MCDimension; +import minetweaker.mc19.block.MCWorldBlock; +import minetweaker.mc19.liquid.MCLiquidStack; +import minetweaker.mc19.world.MCBiome; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/GuiCannotRemodify.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/GuiCannotRemodify.java deleted file mode 100644 index 452526b..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/GuiCannotRemodify.java +++ /dev/null @@ -1,60 +0,0 @@ -package minetweaker.mc1710; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; - -/** - * This screen is shown when a client has been modified with a permanent - * modification and the player logs into a game with a different script. It asks - * the player to restart the game. - * - * @author Stan Hebben - */ -public class GuiCannotRemodify extends GuiScreen { - private final String message1; - private final String message2; - private final String message3; - - public GuiCannotRemodify(String message1, String message2, String message3) { - this.message1 = message1; - this.message2 = message2; - this.message3 = message3; - } - - @Override - public void initGui() { - this.buttonList.clear(); - this.buttonList.add( - new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120 + 12, "Close") - ); - } - - @Override - public void drawScreen(int par1, int par2, float par3) { - this.drawDefaultBackground(); - this.drawCenteredString( - this.fontRendererObj, - message1, - this.width / 2, this.height / 2 - 40, - 11184810); - this.drawCenteredString( - this.fontRendererObj, - message2, - this.width / 2, this.height / 2 - 20, - 11184810); - this.drawCenteredString( - this.fontRendererObj, - message3, - this.width / 2, this.height / 2 - 0, - 11184810); - - super.drawScreen(par1, par2, par3); - } - - @Override - protected void actionPerformed(GuiButton par1GuiButton) { - if (par1GuiButton.id == 0) { - System.exit(0); - } - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerRegistry.java deleted file mode 100644 index 464f066..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerRegistry.java +++ /dev/null @@ -1,19 +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; - -import java.util.List; - -/** - * - * @author Stan - */ -public class MineTweakerRegistry { - public static void getClasses(List classes) { - // method stub, actual content is generated by build process - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java deleted file mode 100644 index d0a64c8..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java +++ /dev/null @@ -1,61 +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.actions; - -import minetweaker.IUndoableAction; -import net.minecraft.item.ItemStack; - -/** - * - * @author Jared - */ -public class SetStackSizeAction implements IUndoableAction { - - private final ItemStack stack; - private final int size; - private final int oldSize; - - public SetStackSizeAction(ItemStack stack, int size) { - this.stack = stack; - this.size = size; - this.oldSize = stack.getMaxStackSize(); - } - - @Override - public void apply() { - set(stack, size); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - set(stack, oldSize); - } - - @Override - public String describe() { - return "Setting max stack size of " + stack.getDisplayName() + " to " + size; - } - - @Override - public String describeUndo() { - return "Reverting max stack size of " + stack.getDisplayName() + " to " + oldSize; - } - - private static void set(ItemStack stack, int size) { - stack.getItem().setMaxStackSize(size); - } - - @Override - public Object getOverrideKey() { - return null; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java deleted file mode 100644 index 13fc0b6..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java +++ /dev/null @@ -1,61 +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.actions; - -import minetweaker.IUndoableAction; -import net.minecraft.item.ItemStack; - -/** - * - * @author Jared - */ -public class SetStackmaxDamageAction implements IUndoableAction { - - private final ItemStack stack; - private final int damage; - private final int oldDamage; - - public SetStackmaxDamageAction(ItemStack stack, int damage) { - this.stack = stack; - this.damage= damage; - this.oldDamage= stack.getMaxDamage(); - } - - @Override - public void apply() { - set(stack, damage); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - set(stack, oldDamage); - } - - @Override - public String describe() { - return "Setting max damage of " + stack.getDisplayName() + " to " + damage; - } - - @Override - public String describeUndo() { - return "Reverting max damage of " + stack.getDisplayName() + " to " + oldDamage; - } - - private static void set(ItemStack stack, int damage) { - stack.getItem().setMaxDamage(damage); - } - - @Override - public Object getOverrideKey() { - return null; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java deleted file mode 100644 index 680eb63..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java +++ /dev/null @@ -1,97 +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.brackets; - -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; -import minetweaker.IBracketHandler; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.BracketHandler; -import minetweaker.mc1710.oredict.MCOreDictEntry; -import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.runtime.GlobalRegistry; -import stanhebben.zenscript.compiler.IEnvironmentGlobal; -import stanhebben.zenscript.expression.ExpressionCallStatic; -import stanhebben.zenscript.expression.ExpressionString; -import stanhebben.zenscript.expression.partial.IPartialExpression; -import stanhebben.zenscript.parser.Token; -import stanhebben.zenscript.symbols.IZenSymbol; -import stanhebben.zenscript.type.natives.IJavaMethod; -import stanhebben.zenscript.type.natives.JavaMethod; -import stanhebben.zenscript.util.ZenPosition; - -/** - * - * @author Stan - */ -@BracketHandler -public class OreBracketHandler implements IBracketHandler { - public static IOreDictEntry getOre(String name) { - return new MCOreDictEntry(name); - } - - public static List getOreList(String wildcardName) { - List result = new ArrayList(); - Pattern wildcardPattern = Pattern.compile(wildcardName.replaceAll("\\*", ".+")); - - for (IOreDictEntry someOreDict : MineTweakerAPI.oreDict.getEntries()) { - String oreDictName = someOreDict.getName(); - if (wildcardPattern.matcher(oreDictName).matches()) { - result.add(getOre(oreDictName)); - } - } - - return result; - } - - @Override - public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { - if (tokens.size() > 2) { - if (tokens.get(0).getValue().equals("ore") && tokens.get(1).getValue().equals(":")) { - return find(environment, tokens, 2, tokens.size()); - } - } - - return null; - } - - private IZenSymbol find(IEnvironmentGlobal environment, List tokens, int startIndex, int endIndex) { - StringBuilder valueBuilder = new StringBuilder(); - for (int i = startIndex; i < endIndex; i++) { - Token token = tokens.get(i); - valueBuilder.append(token.getValue()); - } - - return new OreReferenceSymbol(environment, valueBuilder.toString()); - } - - private class OreReferenceSymbol implements IZenSymbol { - private final IEnvironmentGlobal environment; - private final String name; - - public OreReferenceSymbol(IEnvironmentGlobal environment, String name) { - this.environment = environment; - this.name = name; - } - - @Override - public IPartialExpression instance(ZenPosition position) { - IJavaMethod method = JavaMethod.get( - GlobalRegistry.getTypeRegistry(), - OreBracketHandler.class, - name.contains("*") ? "getOreList" : "getOre", - String.class); - - return new ExpressionCallStatic( - position, - environment, - method, - new ExpressionString(position, name)); - } - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java deleted file mode 100644 index 1085d92..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java +++ /dev/null @@ -1,37 +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.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; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTUpdater.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTUpdater.java deleted file mode 100644 index 84d0070..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTUpdater.java +++ /dev/null @@ -1,47 +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.data; - -import java.util.Map; -import minetweaker.api.data.IData; -import minetweaker.api.data.IDataConverter; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; - -/** - * - * @author Stan - */ -public class NBTUpdater extends NBTConverter implements IDataConverter { - private final NBTTagCompound nbt; - - public NBTUpdater(NBTTagCompound compound) { - this.nbt = compound; - } - - @Override - public NBTBase fromMap(Map map) { - for (Map.Entry entry : map.entrySet()) { - if (nbt.hasKey(entry.getKey())) { - if (entry.getValue() == null) { - nbt.removeTag(entry.getKey()); - } else { - if (nbt.getTag(entry.getKey()).getId() == 10) { - NBTTagCompound tag = (NBTTagCompound) nbt.getTag(entry.getKey()); - nbt.setTag(entry.getKey(), entry.getValue().convert(new NBTUpdater(nbt))); - } else { - nbt.setTag(entry.getKey(), NBTConverter.from(entry.getValue())); - } - } - } else if (entry.getValue() != null) { - nbt.setTag(entry.getKey(), from(entry.getValue())); - } - } - - return nbt; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java deleted file mode 100644 index 312ad6f..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java +++ /dev/null @@ -1,44 +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.formatting; - -import minetweaker.api.formatting.IFormattedText; -import net.minecraft.util.EnumChatFormatting; - -/** - * - * @author Stan - */ -public class FormattedMarkupString implements IMCFormattedString { - private final EnumChatFormatting markup; - private final IMCFormattedString contents; - - public FormattedMarkupString(EnumChatFormatting markup, IMCFormattedString contents) { - this.markup = markup; - this.contents = contents; - } - - @Override - public String getTooltipString() { - return markup + contents.getTooltipString(markup.toString()); - } - - @Override - public String getTooltipString(String context) { - return markup + contents.getTooltipString(context + markup); - } - - @Override - public IFormattedText add(IFormattedText other) { - return cat(other); - } - - @Override - public IFormattedText cat(IFormattedText other) { - return new FormattedStringJoin(this, (IMCFormattedString) other); - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java deleted file mode 100644 index 6920aea..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java +++ /dev/null @@ -1,41 +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.formatting; - -import minetweaker.api.formatting.IFormattedText; - -/** - * - * @author Stan - */ -public class FormattedString implements IMCFormattedString { - private final String value; - - public FormattedString(String value) { - this.value = value; - } - - @Override - public String getTooltipString() { - return value; - } - - @Override - public String getTooltipString(String context) { - return value; - } - - @Override - public IFormattedText add(IFormattedText other) { - return cat(other); - } - - @Override - public IFormattedText cat(IFormattedText other) { - return new FormattedStringJoin(this, (IMCFormattedString) other); - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java deleted file mode 100644 index 62fc90c..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java +++ /dev/null @@ -1,67 +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.formatting; - -import java.util.Arrays; -import minetweaker.api.formatting.IFormattedText; -import net.minecraft.util.EnumChatFormatting; - -/** - * - * @author Stan - */ -public class FormattedStringJoin implements IMCFormattedString { - private final IMCFormattedString[] values; - - public FormattedStringJoin(IMCFormattedString first, IMCFormattedString second) { - values = new IMCFormattedString[] { first, second }; - } - - public FormattedStringJoin(IMCFormattedString[] values) { - this.values = values; - } - - @Override - public String getTooltipString() { - StringBuilder result = new StringBuilder(); - for (IMCFormattedString value : values) { - result.append(value.getTooltipString()); - } - return result.toString(); - } - - @Override - public String getTooltipString(String context) { - boolean first = true; - - StringBuilder result = new StringBuilder(); - for (IMCFormattedString value : values) { - if (first) { - first = false; - } else { - result.append(context); - } - - result.append(value.getTooltipString()); - result.append(EnumChatFormatting.RESET); - } - - return result.toString(); - } - - @Override - public IFormattedText add(IFormattedText other) { - return cat(other); - } - - @Override - public IFormattedText cat(IFormattedText other) { - IMCFormattedString[] newValues = Arrays.copyOf(values, values.length + 1); - newValues[values.length] = (IMCFormattedString) other; - return new FormattedStringJoin(newValues); - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java deleted file mode 100644 index 36912d6..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java +++ /dev/null @@ -1,19 +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.formatting; - -import minetweaker.api.formatting.IFormattedText; - -/** - * - * @author Stan - */ -public interface IMCFormattedString extends IFormattedText { - public String getTooltipString(); - - public String getTooltipString(String context); -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java deleted file mode 100644 index 35e89f1..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java +++ /dev/null @@ -1,128 +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.formatting; - -import minetweaker.api.formatting.IFormattedText; -import minetweaker.api.formatting.IFormatter; -import net.minecraft.util.EnumChatFormatting; - -/** - * - * @author Stan - */ -public class MCFormatter implements IFormatter { - - @Override - public IFormattedText string(String text) { - return new FormattedString(text); - } - - @Override - public IFormattedText black(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.BLACK, (IMCFormattedString) text); - } - - @Override - public IFormattedText darkBlue(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.DARK_BLUE, (IMCFormattedString) text); - } - - @Override - public IFormattedText darkGreen(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.DARK_GREEN, (IMCFormattedString) text); - } - - @Override - public IFormattedText darkAqua(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.DARK_AQUA, (IMCFormattedString) text); - } - - @Override - public IFormattedText darkRed(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.DARK_RED, (IMCFormattedString) text); - } - - @Override - public IFormattedText darkPurple(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.DARK_PURPLE, (IMCFormattedString) text); - } - - @Override - public IFormattedText gold(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.GOLD, (IMCFormattedString) text); - } - - @Override - public IFormattedText gray(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.GRAY, (IMCFormattedString) text); - } - - @Override - public IFormattedText darkGray(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.DARK_GRAY, (IMCFormattedString) text); - } - - @Override - public IFormattedText blue(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.BLUE, (IMCFormattedString) text); - } - - @Override - public IFormattedText green(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.GREEN, (IMCFormattedString) text); - } - - @Override - public IFormattedText aqua(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.AQUA, (IMCFormattedString) text); - } - - @Override - public IFormattedText red(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.RED, (IMCFormattedString) text); - } - - @Override - public IFormattedText lightPurple(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.LIGHT_PURPLE, (IMCFormattedString) text); - } - - @Override - public IFormattedText yellow(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.YELLOW, (IMCFormattedString) text); - } - - @Override - public IFormattedText white(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.WHITE, (IMCFormattedString) text); - } - - @Override - public IFormattedText obfuscated(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.OBFUSCATED, (IMCFormattedString) text); - } - - @Override - public IFormattedText bold(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.BOLD, (IMCFormattedString) text); - } - - @Override - public IFormattedText strikethrough(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.STRIKETHROUGH, (IMCFormattedString) text); - } - - @Override - public IFormattedText underline(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.UNDERLINE, (IMCFormattedString) text); - } - - @Override - public IFormattedText italic(IFormattedText text) { - return new FormattedMarkupString(EnumChatFormatting.ITALIC, (IMCFormattedString) text); - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/SetFuelPattern.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/SetFuelPattern.java deleted file mode 100644 index 61e724d..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/SetFuelPattern.java +++ /dev/null @@ -1,21 +0,0 @@ -package minetweaker.mc1710.furnace; - -import minetweaker.api.item.IIngredient; - -public class SetFuelPattern { - private final IIngredient pattern; - private final int value; - - public SetFuelPattern(IIngredient pattern, int value) { - this.pattern = pattern; - this.value = value; - } - - public IIngredient getPattern() { - return pattern; - } - - public int getValue() { - return value; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java deleted file mode 100644 index 892cd37..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java +++ /dev/null @@ -1,89 +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.item; - -import java.util.ArrayList; -import java.util.List; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemDefinition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.oredict.IOreDictEntry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCItemDefinition implements IItemDefinition { - private final String id; - private final Item item; - - public MCItemDefinition(String id, Item item) { - this.id = id; - this.item = item; - } - - @Override - public String getId() { - return id; - } - - @Override - public String getName() { - return item.getUnlocalizedName(); - } - - @Override - public IItemStack makeStack(int meta) { - return MineTweakerMC.getIItemStackWildcardSize(new ItemStack(item, 1, meta)); - } - - @Override - public List getOres() { - List result = new ArrayList(); - - for (String key : OreDictionary.getOreNames()) { - for (ItemStack is : OreDictionary.getOres(key)) { - if (is.getItem() == item) { - result.add(MineTweakerAPI.oreDict.get(key)); - break; - } - } - } - - return result; - } - - // ############################# - // ### Object implementation ### - // ############################# - - @Override - public int hashCode() { - int hash = 7; - hash = 37 * hash + (this.item != null ? this.item.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final MCItemDefinition other = (MCItemDefinition) obj; - if (this.item != other.item && (this.item == null || !this.item.equals(other.item))) { - return false; - } - return true; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java deleted file mode 100644 index 42d2203..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java +++ /dev/null @@ -1,37 +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.oredict; - -import java.util.ArrayList; -import java.util.List; -import minetweaker.api.minecraft.MineTweakerMC; -import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; -import minetweaker.api.oredict.IOreDict; -import minetweaker.api.oredict.IOreDictEntry; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCOreDict implements IOreDict { - @Override - public IOreDictEntry get(String name) { - return getOreDict(name); - } - - @Override - public List getEntries() { - List entries = new ArrayList(); - for (String key : OreDictionary.getOreNames()) { - if (!OreDictionary.getOres(key).isEmpty()) { - entries.add(MineTweakerMC.getOreDict(key)); - } - } - return entries; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java deleted file mode 100644 index 6ed425f..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java +++ /dev/null @@ -1,213 +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.recipes; - -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.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.mc1710.player.MCPlayer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotCrafting; -import net.minecraft.item.ItemStack; - -/** - * - * @author Stan - */ -public class MCCraftingInventory implements ICraftingInventory { - private static final ThreadLocal cache = new ThreadLocal(); - private static final ThreadLocal cache2 = new ThreadLocal(); - - public static MCCraftingInventory get(InventoryCrafting inventory) { - if (cache.get() == null || cache.get().inventory != inventory) { - MCCraftingInventory result = new MCCraftingInventory(inventory); - cache.set(result); - return result; - } else { - MCCraftingInventory result = cache.get(); - result.update(); - return result; - } - } - - public static MCCraftingInventory get(IInventory inventory, EntityPlayer player) { - if (cache2.get() == null || cache2.get().inventory != inventory || cache2.get().player != player) { - MCCraftingInventory result = new MCCraftingInventory(inventory, player); - cache2.set(result); - return result; - } else { - MCCraftingInventory result = cache2.get(); - result.update(); - return result; - } - } - - private int width; - private int height; - private final IInventory inventory; - private IItemStack[] stacks; - private ItemStack[] original; - private int stackCount; - private final IPlayer player; - private final EntityPlayer playerOrig; - - private MCCraftingInventory(InventoryCrafting inventory) { - this.inventory = inventory; - width = height = (int) Math.sqrt(inventory.getSizeInventory()); - stacks = new IItemStack[width * height]; - original = new ItemStack[stacks.length]; - stackCount = 0; - update(); - - Container container = MineTweakerHacks.getCraftingContainer(inventory); - if (container != null) { - List slots = container.inventorySlots; - if (!slots.isEmpty() && slots.get(0) instanceof SlotCrafting) { - SlotCrafting slotCrafting = (SlotCrafting) slots.get(0); - playerOrig = MineTweakerHacks.getCraftingSlotPlayer(slotCrafting); - player = getIPlayer(playerOrig); - } else { - playerOrig = null; - player = null; - } - } else { - playerOrig = null; - player = null; - } - } - - public MCCraftingInventory(IInventory inventory, EntityPlayer player) { - this.inventory = inventory; - width = height = (int) Math.sqrt(inventory.getSizeInventory()); - stacks = new IItemStack[width * height]; - original = new ItemStack[stacks.length]; - stackCount = 0; - update(); - - playerOrig = player; - this.player = player == null ? null : new MCPlayer(player); - } - - private void update() { - if (inventory.getSizeInventory() != original.length) { - width = height = (int) Math.sqrt(inventory.getSizeInventory()); - stacks = new IItemStack[inventory.getSizeInventory()]; - original = new ItemStack[stacks.length]; - stackCount = 0; - } - - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (changed(i)) { - // System.out.println("Slot " + i + " changed"); - original[i] = inventory.getStackInSlot(i); - if (inventory.getStackInSlot(i) != null) { - if (stacks[i] == null) - stackCount++; - stacks[i] = getIItemStack(original[i]); - } else { - if (stacks[i] != null) - stackCount--; - stacks[i] = null; - } - } - } - // System.out.println("Num stack count: " + stackCount); - } - - @Override - public IPlayer getPlayer() { - return player; - } - - @Override - public int getSize() { - return width * height; - } - - @Override - public int getWidth() { - return width; - } - - @Override - public int getHeight() { - return height; - } - - @Override - public int getStackCount() { - return stackCount; - } - - @Override - public IItemStack getStack(int i) { - return stacks[i]; - } - - @Override - public IItemStack getStack(int x, int y) { - return stacks[y * width + x]; - } - - @Override - public void setStack(int x, int y, IItemStack stack) { - // System.out.println("SetStack(" + x + ", " + y + ") " + stack); - - int ix = y * width + x; - if (stack != stacks[ix]) { - if (stack == null) { - stackCount--; - inventory.setInventorySlotContents(ix, null); - } else { - inventory.setInventorySlotContents(ix, getItemStack(stack)); - - if (stacks[ix] == null) { - stackCount++; - } - } - stacks[ix] = stack; - } - } - - @Override - public void setStack(int i, IItemStack stack) { - // System.out.println("SetStack(" + i + ") " + stack); - - if (stack != stacks[i]) { - if (stack == null) { - stackCount--; - inventory.setInventorySlotContents(i, null); - } else { - inventory.setInventorySlotContents(i, getItemStack(stack)); - - if (stacks[i] == null) { - stackCount++; - } - } - stacks[i] = stack; - } - } - - private boolean changed(int i) { - if (original[i] != inventory.getStackInSlot(i)) - return true; - if (original[i] != null && stacks[i].getAmount() != original[i].stackSize) - return true; - - return false; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java deleted file mode 100644 index 9afa4da..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java +++ /dev/null @@ -1,181 +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.recipes; - -import minetweaker.api.recipes.ShapedRecipe; -import minetweaker.api.recipes.ShapelessRecipe; -import java.util.ArrayList; -import java.util.Arrays; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ICraftingRecipe; -import minetweaker.api.recipes.UnknownRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -/** - * - * @author Stan - */ -public class RecipeConverter { - private RecipeConverter() { - } - - public static final int TYPE_ADVANCED = 0; - public static final int TYPE_ORE = 1; - public static final int TYPE_BASIC = 2; - - private static int getIngredientType(IIngredient pattern) { - Object internal = pattern.getInternal(); - if (internal == null) { - return TYPE_ADVANCED; - } else if (internal instanceof ItemStack) { - return TYPE_BASIC; - } else { - return TYPE_ORE; - } - } - - private static int getRecipeType(IIngredient[] ingredients) { - int type = TYPE_BASIC; - for (IIngredient ingredient : ingredients) { - type = Math.min(type, getIngredientType(ingredient)); - } - return type; - } - - public static IRecipe convert(ShapelessRecipe recipe) { - IIngredient[] ingredients = recipe.getIngredients(); - int type = getRecipeType(ingredients); - - if (type == TYPE_BASIC) { - ItemStack[] items = new ItemStack[ingredients.length]; - for (int i = 0; i < ingredients.length; i++) { - items[i] = getItemStack(ingredients[i]); - } - return new ShapelessRecipeBasic(items, recipe); - } else if (type == TYPE_ORE) { - Object[] items = new Object[ingredients.length]; - for (int i = 0; i < ingredients.length; i++) { - items[i] = ingredients[i].getInternal(); - } - return new ShapelessRecipeOre(items, recipe); - } else { - return new ShapelessRecipeAdvanced(recipe); - } - } - - public static IRecipe convert(ShapedRecipe recipe) { - IIngredient[] ingredients = recipe.getIngredients(); - byte[] posx = recipe.getIngredientsX(); - byte[] posy = recipe.getIngredientsY(); - - // determine recipe type - int type = getRecipeType(ingredients); - - // construct recipe - if (type == TYPE_BASIC) { - ItemStack[] basicIngredients = new ItemStack[recipe.getHeight() * recipe.getWidth()]; - for (int i = 0; i < ingredients.length; i++) { - basicIngredients[posx[i] + posy[i] * recipe.getWidth()] = getItemStack(ingredients[i]); - } - - return new ShapedRecipeBasic(basicIngredients, recipe); - } else if (type == TYPE_ORE) { - Object[] converted = new Object[recipe.getHeight() * recipe.getWidth()]; - for (int i = 0; i < ingredients.length; i++) { - converted[posx[i] + posy[i] * recipe.getWidth()] = ingredients[i].getInternal(); - } - - // arguments contents: - // 1) recipe patterns - // 2) characters + ingredients - - int counter = 0; - String[] parts = new String[recipe.getHeight()]; - ArrayList rarguments = new ArrayList(); - for (int i = 0; i < recipe.getHeight(); i++) { - char[] pattern = new char[recipe.getWidth()]; - for (int j = 0; j < recipe.getWidth(); j++) { - int off = i * recipe.getWidth() + j; - if (converted[off] == null) { - pattern[j] = ' '; - } else { - pattern[j] = (char) ('A' + counter); - rarguments.add(pattern[j]); - rarguments.add(converted[off]); - counter++; - } - } - parts[i] = new String(pattern); - } - - rarguments.addAll(0, Arrays.asList(parts)); - - return new ShapedRecipeOre(rarguments.toArray(), recipe); - } else { - return new ShapedRecipeAdvanced(recipe); - } - } - - public static ICraftingRecipe toCraftingRecipe(IRecipe recipe) { - IItemStack output = MineTweakerMC.getIItemStack(recipe.getRecipeOutput()); - - if (recipe instanceof ShapelessRecipes) { - ShapelessRecipes shapeless = (ShapelessRecipes) recipe; - - IIngredient[] ingredients = new IIngredient[shapeless.recipeItems.size()]; - for (int i = 0; i < ingredients.length; i++) { - ingredients[i] = MineTweakerMC.getIIngredient(shapeless.recipeItems.get(i)); - } - - return new ShapelessRecipe(output, ingredients, null); - } else if (recipe instanceof ShapedRecipes) { - ShapedRecipes shaped = (ShapedRecipes) recipe; - - IIngredient[][] ingredients = new IIngredient[shaped.recipeHeight][shaped.recipeWidth]; - for (int i = 0; i < shaped.recipeHeight; i++) { - for (int j = 0; j < shaped.recipeWidth; j++) { - ingredients[i][j] = MineTweakerMC.getIItemStack(shaped.recipeItems[i * shaped.recipeWidth + j]); - } - } - - return new ShapedRecipe(output, ingredients, null, false); - } else if (recipe instanceof ShapedOreRecipe) { - ShapedOreRecipe shaped = (ShapedOreRecipe) recipe; - - int width = (int) Math.sqrt(recipe.getRecipeSize()); - int height = recipe.getRecipeSize() / width; - - IIngredient[][] recipeIngredients = new IIngredient[height][width]; - for (int i = 0; i < height; i++) { - for (int j = 0; j < width; j++) { - recipeIngredients[i][j] = MineTweakerMC.getIIngredient(shaped.getInput()[i * width + j]); - } - } - - return new ShapedRecipe(output, recipeIngredients, null, false); - } else if (recipe instanceof ShapelessOreRecipe) { - ShapelessOreRecipe shapeless = (ShapelessOreRecipe) recipe; - - IIngredient[] ingredients = new IIngredient[shapeless.getRecipeSize()]; - for (int i = 0; i < ingredients.length; i++) { - ingredients[i] = MineTweakerMC.getIIngredient(shapeless.getInput().get(i)); - } - - return new ShapelessRecipe(output, ingredients, null); - } else { - return new UnknownRecipe(output); - } - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java deleted file mode 100644 index 8910351..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java +++ /dev/null @@ -1,44 +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.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; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.world.World; - -/** - * - * @author Stan - */ -public class ShapedRecipeBasic extends ShapedRecipes { - private final ShapedRecipe recipe; - - public ShapedRecipeBasic(ItemStack[] basicInputs, ShapedRecipe recipe) { - super(recipe.getWidth(), recipe.getHeight(), basicInputs, getItemStack(recipe.getOutput())); - - this.recipe = recipe; - } - - @Override - public boolean matches(InventoryCrafting inventory, World world) { - return recipe.matches(MCCraftingInventory.get(inventory)); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inventory) { - IItemStack result = recipe.getCraftingResult(MCCraftingInventory.get(inventory)); - if (result == null) { - return null; - } else { - return getItemStack(result).copy(); - } - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java deleted file mode 100644 index 3a8bd43..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java +++ /dev/null @@ -1,38 +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.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapelessRecipe; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -/** - * - * @author Stan - */ -public class ShapelessRecipeOre extends ShapelessOreRecipe { - private final ShapelessRecipe recipe; - - public ShapelessRecipeOre(Object[] ingredients, ShapelessRecipe recipe) { - super(getItemStack(recipe.getOutput()), ingredients); - - this.recipe = recipe; - } - - @Override - public boolean matches(InventoryCrafting inventory, World world) { - return recipe.matches(MCCraftingInventory.get(inventory)); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inventory) { - return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy(); - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java deleted file mode 100644 index b3a3a52..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/ServerPlayer.java +++ /dev/null @@ -1,126 +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.server; - -import java.awt.Desktop; -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.StringSelection; -import java.io.IOException; -import java.net.URI; -import java.util.logging.Level; -import java.util.logging.Logger; -import minetweaker.api.chat.IChatMessage; -import minetweaker.api.data.IData; -import minetweaker.api.item.IItemStack; -import minetweaker.api.player.IPlayer; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - -/** - * - * @author Stan - */ -public class ServerPlayer implements IPlayer { - public static final ServerPlayer INSTANCE = new ServerPlayer(); - - private ServerPlayer() { - - } - - @Override - public String getId() { - return "server"; - } - - @Override - public String getName() { - return "Server"; - } - - @Override - public IData getData() { - // TODO: implement - return null; - } - - @Override - public void update(IData data) { - // TODO: implement - } - - @Override - public void sendChat(IChatMessage message) { - DedicatedServer.getServer().addChatMessage((IChatComponent) message.getInternal()); - } - - @Override - public void sendChat(String message) { - DedicatedServer.getServer().addChatMessage(new ChatComponentText(message)); - } - - @Override - public int getHotbarSize() { - return 0; - } - - @Override - public IItemStack getHotbarStack(int i) { - return null; - } - - @Override - public int getInventorySize() { - return 0; - } - - @Override - public IItemStack getInventoryStack(int i) { - return null; - } - - @Override - public IItemStack getCurrentItem() { - return null; - } - - @Override - public boolean isCreative() { - return true; - } - - @Override - public boolean isAdventure() { - return false; - } - - @Override - public void openBrowser(String url) { - if (Desktop.isDesktopSupported()) { - try { - Desktop.getDesktop().browse(URI.create(url)); - } catch (IOException ex) { - Logger.getLogger(ServerPlayer.class.getName()).log(Level.SEVERE, null, ex); - } - } - } - - @Override - public void copyToClipboard(String value) { - if (Desktop.isDesktopSupported()) { - StringSelection stringSelection = new StringSelection(value); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(stringSelection, null); - } - } - - @Override - public void give(IItemStack stack) { - - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java deleted file mode 100644 index 0c7eb62..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java +++ /dev/null @@ -1,25 +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; - -/** - * - * @author Stanneke - */ -public class MineTweakerObfuscation { - private MineTweakerObfuscation() { - } - - public static final String[] NBTTAGLIST_TAGLIST = { "tagList", "field_74747_a" }; - public static final String[] CRAFTINGMANAGER_RECIPES = { "recipes", "field_77597_b" }; - public static final String[] OREDICTIONARY_IDTOSTACK = { "idToStack" }; - public static final String[] OREDICTIONARY_IDTOSTACKUN = { "idToStackUn" }; - public static final String[] MINECRAFTSERVER_ANVILFILE = { "anvilFile", "field_71308_o" }; - public static final String[] INVENTORYCRAFTING_EVENTHANDLER = { "eventHandler", "field_70465_c" }; - public static final String[] SLOTCRAFTING_PLAYER = { "thePlayer", "field_75238_b" }; - public static final String[] STRINGTRANSLATE_INSTANCE = { "instance", "field_74817_a" }; -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java deleted file mode 100644 index 0340b52..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java +++ /dev/null @@ -1,149 +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.vanilla; - -import java.util.ArrayList; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.vanilla.ISeedRegistry; -import minetweaker.mc1710.util.MineTweakerHacks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - -/** - * - * @author Stan - */ -public class MCSeedRegistry implements ISeedRegistry { - private static final List SEEDS = MineTweakerHacks.getSeeds(); - - @Override - public void addSeed(WeightedItemStack item) { - MineTweakerAPI.apply(new AddSeedAction(item)); - } - - @Override - public void removeSeed(IIngredient pattern) { - MineTweakerAPI.apply(new RemoveSeedAction(pattern)); - } - - @Override - public List getSeeds() { - List entries = (List) SEEDS; - - List results = new ArrayList(); - for (WeightedRandom.Item entry : entries) { - results.add(new WeightedItemStack( - MineTweakerMC.getIItemStack(MineTweakerHacks.getSeedEntrySeed(entry)), - entry.itemWeight - )); - } - return results; - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddSeedAction implements IUndoableAction { - private final IItemStack item; - private final WeightedRandom.Item entry; - - public AddSeedAction(WeightedItemStack item) { - this.item = item.getStack(); - entry = MineTweakerHacks.constructSeedEntry(item); - } - - @Override - public void apply() { - SEEDS.add(entry); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - SEEDS.remove(entry); - } - - @Override - public String describe() { - return "Adding seed entry " + item; - } - - @Override - public String describeUndo() { - return "Removing seed entry " + item; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveSeedAction implements IUndoableAction { - private final IIngredient pattern; - private final List removed; - - public RemoveSeedAction(IIngredient ingredient) { - this.pattern = ingredient; - removed = new ArrayList(); - } - - @Override - public void apply() { - removed.clear(); - - for (Object entry : SEEDS) { - ItemStack itemStack = MineTweakerHacks.getSeedEntrySeed(entry); - if (pattern.matches(MineTweakerMC.getIItemStack(itemStack))) { - removed.add(entry); - } - } - - for (Object entry : removed) { - SEEDS.remove(entry); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (Object entry : removed) { - SEEDS.add(entry); - } - } - - @Override - public String describe() { - return "Removing seeds " + pattern; - } - - @Override - public String describeUndo() { - return "Restoring seeds " + pattern + " (" + removed.size() + " entries)"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCVanilla.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCVanilla.java deleted file mode 100644 index f906614..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCVanilla.java +++ /dev/null @@ -1,30 +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.vanilla; - -import minetweaker.api.vanilla.ILootRegistry; -import minetweaker.api.vanilla.ISeedRegistry; -import minetweaker.api.vanilla.IVanilla; - -/** - * - * @author Stan - */ -public class MCVanilla implements IVanilla { - private final MCLootRegistry lootRegistry = new MCLootRegistry(); - private final MCSeedRegistry seedRegistry = new MCSeedRegistry(); - - @Override - public ILootRegistry getLoot() { - return lootRegistry; - } - - @Override - public ISeedRegistry getSeeds() { - return seedRegistry; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/world/MCBiome.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/world/MCBiome.java deleted file mode 100644 index f355077..0000000 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/world/MCBiome.java +++ /dev/null @@ -1,27 +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.world; - -import minetweaker.api.world.IBiome; -import net.minecraft.world.biome.BiomeGenBase; - -/** - * - * @author Stan - */ -public class MCBiome implements IBiome { - private final BiomeGenBase biome; - - public MCBiome(BiomeGenBase biome) { - this.biome = biome; - } - - @Override - public String getName() { - return biome.biomeName; - } -} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java similarity index 93% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java index 7880546..4bde714 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java @@ -1,4 +1,4 @@ -package minetweaker.mc1710; +package minetweaker.mc19; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -8,8 +8,8 @@ import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; -import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; -import minetweaker.mc1710.recipes.MCCraftingInventory; +import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; +import minetweaker.mc19.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java index 657effb..5bd9b83 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710; +package minetweaker.mc19; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import minetweaker.MineTweakerImplementationAPI; @@ -12,7 +12,7 @@ import minetweaker.api.formatting.IFormattedText; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.tooltip.IngredientTooltips; -import minetweaker.mc1710.formatting.IMCFormattedString; +import minetweaker.mc19.formatting.IMCFormattedString; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.lwjgl.input.Keyboard; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/GuiCannotRemodify.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java similarity index 98% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/GuiCannotRemodify.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java index 5b84a46..324fca8 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/GuiCannotRemodify.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java @@ -1,4 +1,4 @@ -package minetweaker.mc18; +package minetweaker.mc19; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java similarity index 80% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java index 6534b2a..c5cf80e 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java @@ -4,15 +4,15 @@ * and open the template in the editor. */ -package minetweaker.mc1710; +package minetweaker.mc19; import minetweaker.IPlatformFunctions; import minetweaker.api.chat.IChatMessage; import minetweaker.api.item.IItemDefinition; -import static minetweaker.mc1710.MineTweakerMod.NETWORK; -import minetweaker.mc1710.chat.MCChatMessage; -import minetweaker.mc1710.item.MCItemDefinition; -import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; +import static minetweaker.mc19.MineTweakerMod.NETWORK; +import minetweaker.mc19.chat.MCChatMessage; +import minetweaker.mc19.item.MCItemDefinition; +import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; import net.minecraft.item.Item; /** diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java similarity index 84% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java index 730c1b3..c9ffa63 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710; +package minetweaker.mc19; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -25,26 +25,26 @@ import java.io.File; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; -import minetweaker.mc1710.brackets.ItemBracketHandler; -import minetweaker.mc1710.brackets.LiquidBracketHandler; -import minetweaker.mc1710.client.MCClient; -import minetweaker.mc1710.formatting.MCFormatter; -import minetweaker.mc1710.furnace.FuelTweaker; -import minetweaker.mc1710.furnace.MCFurnaceManager; -import minetweaker.mc1710.game.MCGame; -import minetweaker.mc1710.mods.MCLoadedMods; -import minetweaker.mc1710.network.MineTweakerCopyClipboardHandler; -import minetweaker.mc1710.network.MineTweakerCopyClipboardPacket; -import minetweaker.mc1710.network.MineTweakerLoadScriptsHandler; -import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; -import minetweaker.mc1710.network.MineTweakerOpenBrowserHandler; -import minetweaker.mc1710.network.MineTweakerOpenBrowserPacket; -import minetweaker.mc1710.oredict.MCOreDict; -import minetweaker.mc1710.recipes.MCRecipeManager; -import minetweaker.mc1710.server.MCServer; -import minetweaker.mc1710.util.MineTweakerHacks; -import minetweaker.mc1710.util.MineTweakerPlatformUtils; -import minetweaker.mc1710.vanilla.MCVanilla; +import minetweaker.mc19.brackets.ItemBracketHandler; +import minetweaker.mc19.brackets.LiquidBracketHandler; +import minetweaker.mc19.client.MCClient; +import minetweaker.mc19.formatting.MCFormatter; +import minetweaker.mc19.furnace.FuelTweaker; +import minetweaker.mc19.furnace.MCFurnaceManager; +import minetweaker.mc19.game.MCGame; +import minetweaker.mc19.mods.MCLoadedMods; +import minetweaker.mc19.network.MineTweakerCopyClipboardHandler; +import minetweaker.mc19.network.MineTweakerCopyClipboardPacket; +import minetweaker.mc19.network.MineTweakerLoadScriptsHandler; +import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; +import minetweaker.mc19.network.MineTweakerOpenBrowserHandler; +import minetweaker.mc19.network.MineTweakerOpenBrowserPacket; +import minetweaker.mc19.oredict.MCOreDict; +import minetweaker.mc19.recipes.MCRecipeManager; +import minetweaker.mc19.server.MCServer; +import minetweaker.mc19.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerPlatformUtils; +import minetweaker.mc19.vanilla.MCVanilla; import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java similarity index 93% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerRegistry.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java index 87c8181..52c4bb6 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerRegistry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18; +package minetweaker.mc19; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java index cdfb8b2..15be30a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java @@ -4,13 +4,12 @@ * and open the template in the editor. */ -package minetweaker.mc1710.actions; +package minetweaker.mc19.actions; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.ReflectionHelper; /** * diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetStackSizeAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetStackSizeAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java index 300e25a..279eedb 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetStackSizeAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.actions; +package minetweaker.mc19.actions; import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetStackmaxDamageAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetStackmaxDamageAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java index 2eb7c88..00f06f3 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetStackmaxDamageAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.actions; +package minetweaker.mc19.actions; import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetTranslationAction.java similarity index 94% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetTranslationAction.java index 0f889b4..e40f551 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetTranslationAction.java @@ -4,12 +4,12 @@ * and open the template in the editor. */ -package minetweaker.mc1710.actions; +package minetweaker.mc19.actions; import java.io.ByteArrayInputStream; import java.nio.charset.Charset; import minetweaker.IUndoableAction; -import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerHacks; import net.minecraft.util.StringTranslate; /** diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java index d300b98..ed7256d 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.block; +package minetweaker.mc19.block; import minetweaker.api.block.IBlockDefinition; import net.minecraft.block.Block; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCItemBlock.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCItemBlock.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java index 1cd153e..4c93f37 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCItemBlock.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.block; +package minetweaker.mc19.block; import java.util.Collections; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java index 352101c..de20eff 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.block; +package minetweaker.mc19.block; import java.util.Collections; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java index 70d659d..ac0b44a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.block; +package minetweaker.mc19.block; import java.util.Collections; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java index 773f50d..2ae8ebf 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.brackets; +package minetweaker.mc19.brackets; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java index 8473478..482a50f 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java @@ -1,4 +1,4 @@ -package minetweaker.mc1710.brackets; +package minetweaker.mc19.brackets; import java.util.HashMap; import java.util.List; @@ -6,7 +6,7 @@ import java.util.Map; import minetweaker.IBracketHandler; import minetweaker.annotations.BracketHandler; -import minetweaker.mc1710.liquid.MCLiquidStack; +import minetweaker.mc19.liquid.MCLiquidStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.runtime.GlobalRegistry; import net.minecraftforge.fluids.Fluid; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java index 150900f..fa7f9c8 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/OreBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.brackets; +package minetweaker.mc19.brackets; import java.util.ArrayList; import java.util.List; @@ -12,8 +12,8 @@ import java.util.regex.Pattern; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; +import minetweaker.mc19.oredict.MCOreDictEntry; import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.mc18.oredict.MCOreDictEntry; import minetweaker.runtime.GlobalRegistry; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/chat/MCChatMessage.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java similarity index 96% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/chat/MCChatMessage.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java index 0e6d4ec..b9098cd 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/chat/MCChatMessage.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.chat; +package minetweaker.mc19.chat; import minetweaker.api.chat.IChatMessage; import net.minecraft.util.ChatComponentText; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/client/MCClient.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/client/MCClient.java index 3cb694c..c27c74a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/client/MCClient.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.client; +package minetweaker.mc19.client; import cpw.mods.fml.client.FMLClientHandler; import minetweaker.api.client.IClient; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTConverter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTConverter.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java index 0fc6199..f8c4994 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTConverter.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java @@ -4,14 +4,14 @@ * and open the template in the editor. */ -package minetweaker.mc1710.data; +package minetweaker.mc19.data; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerHacks; import minetweaker.api.data.DataByte; import minetweaker.api.data.DataByteArray; import minetweaker.api.data.DataDouble; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/data/NBTUpdater.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/data/NBTUpdater.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java index 7c46069..9ca16df 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/data/NBTUpdater.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java @@ -4,10 +4,9 @@ * and open the template in the editor. */ -package minetweaker.mc18.data; +package minetweaker.mc19.data; import java.util.Map; - import minetweaker.api.data.IData; import minetweaker.api.data.IDataConverter; import net.minecraft.nbt.NBTBase; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java index 758a0c8..cdd8945 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.entity; +package minetweaker.mc19.entity; import cpw.mods.fml.common.registry.EntityRegistry; import minetweaker.api.entity.IEntityDefinition; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedMarkupString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java similarity index 96% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedMarkupString.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java index b467a06..e6967b1 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedMarkupString.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.formatting; +package minetweaker.mc19.formatting; import minetweaker.api.formatting.IFormattedText; import net.minecraft.util.EnumChatFormatting; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java similarity index 95% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedString.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java index be738e0..b2c0610 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedString.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.formatting; +package minetweaker.mc19.formatting; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedStringJoin.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedStringJoin.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java index 1452c14..6c394ff 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/FormattedStringJoin.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java @@ -4,10 +4,9 @@ * and open the template in the editor. */ -package minetweaker.mc18.formatting; +package minetweaker.mc19.formatting; import java.util.Arrays; - import minetweaker.api.formatting.IFormattedText; import net.minecraft.util.EnumChatFormatting; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/IMCFormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java similarity index 91% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/IMCFormattedString.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java index b91b71d..0eef75c 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/IMCFormattedString.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.formatting; +package minetweaker.mc19.formatting; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/MCFormatter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java similarity index 99% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/MCFormatter.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java index 57690a8..fe69d01 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/formatting/MCFormatter.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.formatting; +package minetweaker.mc19.formatting; import minetweaker.api.formatting.IFormattedText; import minetweaker.api.formatting.IFormatter; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java index a05f20e..1291879 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.furnace; +package minetweaker.mc19.furnace; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java index ff42961..f40bb7c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.furnace; +package minetweaker.mc19.furnace; import cpw.mods.fml.common.registry.GameRegistry; import java.util.ArrayList; @@ -17,7 +17,7 @@ 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.mc19.item.MCItemStack; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/SetFuelPattern.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java similarity index 91% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/SetFuelPattern.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java index 31d8098..2ee5383 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/SetFuelPattern.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java @@ -1,4 +1,4 @@ -package minetweaker.mc18.furnace; +package minetweaker.mc19.furnace; import minetweaker.api.item.IIngredient; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/game/MCGame.java similarity index 93% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/game/MCGame.java index 2a8517b..4329344 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/game/MCGame.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.game; +package minetweaker.mc19.game; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -22,12 +22,12 @@ import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; // TODO Find this -// import minetweaker.mc1710.GuiCannotRemodify; -import minetweaker.mc1710.entity.MCEntityDefinition; -import minetweaker.mc1710.item.MCItemDefinition; -import minetweaker.mc1710.liquid.MCLiquidDefinition; -import minetweaker.mc1710.util.MineTweakerHacks; -import minetweaker.mc1710.util.MineTweakerPlatformUtils; +// import minetweaker.mc19.GuiCannotRemodify; +import minetweaker.mc19.entity.MCEntityDefinition; +import minetweaker.mc19.item.MCItemDefinition; +import minetweaker.mc19.liquid.MCLiquidDefinition; +import minetweaker.mc19.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerPlatformUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java similarity index 98% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java index fa843e0..20182bf 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java @@ -4,11 +4,10 @@ * and open the template in the editor. */ -package minetweaker.mc18.item; +package minetweaker.mc19.item; import java.util.ArrayList; import java.util.List; - import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemDefinition; import minetweaker.api.item.IItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java index 56dcb11..1a8a798 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.item; +package minetweaker.mc19.item; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; @@ -28,13 +28,13 @@ import minetweaker.api.item.WeightedItemStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; -import minetweaker.mc1710.actions.SetBlockHardnessAction; -import minetweaker.mc1710.actions.SetStackSizeAction; -import minetweaker.mc1710.actions.SetStackmaxDamageAction; -import minetweaker.mc1710.actions.SetTranslationAction; -import minetweaker.mc1710.block.MCItemBlock; -import minetweaker.mc1710.data.NBTConverter; -import minetweaker.mc1710.liquid.MCLiquidStack; +import minetweaker.mc19.actions.SetBlockHardnessAction; +import minetweaker.mc19.actions.SetStackSizeAction; +import minetweaker.mc19.actions.SetStackmaxDamageAction; +import minetweaker.mc19.actions.SetTranslationAction; +import minetweaker.mc19.block.MCItemBlock; +import minetweaker.mc19.data.NBTConverter; +import minetweaker.mc19.liquid.MCLiquidStack; import minetweaker.util.ArrayUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java index fb52167..3548488 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.liquid; +package minetweaker.mc19.liquid; import java.util.ArrayList; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java index 8df2d3e..0760536 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java @@ -4,11 +4,11 @@ * and open the template in the editor. */ -package minetweaker.mc1710.liquid; +package minetweaker.mc19.liquid; import java.util.Collections; import java.util.List; -import minetweaker.mc1710.data.NBTConverter; +import minetweaker.mc19.data.NBTConverter; import minetweaker.api.data.IData; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java index e9517bc..44e0d81 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java @@ -1,4 +1,4 @@ -package minetweaker.mc1710.mods; +package minetweaker.mc19.mods; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCMod.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCMod.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCMod.java index 3ec189a..e300a8a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCMod.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.mods; +package minetweaker.mc19.mods; import cpw.mods.fml.common.ModContainer; import minetweaker.api.mods.IMod; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java index 8db755e..cfd1c11 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.network; +package minetweaker.mc19.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardPacket.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardPacket.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardPacket.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardPacket.java index d04e81d..58cdef3 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardPacket.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardPacket.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.network; +package minetweaker.mc19.network; import static com.google.common.base.Charsets.UTF_8; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerLoadScriptsHandler.java similarity index 92% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerLoadScriptsHandler.java index 89abe66..95199f1 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerLoadScriptsHandler.java @@ -4,14 +4,14 @@ * and open the template in the editor. */ -package minetweaker.mc1710.network; +package minetweaker.mc19.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; -import minetweaker.mc1710.client.MCClient; +import minetweaker.mc19.client.MCClient; import minetweaker.runtime.providers.ScriptProviderMemory; /** diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsPacket.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerLoadScriptsPacket.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsPacket.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerLoadScriptsPacket.java index 69f9d65..ac32cab 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsPacket.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerLoadScriptsPacket.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.network; +package minetweaker.mc19.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerOpenBrowserHandler.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerOpenBrowserHandler.java index e8bccd5..e2f238e 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerOpenBrowserHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.network; +package minetweaker.mc19.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserPacket.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerOpenBrowserPacket.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserPacket.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerOpenBrowserPacket.java index 05766cc..b7d6c70 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserPacket.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerOpenBrowserPacket.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.network; +package minetweaker.mc19.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDict.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/oredict/MCOreDict.java similarity index 96% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDict.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/oredict/MCOreDict.java index 85122b7..ab5fff0 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDict.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/oredict/MCOreDict.java @@ -4,14 +4,12 @@ * and open the template in the editor. */ -package minetweaker.mc18.oredict; - -import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; +package minetweaker.mc19.oredict; import java.util.ArrayList; import java.util.List; - import minetweaker.api.minecraft.MineTweakerMC; +import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; import minetweaker.api.oredict.IOreDict; import minetweaker.api.oredict.IOreDictEntry; import net.minecraftforge.oredict.OreDictionary; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java index 19297da..593cc41 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java @@ -4,14 +4,14 @@ * and open the template in the editor. */ -package minetweaker.mc1710.oredict; +package minetweaker.mc19.oredict; import java.util.ArrayList; import java.util.Collections; import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; -import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerHacks; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/player/MCPlayer.java similarity index 92% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/player/MCPlayer.java index 3339b58..08bdb83 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/player/MCPlayer.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.player; +package minetweaker.mc19.player; import minetweaker.MineTweakerAPI; import minetweaker.api.chat.IChatMessage; @@ -12,10 +12,10 @@ import minetweaker.api.data.IData; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; -import minetweaker.mc1710.MineTweakerMod; -import minetweaker.mc1710.data.NBTConverter; -import minetweaker.mc1710.network.MineTweakerCopyClipboardPacket; -import minetweaker.mc1710.network.MineTweakerOpenBrowserPacket; +import minetweaker.mc19.MineTweakerMod; +import minetweaker.mc19.data.NBTConverter; +import minetweaker.mc19.network.MineTweakerCopyClipboardPacket; +import minetweaker.mc19.network.MineTweakerOpenBrowserPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChatComponentText; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/RconPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/player/RconPlayer.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/RconPlayer.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/player/RconPlayer.java index 0cfef48..30aaf92 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/RconPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/player/RconPlayer.java @@ -1,4 +1,4 @@ -package minetweaker.mc1710.player; +package minetweaker.mc19.player; import minetweaker.MineTweakerAPI; import minetweaker.api.chat.IChatMessage; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/MCCraftingInventory.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/MCCraftingInventory.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/MCCraftingInventory.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/MCCraftingInventory.java index f384262..0e72aab 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/MCCraftingInventory.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/MCCraftingInventory.java @@ -4,19 +4,18 @@ * and open the template in the editor. */ -package minetweaker.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIPlayer; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +package minetweaker.mc19.recipes; import java.util.List; +import minetweaker.mc19.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.mc18.player.MCPlayer; -import minetweaker.mc18.util.MineTweakerHacks; +import minetweaker.mc19.player.MCPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java index ed148a8..cbeaa31 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java @@ -1,4 +1,4 @@ -package minetweaker.mc1710.recipes; +package minetweaker.mc19.recipes; import minetweaker.api.recipes.ShapedRecipe; import minetweaker.api.recipes.ShapelessRecipe; @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; -import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerHacks; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/RecipeConverter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/RecipeConverter.java similarity index 99% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/RecipeConverter.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/RecipeConverter.java index dde1e69..c040e74 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/RecipeConverter.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/RecipeConverter.java @@ -4,19 +4,17 @@ * and open the template in the editor. */ -package minetweaker.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +package minetweaker.mc19.recipes; +import minetweaker.api.recipes.ShapedRecipe; +import minetweaker.api.recipes.ShapelessRecipe; import java.util.ArrayList; import java.util.Arrays; - import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.recipes.ICraftingRecipe; -import minetweaker.api.recipes.ShapedRecipe; -import minetweaker.api.recipes.ShapelessRecipe; import minetweaker.api.recipes.UnknownRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeAdvanced.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeAdvanced.java index 34196ae..82a0ae2 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeAdvanced.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.recipes; +package minetweaker.mc19.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.recipes.ShapedRecipe; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeBasic.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeBasic.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeBasic.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeBasic.java index 29564d2..1f10aea 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeBasic.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeBasic.java @@ -4,10 +4,10 @@ * and open the template in the editor. */ -package minetweaker.mc18.recipes; +package minetweaker.mc19.recipes; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; 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; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeOre.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeOre.java index 8b90305..0344a0f 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapedRecipeOre.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.recipes; +package minetweaker.mc19.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.recipes.ShapedRecipe; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeAdvanced.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeAdvanced.java index e2a9850..c314530 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeAdvanced.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.recipes; +package minetweaker.mc19.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.recipes.ShapelessRecipe; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeBasic.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeBasic.java index 6997da1..1022545 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeBasic.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.recipes; +package minetweaker.mc19.recipes; import minetweaker.api.recipes.ShapelessRecipe; import java.util.Arrays; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeOre.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeOre.java similarity index 96% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeOre.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeOre.java index bf717b0..d8adfdb 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeOre.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/recipes/ShapelessRecipeOre.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.recipes; +package minetweaker.mc19.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import minetweaker.api.recipes.ShapelessRecipe; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/server/MCServer.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/server/MCServer.java index 4f0d933..6e016a3 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/server/MCServer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/server/MCServer.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.server; +package minetweaker.mc19.server; import java.util.Arrays; import java.util.List; @@ -17,7 +17,7 @@ import minetweaker.api.server.AbstractServer; import minetweaker.api.server.ICommandFunction; import minetweaker.api.server.ICommandTabCompletion; import minetweaker.api.server.ICommandValidator; -import minetweaker.mc1710.player.RconPlayer; +import minetweaker.mc19.player.RconPlayer; import net.minecraft.command.CommandHandler; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/ServerPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/server/ServerPlayer.java similarity index 98% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/ServerPlayer.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/server/ServerPlayer.java index 772f8c6..f4b83ae 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/ServerPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/server/ServerPlayer.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.server; +package minetweaker.mc19.server; import java.awt.Desktop; import java.awt.Toolkit; @@ -14,7 +14,6 @@ import java.io.IOException; import java.net.URI; import java.util.logging.Level; import java.util.logging.Logger; - import minetweaker.api.chat.IChatMessage; import minetweaker.api.data.IData; import minetweaker.api.item.IItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerHacks.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerHacks.java index 243eb50..680a6e1 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerHacks.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.util; +package minetweaker.mc19.util; import com.google.common.collect.BiMap; import cpw.mods.fml.common.registry.EntityRegistry; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerObfuscation.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerObfuscation.java similarity index 96% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerObfuscation.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerObfuscation.java index 08d1267..20ad4b5 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerObfuscation.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerObfuscation.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.util; +package minetweaker.mc19.util; /** * diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerPlatformUtils.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerPlatformUtils.java index 036f90c..846c7e1 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/util/MineTweakerPlatformUtils.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.util; +package minetweaker.mc19.util; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCLootRegistry.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCLootRegistry.java index 95ea083..7fbb406 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCLootRegistry.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.vanilla; +package minetweaker.mc19.vanilla; import java.util.ArrayList; import java.util.List; @@ -17,7 +17,7 @@ import minetweaker.api.item.WeightedItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.vanilla.ILootRegistry; import minetweaker.api.vanilla.LootEntry; -import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerHacks; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCSeedRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCSeedRegistry.java similarity index 97% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCSeedRegistry.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCSeedRegistry.java index 6f61973..49af26d 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCSeedRegistry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCSeedRegistry.java @@ -4,11 +4,10 @@ * and open the template in the editor. */ -package minetweaker.mc18.vanilla; +package minetweaker.mc19.vanilla; import java.util.ArrayList; import java.util.List; - import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -16,7 +15,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.item.WeightedItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.vanilla.ISeedRegistry; -import minetweaker.mc18.util.MineTweakerHacks; +import minetweaker.mc19.util.MineTweakerHacks; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandom; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCVanilla.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCVanilla.java similarity index 95% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCVanilla.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCVanilla.java index 0a9007b..adcf6df 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCVanilla.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/vanilla/MCVanilla.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.vanilla; +package minetweaker.mc19.vanilla; import minetweaker.api.vanilla.ILootRegistry; import minetweaker.api.vanilla.ISeedRegistry; diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/world/MCBiome.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/world/MCBiome.java similarity index 94% rename from MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/world/MCBiome.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/world/MCBiome.java index e1a85f1..11a6b2a 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/world/MCBiome.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/world/MCBiome.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc18.world; +package minetweaker.mc19.world; import minetweaker.api.world.IBiome; import net.minecraft.world.biome.BiomeGenBase; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/world/MCDimension.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/world/MCDimension.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/world/MCDimension.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/world/MCDimension.java index 8c28ddb..15b6167 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/world/MCDimension.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/world/MCDimension.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc1710.world; +package minetweaker.mc19.world; import minetweaker.api.block.IBlock; import minetweaker.api.minecraft.MineTweakerMC; diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/build.gradle b/MineTweaker3-MC1710-Mod-Buildcraft/build.gradle deleted file mode 100644 index 6fa598b..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -apply plugin: 'forge' - -minecraft { - version = forgeVersion1710 -} - -version = "1.0" -archivesBaseName = project.projectDir.name - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') - compile project(':MineTweaker3-MC1710-Main') - compile files('libs/buildcraft-6.0.18-dev.jar') -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mods.buildcraft.ClassRegistry' -} - -tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/libs/buildcraft-6.0.18-dev.jar b/MineTweaker3-MC1710-Mod-Buildcraft/libs/buildcraft-6.0.18-dev.jar deleted file mode 100644 index 7ea0760..0000000 Binary files a/MineTweaker3-MC1710-Mod-Buildcraft/libs/buildcraft-6.0.18-dev.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/libs/buildcraft-6.1.5-dev.jar b/MineTweaker3-MC1710-Mod-Buildcraft/libs/buildcraft-6.1.5-dev.jar deleted file mode 100644 index 0e0c659..0000000 Binary files a/MineTweaker3-MC1710-Mod-Buildcraft/libs/buildcraft-6.1.5-dev.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/AssemblyTable.java b/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/AssemblyTable.java deleted file mode 100644 index 712cc7c..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/AssemblyTable.java +++ /dev/null @@ -1,185 +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.mods.buildcraft; - -import buildcraft.api.recipes.BuildcraftRecipes; -import buildcraft.core.recipes.AssemblyRecipeManager; -import buildcraft.core.recipes.AssemblyRecipeManager.AssemblyRecipe; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.buildcraft.AssemblyTable") -@ModOnly(value="BuildCraft|Core", version="6.0") -public class AssemblyTable { - @ZenMethod - public static void addRecipe(IItemStack output, double energy, IIngredient[] ingredients) { - MineTweakerAPI.apply(new AddRecipeAction(output, energy, ingredients)); - } - - @ZenMethod - public static void remove(IIngredient output) { - removeRecipe(output, null, false); - } - - @ZenMethod - public static void removeRecipe(IIngredient output, @Optional IIngredient[] ingredients, @Optional boolean wildcard) { - List toRemove = new ArrayList(); - - outer: for (AssemblyRecipe recipe : ((AssemblyRecipeManager) BuildcraftRecipes.assemblyTable).getRecipes()) { - if (output.matches(MineTweakerMC.getIItemStack(recipe.getOutput())) - && ingredientsMatch(recipe, ingredients, wildcard)) { - toRemove.add(recipe); - } - } - - for (AssemblyRecipe recipe : toRemove) { - MineTweakerAPI.apply(new RemoveRecipeAction(recipe)); - } - } - - /** - * Checks if ingredients from the recipe match with the given ingredients. - * - * @param recipe recipe to check - * @param ingredients required ingredients - * @param wildcard true if there can be more ingredients in the recipe than given, false otherwise - * @return matching result - */ - private static boolean ingredientsMatch(AssemblyRecipe recipe, IIngredient[] ingredients, boolean wildcard) { - if (ingredients == null) - return true; - - int matchedIngredients = 0; - boolean[] matched = new boolean[ingredients.length]; - checkIngredient: for (int i = 0; i < recipe.getInputs().length; i++) { - Object ingredientObject = recipe.getInputs()[i]; - if (ingredientObject instanceof Number) - continue; - - IIngredient recipeIngredient = MineTweakerMC.getIIngredient(recipe.getInputs()[i]); - - for (int j = 0; j < ingredients.length; j++) { - if (!matched[j] && ingredients[j].contains(recipeIngredient)) { - matched[j] = true; - matchedIngredients++; - continue checkIngredient; - } - } - - if (!wildcard) - return false; - } - - return matchedIngredients == ingredients.length; - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddRecipeAction implements IUndoableAction { - private final IItemStack output; - private final AssemblyRecipe recipe; - - public AddRecipeAction(IItemStack output, double energy, IIngredient[] ingredients) { - this.output = output; - - Object[] mcIngredients = new Object[ingredients.length]; - for (int i = 0; i < ingredients.length; i++) { - mcIngredients[i] = ingredients[i].getInternal(); - if (mcIngredients[i] == null) { - throw new IllegalArgumentException("Not a valid assembly table ingredient"); - } - } - - recipe = new AssemblyRecipe(MineTweakerMC.getItemStack(output), energy, mcIngredients); - } - - @Override - public void apply() { - ((AssemblyRecipeManager) BuildcraftRecipes.assemblyTable).getRecipes().add(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipes.assemblyTable.getRecipes().remove(recipe); - } - - @Override - public String describe() { - return "Adding assembly table recipe for " + output; - } - - @Override - public String describeUndo() { - return "Removing assembly table recipe for " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveRecipeAction implements IUndoableAction { - private final AssemblyRecipe recipe; - - public RemoveRecipeAction(AssemblyRecipe recipe) { - this.recipe = recipe; - } - - @Override - public void apply() { - BuildcraftRecipes.assemblyTable.getRecipes().remove(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - ((AssemblyRecipeManager) BuildcraftRecipes.assemblyTable).getRecipes().add(recipe); - } - - @Override - public String describe() { - return "Removing assembly table recipe for " + MineTweakerMC.getIItemStack(recipe.getOutput()); - } - - @Override - public String describeUndo() { - return "Restoring assembly table recipe for " + MineTweakerMC.getIItemStack(recipe.getOutput()); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/Fuels.java b/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/Fuels.java deleted file mode 100644 index fd1a556..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/Fuels.java +++ /dev/null @@ -1,375 +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.mods.buildcraft; - -import buildcraft.api.core.StackKey; -import buildcraft.api.fuels.IronEngineCoolant; -import buildcraft.api.fuels.IronEngineFuel; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.logging.Level; -import java.util.logging.Logger; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.buildcraft.Fuels") -@ModOnly(value="BuildCraft|Core", version="6.0") -public class Fuels { - private static final Constructor CONSTRUCT_FUEL; - - static { - Constructor newFuel = null; - try { - newFuel = IronEngineFuel.Fuel.class.getDeclaredConstructor(Fluid.class, float.class, int.class); - newFuel.setAccessible(true); - } catch (NoSuchMethodException ex) { - MineTweakerAPI.logError("Could not load combustion engine fuel constructor", ex); - } catch (SecurityException ex) { - MineTweakerAPI.logError("Could not load combustion engine fuel constructor", ex); - } - - CONSTRUCT_FUEL = newFuel; - } - - @ZenMethod - public static void addCombustionEngineFuel(ILiquidStack fuel, double powerPerCycle, int totalBurningTime) { - MineTweakerAPI.apply(new AddFuelAction(fuel, powerPerCycle, totalBurningTime)); - } - - @ZenMethod - public static void removeCombustionEngineFuel(ILiquidStack fuel) { - Fluid fluid = MineTweakerMC.getLiquidStack(fuel).getFluid(); - if (IronEngineFuel.fuels.containsKey(fluid.getName())) { - MineTweakerAPI.apply(new RemoveFuelAction(fluid.getName(), IronEngineFuel.fuels.get(fluid.getName()))); - } else { - MineTweakerAPI.logWarning("No such iron engine fuel: " + fluid.getName()); - } - } - - @ZenMethod - public static void addCombustionEngineCoolant(ILiquidStack coolant, float coolingPerMB) { - MineTweakerAPI.apply(new AddLiquidCoolantAction(coolant.getName(), new MTCoolant(coolingPerMB))); - } - - @ZenMethod - public static void addCoolantItem(IItemStack coolantItem, ILiquidStack coolantLiquid) { - MineTweakerAPI.apply(new AddCoolantItemAction(new StackKey(MineTweakerMC.getItemStack(coolantItem)), MineTweakerMC.getLiquidStack(coolantLiquid))); - } - - @ZenMethod - public static void removeCombustionEngineCoolant(ILiquidStack coolant) { - FluidStack fluid = MineTweakerMC.getLiquidStack(coolant); - - if (IronEngineCoolant.isCoolant(fluid.getFluid())) { - MineTweakerAPI.apply(new RemoveLiquidCoolantAction(fluid.getFluid().getName(), IronEngineCoolant.getCoolant(fluid))); - } else { - MineTweakerAPI.logWarning("No such iron engine coolant: " + fluid.getFluid().getName()); - } - } - - @ZenMethod - public static void removeCoolantItem(IIngredient item) { - int numRemoved = 0; - for (IItemStack itemStack : item.getItems()) { - StackKey key = new StackKey(MineTweakerMC.getItemStack(itemStack)); - if (IronEngineCoolant.solidCoolants.containsKey(key)) { - MineTweakerAPI.apply(new RemoveCoolantItemAction(key, IronEngineCoolant.solidCoolants.get(key))); - numRemoved++; - } - } - - if (numRemoved == 0) { - MineTweakerAPI.logWarning("No such iron engine coolant: " + item); - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddFuelAction implements IUndoableAction { - private final String fuelName; - private final IronEngineFuel.Fuel fuel; - - public AddFuelAction(ILiquidStack fuel, double powerPerCycle, int totalBurningTime) { - fuelName = fuel.getName(); - IronEngineFuel.Fuel ieFuel = null; - try { - if (CONSTRUCT_FUEL == null) - System.out.println("No constructor for fuel"); - - ieFuel = (IronEngineFuel.Fuel) CONSTRUCT_FUEL.newInstance(MineTweakerMC.getLiquidStack(fuel).getFluid(), (float) powerPerCycle, totalBurningTime); - } catch (InstantiationException ex) { - Logger.getLogger(Fuels.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalAccessException ex) { - Logger.getLogger(Fuels.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalArgumentException ex) { - Logger.getLogger(Fuels.class.getName()).log(Level.SEVERE, null, ex); - } catch (InvocationTargetException ex) { - Logger.getLogger(Fuels.class.getName()).log(Level.SEVERE, null, ex); - } - - this.fuel = ieFuel; - } - - @Override - public void apply() { - IronEngineFuel.fuels.put(fuelName, fuel); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - IronEngineFuel.fuels.remove(fuelName); - } - - @Override - public String describe() { - return "Adding iron engine fuel " + fuelName; - } - - @Override - public String describeUndo() { - return "Removing iron engine fuel " + fuelName; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveFuelAction implements IUndoableAction { - private final String fuelName; - private final IronEngineFuel.Fuel fuel; - - public RemoveFuelAction(String fuelName, IronEngineFuel.Fuel fuel) { - this.fuelName = fuelName; - this.fuel = fuel; - } - - @Override - public void apply() { - IronEngineFuel.fuels.remove(fuelName); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - IronEngineFuel.fuels.put(fuelName, fuel); - } - - @Override - public String describe() { - return "Removing iron engine fuel " + fuelName; - } - - @Override - public String describeUndo() { - return "Restoring iron engine fuel " + fuelName; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddLiquidCoolantAction implements IUndoableAction { - private final String liquid; - private final IronEngineCoolant.Coolant coolant; - - public AddLiquidCoolantAction(String liquid, IronEngineCoolant.Coolant coolant) { - this.liquid = liquid; - this.coolant = coolant; - } - - @Override - public void apply() { - IronEngineCoolant.liquidCoolants.put(liquid, coolant); - } - - @Override - public boolean canUndo() { - return false; - } - - @Override - public void undo() { - IronEngineCoolant.liquidCoolants.remove(liquid); - } - - @Override - public String describe() { - return "Adding iron engine coolant " + liquid; - } - - @Override - public String describeUndo() { - return "Removing iron engine coolant " + liquid; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddCoolantItemAction implements IUndoableAction { - private final StackKey item; - private final FluidStack liquid; - - public AddCoolantItemAction(StackKey item, FluidStack liquid) { - this.item = item; - this.liquid = liquid; - } - - @Override - public void apply() { - IronEngineCoolant.solidCoolants.put(item, liquid); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - IronEngineCoolant.solidCoolants.remove(item); - } - - @Override - public String describe() { - return "Adding iron engine coolant item " + MineTweakerMC.getIItemStack(item.stack); - } - - @Override - public String describeUndo() { - return "Removing iron engine coolant item " + MineTweakerMC.getIItemStack(item.stack); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveLiquidCoolantAction implements IUndoableAction { - private final String liquid; - private final IronEngineCoolant.Coolant coolant; - - public RemoveLiquidCoolantAction(String liquid, IronEngineCoolant.Coolant coolant) { - this.liquid = liquid; - this.coolant = coolant; - } - - @Override - public void apply() { - IronEngineCoolant.liquidCoolants.remove(liquid); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - IronEngineCoolant.liquidCoolants.put(liquid, coolant); - } - - @Override - public String describe() { - return "Removing iron engine coolant " + liquid; - } - - @Override - public String describeUndo() { - return "Restoring iron engine coolant " + liquid; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveCoolantItemAction implements IUndoableAction { - private final StackKey item; - private final FluidStack liquid; - - public RemoveCoolantItemAction(StackKey item, FluidStack liquid) { - this.item = item; - this.liquid = liquid; - } - - @Override - public void apply() { - IronEngineCoolant.solidCoolants.remove(item); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - IronEngineCoolant.solidCoolants.put(item, liquid); - } - - @Override - public String describe() { - return "Removing iron engine coolant item " + item.stack.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Restoring iron engine coolant item " + item.stack.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class MTCoolant implements IronEngineCoolant.Coolant { - private final float coolingPerMB; - - public MTCoolant(float coolingPerMB) { - this.coolingPerMB = coolingPerMB; - } - - @Override - public float getDegreesCoolingPerMB(float f) { - return coolingPerMB; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/IIntegrationRecipeFunction.java b/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/IIntegrationRecipeFunction.java deleted file mode 100644 index f372d7d..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/IIntegrationRecipeFunction.java +++ /dev/null @@ -1,17 +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.mods.buildcraft; - -import minetweaker.api.item.IItemStack; - -/** - * - * @author Stan - */ -public interface IIntegrationRecipeFunction { - public IItemStack recipe(IItemStack output, IItemStack inputA, IItemStack inputB); -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/IntegrationTable.java b/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/IntegrationTable.java deleted file mode 100644 index 8ae5607..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/IntegrationTable.java +++ /dev/null @@ -1,217 +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.mods.buildcraft; - -import buildcraft.api.recipes.BuildcraftRecipes; -import buildcraft.api.recipes.IIntegrationRecipeManager.IIntegrationRecipe; -import java.util.ArrayList; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.item.ItemStack; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.buildcraft.IntegrationTable") -@ModOnly(value="BuildCraft|Core", version="6.0") -public class IntegrationTable { - @ZenMethod - public static void addRecipe(IItemStack output, double energy, IIngredient inputA, IIngredient inputB, @Optional IIntegrationRecipeFunction function) { - MineTweakerAPI.apply(new AddRecipeAction(output, energy, inputA, inputB, function)); - } - - @ZenMethod - public static void remove(IIngredient output) { - removeRecipe(output, null, null); - } - - @ZenMethod - public static void removeRecipe(IIngredient output, @Optional IIngredient inputA, @Optional IIngredient inputB) { - List toRemove = new ArrayList(); - - outer: for (IIntegrationRecipe recipe : BuildcraftRecipes.integrationTable.getRecipes()) { - for (ItemStack component : recipe.getComponents()) { - if (!output.matches(MineTweakerMC.getIItemStack(component))) - continue outer; - - if (inputA != null) { - for (ItemStack example1 : recipe.getExampleInputsA()) { - if (!inputA.matches(MineTweakerMC.getIItemStack(example1))) { - continue outer; - } - } - } - - if (inputB != null) { - for (ItemStack example2 : recipe.getExampleInputsB()) { - if (!inputB.matches(MineTweakerMC.getIItemStack(example2))) { - continue outer; - } - } - } - - toRemove.add(recipe); - } - } - - for (IIntegrationRecipe recipe : toRemove) { - MineTweakerAPI.apply(new RemoveRecipeAction(recipe)); - } - } - - // ###################### - // ### Action Classes ### - // ###################### - - private static class AddRecipeAction implements IUndoableAction { - private final MTIntegrationRecipe recipe; - - public AddRecipeAction(IItemStack output, double energy, IIngredient inputA, IIngredient inputB, IIntegrationRecipeFunction function) { - recipe = new MTIntegrationRecipe(output, energy, inputA, inputB, function); - } - - @Override - public void apply() { - BuildcraftRecipes.integrationTable.addRecipe(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipes.integrationTable.getRecipes().remove(recipe); - } - - @Override - public String describe() { - return "Adding integration table recipe for " + recipe.output; - } - - @Override - public String describeUndo() { - return "Removing integration table recipe for " + recipe.output; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveRecipeAction implements IUndoableAction { - private final IIntegrationRecipe recipe; - - public RemoveRecipeAction(IIntegrationRecipe recipe) { - this.recipe = recipe; - } - - @Override - public void apply() { - BuildcraftRecipes.integrationTable.getRecipes().remove(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipes.integrationTable.addRecipe(recipe); - } - - @Override - public String describe() { - return "Removing integration table recipe for " + MineTweakerMC.getIItemStack(recipe.getComponents()[0]); - } - - @Override - public String describeUndo() { - return "Restoring integration table recipe for " + MineTweakerMC.getIItemStack(recipe.getComponents()[0]); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class MTIntegrationRecipe implements IIntegrationRecipe { - private final IItemStack output; - private final ItemStack[] components; - private final double energy; - private final IIngredient inputA; - private final ItemStack[] inputAExamples; - private final IIngredient inputB; - private final ItemStack[] inputBExamples; - private final IIntegrationRecipeFunction function; - - private MTIntegrationRecipe(IItemStack output, double energy, IIngredient inputA, IIngredient inputB, IIntegrationRecipeFunction function) { - this.output = output; - this.components = new ItemStack[] { MineTweakerMC.getItemStack(output) }; - this.energy = energy; - this.inputA = inputA; - this.inputAExamples = MineTweakerMC.getExamples(inputA); - this.inputB = inputB; - this.inputBExamples = MineTweakerMC.getExamples(inputB); - this.function = function; - } - - @Override - public double getEnergyCost() { - return energy; - } - - @Override - public boolean isValidInputA(ItemStack is) { - return inputA.matches(MineTweakerMC.getIItemStack(is)); - } - - @Override - public boolean isValidInputB(ItemStack is) { - return inputB.matches(MineTweakerMC.getIItemStack(is)); - } - - @Override - public ItemStack getOutputForInputs(ItemStack is, ItemStack is1, ItemStack[] iss) { - if (function != null) { - IItemStack actualInputA = MineTweakerMC.getIItemStack(is); - IItemStack actualInputB = MineTweakerMC.getIItemStack(is1); - return MineTweakerMC.getItemStack(function.recipe(output, actualInputA, actualInputB)); - } else { - return MineTweakerMC.getItemStack(output); - } - } - - @Override - public ItemStack[] getComponents() { - return components; - } - - @Override - public ItemStack[] getExampleInputsA() { - return inputAExamples; - } - - @Override - public ItemStack[] getExampleInputsB() { - return inputBExamples; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/Refinery.java b/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/Refinery.java deleted file mode 100644 index 69f4c8f..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft/src/main/java/minetweaker/mods/buildcraft/Refinery.java +++ /dev/null @@ -1,202 +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.mods.buildcraft; - -import buildcraft.api.recipes.BuildcraftRecipes; -import buildcraft.core.recipes.RefineryRecipeManager; -import buildcraft.core.recipes.RefineryRecipeManager.RefineryRecipe; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.SortedSet; -import java.util.logging.Level; -import java.util.logging.Logger; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.buildcraft.Refinery") -@ModOnly(value="BuildCraft|Core", version="6.0") -public class Refinery { - private static final Constructor CONSTRUCT_REFINERYRECIPE; - private static final Field REFINERYRECIPEMANAGER_RECIPES; - - static { - Constructor constructor = null; - try { - constructor = RefineryRecipe.class.getDeclaredConstructor(FluidStack.class, FluidStack.class, FluidStack.class, int.class, int.class); - constructor.setAccessible(true); - } catch (NoSuchMethodException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } catch (SecurityException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } - - Field recipes = null; - try { - recipes = RefineryRecipeManager.class.getDeclaredField("recipes"); - recipes.setAccessible(true); - } catch (NoSuchFieldException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } catch (SecurityException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } - - CONSTRUCT_REFINERYRECIPE = constructor; - REFINERYRECIPEMANAGER_RECIPES = recipes; - } - - - @ZenMethod - public static void addRecipe(ILiquidStack output, int energyPerMB, int ticksPerMB, ILiquidStack input1, @Optional ILiquidStack input2) { - MineTweakerAPI.apply(new AddRecipeAction(output, energyPerMB, ticksPerMB, input1, input2)); - } - - @ZenMethod - public static void remove(ILiquidStack output) { - Fluid fluid = MineTweakerMC.getLiquidStack(output).getFluid(); - - List toRemove = new ArrayList(); - for (RefineryRecipe recipe : ((RefineryRecipeManager) BuildcraftRecipes.refinery).getRecipes()) { - if (recipe.getResult().getFluid() == fluid) { - toRemove.add(recipe); - } - } - - for (RefineryRecipe recipe : toRemove) { - MineTweakerAPI.apply(new RemoveRecipeAction(recipe)); - } - } - - private static SortedSet getRecipes() { - try { - return (SortedSet) REFINERYRECIPEMANAGER_RECIPES.get((RefineryRecipeManager) BuildcraftRecipes.refinery); - } catch (IllegalArgumentException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalAccessException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } - - throw new RuntimeException("Refinery recipes unavailable"); - } - - // ###################### - // ### Action Classes ### - // ###################### - - private static class AddRecipeAction implements IUndoableAction { - private final ILiquidStack output; - private final RefineryRecipe recipe; - - public AddRecipeAction(ILiquidStack output, int energyPerMB, int ticksPerMB, ILiquidStack input1, ILiquidStack input2) { - this.output = output; - - RefineryRecipe rrecipe = null; - try { - rrecipe = (RefineryRecipe) CONSTRUCT_REFINERYRECIPE.newInstance( - MineTweakerMC.getLiquidStack(input1), - MineTweakerMC.getLiquidStack(input2), - MineTweakerMC.getLiquidStack(output), - energyPerMB, - ticksPerMB); - } catch (InstantiationException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalAccessException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } catch (IllegalArgumentException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } catch (InvocationTargetException ex) { - Logger.getLogger(Refinery.class.getName()).log(Level.SEVERE, null, ex); - } - - recipe = rrecipe; - } - - @Override - public void apply() { - getRecipes().add(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - getRecipes().add(recipe); - } - - @Override - public String describe() { - return "Adding refinery recipe for " + output; - } - - @Override - public String describeUndo() { - return "Removing refinery recipe for " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveRecipeAction implements IUndoableAction { - private final RefineryRecipe recipe; - - public RemoveRecipeAction(RefineryRecipe recipe) { - this.recipe = recipe; - } - - @Override - public void apply() { - getRecipes().remove(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - getRecipes().add(recipe); - } - - @Override - public String describe() { - return "Removing refinery recipe for " - + recipe.getResult().getFluid().getLocalizedName(recipe.getResult()); - } - - @Override - public String describeUndo() { - return "Restoring refinery recipe for " - + recipe.getResult().getFluid().getLocalizedName(recipe.getResult()); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/build.gradle b/MineTweaker3-MC1710-Mod-Buildcraft61/build.gradle deleted file mode 100644 index a8cd99b..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft61/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -apply plugin: 'forge' - -minecraft { - version = forgeVersion1710 -} - -version = "1.0" -archivesBaseName = project.projectDir.name - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') - compile project(':MineTweaker3-MC1710-Main') - compile files('libs/buildcraft-6.1.5-dev.jar') -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mods.buildcraft.ClassRegistry' -} - -tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/libs/buildcraft-6.1.5-dev.jar b/MineTweaker3-MC1710-Mod-Buildcraft61/libs/buildcraft-6.1.5-dev.jar deleted file mode 100644 index 0e0c659..0000000 Binary files a/MineTweaker3-MC1710-Mod-Buildcraft61/libs/buildcraft-6.1.5-dev.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/AssemblyTable.java b/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/AssemblyTable.java deleted file mode 100644 index 58c298a..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/AssemblyTable.java +++ /dev/null @@ -1,138 +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.mods.buildcraft61; - -import buildcraft.api.recipes.BuildcraftRecipeRegistry; -import buildcraft.api.recipes.IFlexibleRecipe; -import buildcraft.core.recipes.FlexibleRecipe; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.item.ItemStack; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.buildcraft.AssemblyTable") -@ModOnly(value="BuildCraft|Core", version="6.1") -public class AssemblyTable { - @ZenMethod - public static void addRecipe(IItemStack output, double energy, IIngredient[] ingredients) { - MineTweakerAPI.apply(new AddRecipeAction(output, energy, ingredients)); - } - - @ZenMethod - public static void remove(IIngredient output) { - removeRecipe(output, null, false); - } - - @ZenMethod - public static void removeRecipe(IIngredient output, @Optional IIngredient[] ingredients, @Optional boolean wildcard) { - List> toRemove = BuildcraftRecipes.removeRecipes( - output, - ingredients, - BuildcraftRecipeRegistry.assemblyTable.getRecipes()); - - for (IFlexibleRecipe recipe : toRemove) { - ItemStack recipeOutput = recipe instanceof FlexibleRecipe ? (ItemStack)(((FlexibleRecipe) recipe).output) : null; - MineTweakerAPI.apply(new RemoveRecipeAction(recipe, recipeOutput)); - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddRecipeAction implements IUndoableAction { - private final IItemStack output; - private final IFlexibleRecipe recipe; - - public AddRecipeAction(IItemStack output, double energy, IIngredient[] ingredients) { - this.output = output; - this.recipe = new MTFlexibleRecipe(output, ingredients, (int) energy, 0); - } - - @Override - public void apply() { - BuildcraftRecipeRegistry.assemblyTable.addRecipe(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipeRegistry.assemblyTable.removeRecipe(recipe); - } - - @Override - public String describe() { - return "Adding assembly table recipe for " + output; - } - - @Override - public String describeUndo() { - return "Removing assembly table recipe for " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveRecipeAction implements IUndoableAction { - private final IFlexibleRecipe recipe; - private final ItemStack output; - - public RemoveRecipeAction(IFlexibleRecipe recipe, ItemStack output) { - this.recipe = recipe; - this.output = output; - } - - @Override - public void apply() { - BuildcraftRecipeRegistry.assemblyTable.removeRecipe(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipeRegistry.assemblyTable.addRecipe(recipe); - } - - @Override - public String describe() { - return "Removing assembly table recipe for " + MineTweakerMC.getIItemStack(output); - } - - @Override - public String describeUndo() { - return "Restoring assembly table recipe for " + MineTweakerMC.getIItemStack(output); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/BuildcraftRecipes.java b/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/BuildcraftRecipes.java deleted file mode 100644 index 9c42074..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/BuildcraftRecipes.java +++ /dev/null @@ -1,65 +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.mods.buildcraft61; - -import buildcraft.api.recipes.IFlexibleRecipe; -import buildcraft.core.recipes.FlexibleRecipe; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IngredientAny; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.item.ItemStack; - -/** - * - * @author Stan - */ -public class BuildcraftRecipes -{ - private BuildcraftRecipes() {} - - public static List> removeRecipes(IIngredient output, IIngredient[] inputs, Collection> recipes) - { - if (output == IngredientAny.INSTANCE && (inputs == null || inputs.length == 0)) - return new ArrayList>(recipes); - - List> results = new ArrayList>(); - for (IFlexibleRecipe recipe : recipes) { - if (recipe instanceof FlexibleRecipe && matches(output, inputs, (FlexibleRecipe) recipe)) - results.add(recipe); - } - - return results; - } - - private static boolean matches(IIngredient output, IIngredient[] inputs, FlexibleRecipe recipe) - { - ItemStack recipeOutput = (ItemStack) recipe.getOutput(); - if (!output.matches(MineTweakerMC.getIItemStack(recipeOutput))) - return false; - - if (inputs == null || inputs.length == 0) - return true; - - boolean[] matches = new boolean[inputs.length]; - outer: for (Object recipeInputObject : recipe.getInputs()) - { - IIngredient recipeIngredient = MineTweakerMC.getIIngredient(recipeInputObject); - for (int i = 0; i < inputs.length; i++) { - if (!matches[i] && inputs[i].contains(recipeIngredient)) - { - matches[i] = true; - continue outer; - } - } - return false; - } - - return true; - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/IIntegrationRecipeFunction.java b/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/IIntegrationRecipeFunction.java deleted file mode 100644 index a1bd6b3..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/IIntegrationRecipeFunction.java +++ /dev/null @@ -1,17 +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.mods.buildcraft61; - -import minetweaker.api.item.IItemStack; - -/** - * - * @author Stan - */ -public interface IIntegrationRecipeFunction { - public IItemStack recipe(IItemStack output, IItemStack inputA, IItemStack inputB); -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/IntegrationTable.java b/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/IntegrationTable.java deleted file mode 100644 index 46db9ba..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/IntegrationTable.java +++ /dev/null @@ -1,237 +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.mods.buildcraft61; - -import buildcraft.api.recipes.BuildcraftRecipeRegistry; -import buildcraft.api.recipes.CraftingResult; -import buildcraft.api.recipes.IFlexibleCrafter; -import buildcraft.api.recipes.IIntegrationRecipe; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.item.ItemStack; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.buildcraft.IntegrationTable") -@ModOnly(value="BuildCraft|Core", version="6.1") -public class IntegrationTable { - @ZenMethod - public static void addRecipe(IItemStack output, double energy, IIngredient inputA, IIngredient inputB, @Optional IIntegrationRecipeFunction function) { - MineTweakerAPI.apply(new AddRecipeAction(output, energy, inputA, inputB, function)); - } - - /*@ZenMethod - public static void remove(IIngredient output) { - removeRecipe(output, null, null); - }*/ - - /*@ZenMethod - public static void removeRecipe(IIngredient output, @Optional IIngredient inputA, @Optional IIngredient inputB) { - IIngredient[] ingredients = null; - if (inputA != null && inputB != null) { - ingredients = new IIngredient[] { inputA, inputB }; - } else if (inputA != null) { - ingredients = new IIngredient[] { inputA }; - } else if (inputB != null) { - ingredients = new IIngredient[] { inputB }; - } - - List recipes = BuildcraftRecipeRegistry.integrationTable.getRecipes(); - List> toRemove = BuildcraftRecipes.removeRecipes(output, ingredients, recipes); - - for (IFlexibleRecipe recipe : toRemove) { - MineTweakerAPI.apply(new RemoveRecipeAction(recipe)); - } - }*/ - - // ###################### - // ### Action Classes ### - // ###################### - - private static class AddRecipeAction implements IUndoableAction { - private final MTIntegrationRecipe recipe; - - public AddRecipeAction(IItemStack output, double energy, IIngredient inputA, IIngredient inputB, IIntegrationRecipeFunction function) { - recipe = new MTIntegrationRecipe(output, energy, inputA, inputB, function); - } - - @Override - public void apply() { - BuildcraftRecipeRegistry.integrationTable.addRecipe(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipeRegistry.integrationTable.getRecipes().remove(recipe); - } - - @Override - public String describe() { - return "Adding integration table recipe for " + recipe.output; - } - - @Override - public String describeUndo() { - return "Removing integration table recipe for " + recipe.output; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - /* - private static class RemoveRecipeAction implements IUndoableAction { - private final IFlexibleRecipe recipe; - - public RemoveRecipeAction(IFlexibleRecipe recipe) { - this.recipe = recipe; - } - - @Override - public void apply() { - BuildcraftRecipeRegistry.integrationTable.getRecipes().remove(recipe); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - BuildcraftRecipeRegistry.integrationTable.getRecipes().add((IIntegrationRecipe) recipe); - } - - @Override - public String describe() { - return "Removing integration table recipe for " + MineTweakerMC.getIItemStack(recipe.getComponents()[0]); - } - - @Override - public String describeUndo() { - return "Restoring integration table recipe for " + MineTweakerMC.getIItemStack(recipe.getComponents()[0]); - } - - @Override - public Object getOverrideKey() { - return null; - } - }*/ - - private static class MTIntegrationRecipe implements IIntegrationRecipe { - private static int idCounter = 0; - - private final String id; - private final IItemStack output; - private final ItemStack[] components; - private final double energy; - private final IIngredient inputA; - private final ItemStack[] inputAExamples; - private final IIngredient inputB; - private final ItemStack[] inputBExamples; - private final IIntegrationRecipeFunction function; - - private MTIntegrationRecipe(IItemStack output, double energy, IIngredient inputA, IIngredient inputB, IIntegrationRecipeFunction function) { - this.id = "mtIntegration" + (idCounter++); - this.output = output; - this.components = new ItemStack[] { MineTweakerMC.getItemStack(output) }; - this.energy = energy; - this.inputA = inputA; - this.inputAExamples = MineTweakerMC.getExamples(inputA); - this.inputB = inputB; - this.inputBExamples = MineTweakerMC.getExamples(inputB); - this.function = function; - } - - @Override - public String getId() { - return id; - } - - @Override - public boolean isValidInputA(ItemStack is) { - return inputA.matches(MineTweakerMC.getIItemStack(is)); - } - - @Override - public boolean isValidInputB(ItemStack is) { - return inputB.matches(MineTweakerMC.getIItemStack(is)); - } - - /*@Override - public ItemStack getOutputForInputs(ItemStack is, ItemStack is1, ItemStack[] iss) { - if (function != null) { - IItemStack actualInputA = MineTweakerMC.getIItemStack(is); - IItemStack actualInputB = MineTweakerMC.getIItemStack(is1); - return MineTweakerMC.getItemStack(function.recipe(output, actualInputA, actualInputB)); - } else { - return MineTweakerMC.getItemStack(output); - } - }*/ - - @Override - public boolean canBeCrafted(IFlexibleCrafter ifc) - { - return inputA.matches(MineTweakerMC.getIItemStack(ifc.getCraftingItemStack(0))) - && (inputB == null || inputB.matches(MineTweakerMC.getIItemStack(ifc.getCraftingItemStack(1)))); - } - - @Override - public CraftingResult craft(IFlexibleCrafter ifc, boolean bln) - { - if (!canBeCrafted(ifc)) - return null; - - CraftingResult result = new CraftingResult(); - result.crafted = MineTweakerMC.getItemStack(output); - - ItemStack consumedA = new ItemStack(ifc.getCraftingItemStack(0).getItem(), inputA.getAmount(), ifc.getCraftingItemStack(0).getItemDamage()); - consumedA.setTagCompound(ifc.getCraftingItemStack(0).stackTagCompound); - result.usedItems.add(consumedA); - - if (inputB != null) { - ItemStack consumedB = new ItemStack(ifc.getCraftingItemStack(1).getItem(), inputB.getAmount(), ifc.getCraftingItemStack(0).getItemDamage()); - consumedB.setTagCompound(ifc.getCraftingItemStack(1).stackTagCompound); - result.usedItems.add(consumedB); - } - - return result; - } - - @Override - public CraftingResult canCraft(ItemStack is) - { - if (inputB != null) - return null; - - if (!inputA.matches(MineTweakerMC.getIItemStack(is))) - return null; - - CraftingResult result = new CraftingResult(); - result.crafted = MineTweakerMC.getItemStack(output); - ItemStack consumed = new ItemStack(is.getItem(), inputA.getAmount(), is.getItemDamage()); - consumed.setTagCompound(is.stackTagCompound); - result.usedItems.add(consumed); - return result; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/MTFlexibleRecipe.java b/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/MTFlexibleRecipe.java deleted file mode 100644 index 6e9e37b..0000000 --- a/MineTweaker3-MC1710-Mod-Buildcraft61/src/main/java/minetweaker/mods/buildcraft61/MTFlexibleRecipe.java +++ /dev/null @@ -1,144 +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.mods.buildcraft61; - -import buildcraft.api.recipes.CraftingResult; -import buildcraft.api.recipes.IFlexibleCrafter; -import buildcraft.api.recipes.IFlexibleRecipe; -import java.util.ArrayList; -import java.util.List; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.mc1710.liquid.MCLiquidStack; -import net.minecraft.item.ItemStack; - -/** - * - * @author Stan - */ -public class MTFlexibleRecipe implements IFlexibleRecipe -{ - private static int idCounter = 0; - - private final String id; - private final IItemStack output; - private final IIngredient[] inputs; - private final int energyCost; - private final long craftingTime; - - public MTFlexibleRecipe(IItemStack output, IIngredient[] inputs, int energyCost, long craftingTime) - { - if (inputs.length == 0) - throw new IllegalArgumentException("recipe must have at least 1 input"); - - this.id = "minetweaker" + (idCounter++); - this.output = output; - this.inputs = inputs; - this.energyCost = energyCost; - this.craftingTime = craftingTime; - } - - @Override - public boolean canBeCrafted(IFlexibleCrafter ifc) - { - List items = new ArrayList(); - for (int i = 0; i < ifc.getCraftingItemStackSize(); i++) { - if (ifc.getCraftingItemStack(i) != null) - items.add(MineTweakerMC.getIItemStack(ifc.getCraftingItemStack(i))); - } - - List liquids = new ArrayList(); - for (int i = 0; i < ifc.getCraftingFluidStackSize(); i++) { - if (ifc.getCraftingFluidStack(i) != null) - liquids.add(new MCLiquidStack(ifc.getCraftingFluidStack(i))); - } - - outer: for (IIngredient ingredient : inputs) { - for (IItemStack item : items) { - if (ingredient.matches(item)) - continue outer; - } - - for (ILiquidStack liquid : liquids) { - if (ingredient.matches(liquid)) - continue outer; - } - - return false; - } - - return true; - } - - @Override - public CraftingResult craft(IFlexibleCrafter ifc, boolean preview) - { - CraftingResult result = new CraftingResult(); - - List items = new ArrayList(); - for (int i = 0; i < ifc.getCraftingItemStackSize(); i++) { - if (ifc.getCraftingItemStack(i) != null) - items.add(MineTweakerMC.getIItemStack(ifc.getCraftingItemStack(i))); - } - - List liquids = new ArrayList(); - for (int i = 0; i < ifc.getCraftingFluidStackSize(); i++) { - if (ifc.getCraftingFluidStack(i) != null) - liquids.add(new MCLiquidStack(ifc.getCraftingFluidStack(i))); - } - - result.energyCost = energyCost; - result.craftingTime = craftingTime; - - outer: for (IIngredient ingredient : inputs) { - for (IItemStack item : items) { - if (ingredient.matches(item)) { - result.usedItems.add(MineTweakerMC.getItemStack(item.withAmount(ingredient.getAmount()))); - continue outer; - } - } - - for (ILiquidStack liquid : liquids) { - if (ingredient.matches(liquid)) { - result.usedFluids.add(MineTweakerMC.getLiquidStack(liquid.withAmount(ingredient.getAmount()))); - continue outer; - } - } - - return null; - } - - return result; - } - - @Override - public CraftingResult canCraft(ItemStack is) - { - if (!output.matches(MineTweakerMC.getIItemStack(is))) - return null; - - /*if (inputs.length > 1) - return null; - - if (!inputs[0].matches(MineTweakerMC.getIItemStack(is))) - return null;*/ - - CraftingResult result = new CraftingResult(); - result.crafted = MineTweakerMC.getItemStack(output); - ItemStack consumed = new ItemStack(is.getItem(), inputs[0].getAmount(), is.getItemDamage()); - consumed.setTagCompound(is.stackTagCompound); - result.usedItems.add(consumed); - return result; - } - - @Override - public String getId() - { - return id; - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/build.gradle b/MineTweaker3-MC1710-Mod-IC2/build.gradle deleted file mode 100644 index 59ff741..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -apply plugin: 'forge' - -minecraft { - version = forgeVersion1710 -} - -version = "1.0" -archivesBaseName = project.projectDir.name - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') - compile project(':MineTweaker3-MC1710-Main') - compile files('libs/industrialcraft-2-2.2.756-experimental-api.jar') -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mods.ic2.ClassRegistry' -} - -tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1710-Mod-IC2/libs/industrialcraft-2-2.2.756-experimental-api.jar b/MineTweaker3-MC1710-Mod-IC2/libs/industrialcraft-2-2.2.756-experimental-api.jar deleted file mode 100644 index d579f0e..0000000 Binary files a/MineTweaker3-MC1710-Mod-IC2/libs/industrialcraft-2-2.2.756-experimental-api.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-IC2/libs/industrialcraft-2-2.2.756-experimental-dev.jar b/MineTweaker3-MC1710-Mod-IC2/libs/industrialcraft-2-2.2.756-experimental-dev.jar deleted file mode 100644 index f5f9880..0000000 Binary files a/MineTweaker3-MC1710-Mod-IC2/libs/industrialcraft-2-2.2.756-experimental-dev.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java deleted file mode 100644 index b8f842a..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java +++ /dev/null @@ -1,103 +0,0 @@ -package minetweaker.mods.ic2; - -import ic2.api.item.IC2Items; -import java.util.List; -import minetweaker.IBracketHandler; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.BracketHandler; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import stanhebben.zenscript.ZenTokener; -import stanhebben.zenscript.compiler.IEnvironmentGlobal; -import stanhebben.zenscript.expression.ExpressionInt; -import stanhebben.zenscript.expression.ExpressionCallStatic; -import stanhebben.zenscript.expression.ExpressionString; -import stanhebben.zenscript.expression.partial.IPartialExpression; -import stanhebben.zenscript.parser.Token; -import stanhebben.zenscript.symbols.IZenSymbol; -import stanhebben.zenscript.type.ZenType; -import stanhebben.zenscript.type.natives.IJavaMethod; -import stanhebben.zenscript.util.ZenPosition; - -/** - * Makes a ic2-item specific item syntax available in the form <item-ic2:name[:meta]>. - * - * @author Stan Hebben - */ -@BracketHandler -@ModOnly("IC2") -public class IC2BracketHandler implements IBracketHandler { - public static IItemStack getItem(String name, int meta) { - ItemStack stack = IC2Items.getItem(name); - stack.setItemDamage(meta); - return getIItemStack(stack); - } - - private final IJavaMethod method; - - public IC2BracketHandler() { - method = MineTweakerAPI.getJavaMethod(IC2BracketHandler.class, "getItem", String.class, int.class); - } - - @Override - public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { - if (tokens.size() >= 5) { - if (tokens.get(0).getValue().equals("ic2") - && tokens.get(1).getValue().equals("-") - && tokens.get(2).getValue().equals("item") - && tokens.get(3).getValue().equals(":")) { - String name = tokens.get(4).getValue(); - int meta = 0; - if (tokens.size() > 6 && tokens.get(5).getValue().equals(":")) { - if (tokens.get(6).getType() == ZenTokener.T_INTVALUE) { - meta = Integer.parseInt(tokens.get(6).getValue()); - } else if (tokens.get(6).getValue().equals("*")) { - meta = OreDictionary.WILDCARD_VALUE; - } else { - MineTweakerAPI.logError("Not a valid meta value: " + tokens.get(6).getValue()); - } - } - ItemStack item = IC2Items.getItem(name); - if (item == null) { - MineTweakerAPI.logError("Not a valid IC2 item: " + name); - return null; - } else { - return new ItemReferenceSymbol(environment, name, meta); - } - } else { - return null; - } - } else { - return null; - } - } - - // ############################# - // ### Private inner classes ### - // ############################# - - private class ItemReferenceSymbol implements IZenSymbol { - private final IEnvironmentGlobal environment; - private final String name; - private final int meta; - - public ItemReferenceSymbol(IEnvironmentGlobal environment, String name, int meta) { - this.environment = environment; - this.name = name; - this.meta = meta; - } - - @Override - public IPartialExpression instance(ZenPosition position) { - return new ExpressionCallStatic( - position, - environment, - method, - new ExpressionString(position, name), - new ExpressionInt(position, meta, ZenType.INT)); - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java deleted file mode 100644 index ed5c0a8..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java +++ /dev/null @@ -1,161 +0,0 @@ -package minetweaker.mods.ic2; - -import ic2.api.tile.ExplosionWhitelist; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Manages the explosion whitelist in IC2. Blocks on this whitelist will not resist - * an explosion but won't be destroyed. - * - * The explosion code by default ignores blocks which absorb more than 1000 explosion power to - * prevent abusing personal safes, Trade-O-Mats and other blocks to serve as a cheap and - * invulnerable reactor chambers. Said blocks will not shield the explosion and won't get - * destroyed. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.ExplosionWhitelist") -@ModOnly("IC2") -public class IC2ExplosionWhitelist { - /** - * Adds a block to the explosion whitelist. - * - * @param item item to add - */ - @ZenMethod - public static void add(IItemStack item) { - ItemStack iStack = getItemStack(item); - Block block = Block.getBlockFromItem(iStack.getItem()); - if (block == null) { - MineTweakerAPI.logError("This item is not a block"); - } else { - MineTweakerAPI.apply(new AddAction(block)); - } - } - - /** - * Removes a block from the explosion whitelist. - * - * @param item item to remove - */ - @ZenMethod - public static void remove(IItemStack item) { - ItemStack iStack = getItemStack(item); - Block block = Block.getBlockFromItem(iStack.getItem()); - if (block == null) { - MineTweakerAPI.logError("This item is not a block"); - } else { - if (ExplosionWhitelist.isBlockWhitelisted(block)) { - MineTweakerAPI.logWarning("This block is not in the whitelist"); - } else { - MineTweakerAPI.apply(new RemoveAction(block)); - } - } - } - - /** - * Checks if the given item is already whitelisted. - * - * @param item item to check - * @return true if whitelisted - */ - @ZenMethod - public static boolean isWhitelisted(IItemStack item) { - ItemStack iStack = getItemStack(item); - Block block = Block.getBlockFromItem(iStack.getItem()); - if (block == null) { - MineTweakerAPI.logWarning("This item is not a block"); - return false; - } else { - return ExplosionWhitelist.isBlockWhitelisted(block); - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddAction implements IUndoableAction { - private final Block block; - - public AddAction(Block block) { - this.block = block; - } - - @Override - public void apply() { - ExplosionWhitelist.addWhitelistedBlock(block); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - ExplosionWhitelist.removeWhitelistedBlock(block); - } - - @Override - public String describe() { - return "Adding block to IC2 explosion whitelist: " + block.getLocalizedName(); - } - - @Override - public String describeUndo() { - return "Removing block from IC2 explosion whitelist: " + block.getLocalizedName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveAction implements IUndoableAction { - private final Block block; - - public RemoveAction(Block block) { - this.block = block; - } - - @Override - public void apply() { - ExplosionWhitelist.removeWhitelistedBlock(block); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - ExplosionWhitelist.addWhitelistedBlock(block); - } - - @Override - public String describe() { - return "Removing block from IC2 explosion whitelist: " + block.getLocalizedName(); - } - - @Override - public String describeUndo() { - return "Adding block to IC2 explosion whitelist: " + block.getLocalizedName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java deleted file mode 100644 index 315d0d6..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java +++ /dev/null @@ -1,70 +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.mods.ic2; - -import ic2.api.recipe.IRecipeInput; -import java.util.ArrayList; -import java.util.List; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import net.minecraft.item.ItemStack; - -/** - * Wrapper class for ITweakerItemStackPatterns to IC2 recipe inputs. - * - * @author Stan Hebben - */ -public class IC2RecipeInput implements IRecipeInput { - private final IIngredient ingredient; - - public IC2RecipeInput(IIngredient ingredient) { - this.ingredient = ingredient; - } - - @Override - public boolean matches(ItemStack subject) { - return ingredient.matches(getIItemStack(subject)); - } - - @Override - public int getAmount() { - return ingredient.getAmount(); - } - - @Override - public List getInputs() { - List items = new ArrayList(); - for (IItemStack item : ingredient.getItems()) { - items.add(getItemStack(item)); - } - return items; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 89 * hash + (this.ingredient != null ? this.ingredient.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final IC2RecipeInput other = (IC2RecipeInput) obj; - if (this.ingredient != other.ingredient && (this.ingredient == null || !this.ingredient.equals(other.ingredient))) { - return false; - } - return true; - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java deleted file mode 100644 index d9600ac..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java +++ /dev/null @@ -1,105 +0,0 @@ -package minetweaker.mods.ic2; - -import ic2.api.recipe.IMachineRecipeManager; -import ic2.api.recipe.IMachineRecipeManagerExt; -import java.util.Arrays; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -/** - * - * @author Stan Hebben - */ -public class MachineAddRecipeAction extends OneWayAction { - private final String name; - private final IMachineRecipeManager machine; - private final ItemStack[] output; - private final IC2RecipeInput input; - private final NBTTagCompound tag; - - public MachineAddRecipeAction(String name, IMachineRecipeManager machine, ItemStack[] output, NBTTagCompound tag, IC2RecipeInput input) { - this.name = name; - this.machine = machine; - this.output = output; - this.input = input; - this.tag = tag; - } - - @Override - public void apply() { - try { - if (machine instanceof IMachineRecipeManagerExt) { - ((IMachineRecipeManagerExt) machine).addRecipe(input, tag, true, output); - } else { - machine.addRecipe(input, tag, output); - } - } catch (RuntimeException ex) { - MineTweakerAPI.logError(ex.getMessage()); - } - } - - @Override - public String describe() { - if (output.length == 1) { - return "Adding " + name + " recipe for " + output[0].getDisplayName(); - } else { - StringBuilder result = new StringBuilder(); - result.append("Adding ").append(name).append(" recipe for "); - result.append("["); - for (int i = 0; i < output.length; i++) { - if (i == 0) { - result.append(", "); - } else { - result.append(output[i].getDisplayName()); - } - } - result.append("]"); - return result.toString(); - } - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0); - hash = 47 * hash + (this.machine != null ? this.machine.hashCode() : 0); - hash = 47 * hash + Arrays.deepHashCode(this.output); - hash = 47 * hash + (this.input != null ? this.input.hashCode() : 0); - hash = 47 * hash + (this.tag != null ? this.tag.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final MachineAddRecipeAction other = (MachineAddRecipeAction) obj; - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - if (this.machine != other.machine && (this.machine == null || !this.machine.equals(other.machine))) { - return false; - } - if (!Arrays.deepEquals(this.output, other.output)) { - return false; - } - if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) { - return false; - } - if (this.tag != other.tag && (this.tag == null || !this.tag.equals(other.tag))) { - return false; - } - return true; - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/Crop.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/Crop.java deleted file mode 100644 index 066d165..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/Crop.java +++ /dev/null @@ -1,84 +0,0 @@ -package minetweaker.mods.ic2.crops; - -import ic2.api.crops.CropCard; -import stanhebben.zenscript.annotations.ZenCaster; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Read-only data accessor for crops - * @author ben - * - */ -@ZenClass("mods.ic2.Crop") -public class Crop { - private CropCard cc; - - @ZenGetter("name") - public String name() { - return cc.name(); - } - - @ZenGetter("owner") - public String owner() { - return cc.owner(); - } - - @ZenGetter("displayName") - public String displayName() { - return cc.displayName(); - } - - @ZenGetter("hashCode") - public int hashCode() { - return cc.hashCode(); - } - - @ZenGetter("discoveredBy") - public String discoveredBy() { - return cc.discoveredBy(); - } - - @ZenMethod - public String desc(int i) { - return cc.desc(i); - } - - @ZenGetter("tier") - public int tier() { - return cc.tier(); - } - - @ZenMethod - public int stat(int n) { - return cc.stat(n); - } - - @ZenGetter("attributes") - public String[] attributes() { - return cc.attributes(); - } - - @ZenGetter("maxSize") - public int maxSize() { - return cc.maxSize(); - } - - @ZenGetter("dropGainChance") - public float dropGainChance() { - return cc.dropGainChance(); - } - - @ZenCaster - public String toString() { - return cc.toString(); - } - - public Crop(CropCard cc) { - super(); - this.cc = cc; - } - - -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java deleted file mode 100644 index 5159d13..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java +++ /dev/null @@ -1,262 +0,0 @@ -package minetweaker.mods.ic2.crops; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import ic2.api.crops.CropCard; -import ic2.api.crops.Crops; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraftforge.common.BiomeDictionary; -import stanhebben.zenscript.annotations.ZenCaster; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -/** - * Provides access to IC2 crop system in general - * @author ben - * - */ -import stanhebben.zenscript.annotations.ZenMethod; -@ZenClass("mods.ic2.CropsConfig") -@ModOnly("IC2") -public class CropsConfig { - /** - * Action to add a new seed for a base crop - * @author ben - * - */ - private static final class RegisterBaseSeedAction extends OneWayAction { - private IItemStack seed; - private CropCard c; - private int sz; - private int growth; - private int gain; - private int resist; - - public RegisterBaseSeedAction(IItemStack seed, CropCard c, int sz, int growth, int gain, int resist) { - this.seed = seed; - this.c = c; - this.sz = sz; - this.growth = growth; - this.gain = gain; - this.resist = resist; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public String describe() { - return "Registering base seed for crop " + c.name(); - } - - @Override - public void apply() { - Crops.instance.registerBaseSeed(MineTweakerMC.getItemStack(seed), c, sz, growth, gain, resist); - } - } - - - - /** - * Action to register a new crop - * @author ben - * - */ - private static final class RegisterCropCardAction extends OneWayAction { - private CropCard c; - - public RegisterCropCardAction(CropCard c) { - this.c = c; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public String describe() { - // TODO Auto-generated method stub - return "Registering crop " + c.name(); - } - - @Override - public void apply() { - Crops.instance.registerCrop(c); - } - } - - - /** - * Action to add a biome nutrient bonus - * @author ben - * - */ - private static final class AddBiomeNutrientBonusAction extends OneWayAction { - private String biomeType; - private int nutrientBonus; - - public AddBiomeNutrientBonusAction(String biomeType, int nutrientBonus) { - this.biomeType = biomeType; - this.nutrientBonus = nutrientBonus; - } - - @Override - public Object getOverrideKey() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String describe() { - return "Setting biome nutrient bonus for " + biomeType + " biomes to " + - nutrientBonus; - } - - @Override - public void apply() { - Crops.instance.addBiomenutrientsBonus(BiomeDictionary.Type.valueOf(biomeType), - nutrientBonus); - } - } - - /** - * Action to add a biome humidity bonus - * @author ben - * - */ - private static final class AddBiomeHumidityBonusAction extends OneWayAction { - private String biomeType; - private int humidityBonus; - - public AddBiomeHumidityBonusAction(String biomeType, int humidityBonus) { - this.biomeType = biomeType; - this.humidityBonus = humidityBonus; - } - - @Override - public Object getOverrideKey() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String describe() { - return "Setting biome humidity bonus for " + biomeType + " biomes to " + - humidityBonus; - } - - @Override - public void apply() { - Crops.instance.addBiomehumidityBonus(BiomeDictionary.Type.valueOf(biomeType), - humidityBonus); - } - } - - /** - * Add a nutrient bonus to crops in a specific biome - */ - @ZenMethod - public static void addBiomeNutrientBonus(String biomeType, int nutrientBonus) { - if(BiomeDictionary.Type.valueOf(biomeType) == null) { - MineTweakerAPI.logWarning("invalid biome type: " + biomeType); - } else if (nutrientBonus < -10 || nutrientBonus > 10) { - MineTweakerAPI.logWarning("nutrient bonus " + nutrientBonus + - " not in -10, +10 range"); - } else { - MineTweakerAPI.apply(new AddBiomeNutrientBonusAction(biomeType, nutrientBonus)); - } - } - - /** - * Add a humidity bonus to crops in a specific biome - */ - @ZenMethod - public static void addBiomeHumidityBonus(String biomeType, int humidityBonus) { - if(BiomeDictionary.Type.valueOf(biomeType) == null) { - MineTweakerAPI.logWarning("invalid biome type: " + biomeType); - } else if (humidityBonus < -10 || humidityBonus > 10) { - MineTweakerAPI.logWarning("humidity bonus " + humidityBonus + - " not in -10, +10 range"); - } else { - MineTweakerAPI.apply(new AddBiomeHumidityBonusAction(biomeType, humidityBonus)); - } - } - - /** - * Creates a new synthetic crop to manipulate - * @param cropOwner The mod that owns the crop - * @param cropName The name of the crop - */ - @ZenMethod - public static SyntheticCrop newCrop(String cropName, String cropOwner) { - return new SyntheticCrop(cropName, cropOwner); - } - - /** - * Register a crop into the crop system - */ - @ZenMethod - public static void registerCrop(CropCard c) { - MineTweakerAPI.apply(new RegisterCropCardAction(c)); - } - - /** - * Register a new base seed item to plant a crop - * - * @param seed The item to plant with - * @param c The crop being planted - * @param sz The initial size of the planted crop - * @param growth The initial growth stat of the planted crop - * @param gain The initial gain stat of the planted crop - * @param resist The initial resistance of the planted crop - */ - public static void registerBaseSeed(IItemStack seed, CropCard c, int sz, - int growth, int gain, int resist) { - MineTweakerAPI.apply(new RegisterBaseSeedAction(seed, c, sz, growth, gain, resist)); - } - - /** - * Get a crop by its name and owning mod - * @param owner The mod that owns the crop - * @param name The name of the crop - * @return A crop with the given name, owned by the given mod - */ - @ZenMethod - public static Crop getCrop(String owner, String name) { - return new Crop(Crops.instance.getCropCard(owner, name)); - } - - /** - * Get a crop by the seed that plants it - * @param seed The seed that plants the crop - * @return The crop planted by the seed - */ - @ZenMethod - public static Crop getCrop(IItemStack seed) { - return new Crop(Crops.instance.getCropCard(MineTweakerMC.getItemStack(seed))); - } - - /** - * Get all of the currently registered crops - * @return All of the currently registered crops - */ - @ZenGetter("crops") - public static List getAllCrops() { - Collection ccList = Crops.instance.getCrops(); - - List cList = new ArrayList(ccList.size()); - for (CropCard cropCard : ccList) { - cList.add(new Crop(cropCard)); - } - - return cList; - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/GrowthRequirements.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/GrowthRequirements.java deleted file mode 100644 index c7d9ea1..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/GrowthRequirements.java +++ /dev/null @@ -1,144 +0,0 @@ -package minetweaker.mods.ic2.crops; - -import minetweaker.api.item.IItemStack; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.ZenSetter; - -/** - * Contains all of the growth requirements for an IC2 crop in one easy place - * @author ben - * - */ -@ZenClass("mods.ic2.GrowthRequirements") -public class GrowthRequirements { - - private int minNutrients; - private int minHumidity; - private int minAirQuality; - - private int minLight; - private int maxLight = 17; - - private IItemStack requiredBlock; - - /** - * Get the minimum amount of nutrients this plant needs to grow - * @return The minimum amount of nutrients this plant needs - */ - @ZenGetter("minNutrients") - public int getMinNutrients() { - return minNutrients; - } - - /** - * Set the minimum amount of nutrients this plant needs to grow - * @param minNutrients The new minimum amount of nutrients this plant requires - */ - @ZenSetter("minNutrients") - public void setMinNutrients(int minNutrients) { - this.minNutrients = minNutrients; - } - - /** - * Get the minimum amount of humidity this plant requires - * @return The minimum amount of humidity this plant requires - */ - @ZenGetter("minHumidity") - public int getMinHumidity() { - return minHumidity; - } - - /** - * Set the minimum amount of humidity this plant requires - * @param minHumidity The new minimum amount of humidity this plant requires - */ - @ZenSetter("minHumidity") - public void setMinHumidity(int minHumidity) { - this.minHumidity = minHumidity; - } - - /** - * Get the minimum air quality this plant requires - * @return The minimum air quality this plant requires - */ - @ZenGetter("minAirQuality") - public int getMinAirQuality() { - return minAirQuality; - } - - /** - * Set the minimum air quality this plant requires - * @param minAirQuality The new amount of air quality this plant requires - */ - @ZenSetter("minAirQuality") - public void setMinAirQuality(int minAirQuality) { - this.minAirQuality = minAirQuality; - } - - /** - * Get the minimum amount of light this plant requires - * @return The minimum amount of light this plant requires - */ - @ZenGetter("minLight") - public int getMinLight() { - return minLight; - } - - /** - * Set the minimum amount of light this plant requires - * @param minLight The new minimum amount of light this plant requires - */ - @ZenSetter("minLight") - public void setMinLight(int minLight) { - this.minLight = minLight; - } - - /** - * Get the maximum amount of light this plant can have - * @return The maximum amount of light this plant can have - */ - @ZenGetter("maxLight") - public int getMaxLight() { - return maxLight; - } - - /** - * Set the maximum amount of light this plant can have - * @param maxLight The new maximum amount of light thi plant can have - */ - @ZenSetter("maxLight") - public void setMaxLight(int maxLight) { - this.maxLight = maxLight; - } - - /** - * Get the block that is required to be below this one - * @return The block required to be below this one - */ - @ZenGetter("requiredBlock") - public IItemStack getRequiredBlock() { - return requiredBlock; - } - - /** - * Set the block required to be below this one - * @param requiredBlock The new block required to be below this one - */ - @ZenSetter("requiredBlock") - public void setRequiredBlock(IItemStack requiredBlock) { - this.requiredBlock = requiredBlock; - } - - - public GrowthRequirements(int minNutrients, int minHumidity, int minAirQuality, int minLight, int maxLight, - IItemStack requiredBlock) { - super(); - this.minNutrients = minNutrients; - this.minHumidity = minHumidity; - this.minAirQuality = minAirQuality; - this.minLight = minLight; - this.maxLight = maxLight; - this.requiredBlock = requiredBlock; - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java deleted file mode 100644 index baf287c..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java +++ /dev/null @@ -1,295 +0,0 @@ -package minetweaker.mods.ic2.crops; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.crops.CropCard; -import ic2.api.crops.ICropTile; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.ZenMethod; -import stanhebben.zenscript.annotations.ZenSetter; - -/** - * A synthetic crop, created in ZS - * - * For your crop textures to be picked up, put them at owner + ":crops/crop" + - * name + "." + size where owner is the mod responsible for the crop name is the - * name of the crop size is the current size of the crop, starting at 0 for new - * crops - * - * Localizations will be looked for at owner + ".crop." + name where each field - * has the value it has above - * - * @author ben - * - */ -@ZenClass("mods.ic2.SyntheticCrop") -public class SyntheticCrop extends CropCard { - - private String name; - private String owner; - - private int tier; - - private int[] stats = new int[4]; - private String[] attributes; - - private int maxSize; - - private float dropChance; - private IItemStack fruit; - - private GrowthRequirements reqs; - - /** - * Create a new synthetic crop - * - * @param cropName - * The name of this crop - * @param cropOwner - * The mod creating this crop - */ - public SyntheticCrop(String cropName, String cropOwner) { - name = cropName; - } - - // Required IC2 Interface - /** - * Gets the name of this crop used as a identifier - */ - @Override - @ZenGetter("name") - public String name() { - return name; - } - - /** - * Get the mod that owns this crop - */ - @Override - @ZenGetter("owner") - public String owner() { - return owner; - } - - /** - * Gets the localization key used for this crop - */ - @Override - public String displayName() { - return owner + ".crop." + name; - } - - /** - * Gets the seed tier of this crop. - */ - @Override - @ZenGetter("tier") - public int tier() { - return tier; - } - - /** - * Gets the value of a particular stat for this crop - * - * Stats: - 0: Chemistry (Industrial uses based on chemical plant - * components) - 1: Consumable (Food, potion ingredients, stuff meant to be - * eaten or similarly used) - 2: Defensive (Plants with defense capabilities - * (damaging, explosive, chemical) or special abilities in general) - 3: - * Colorful (How colorful/aesthetically/beautiful is the plant, like - * dye-plants or plants without actual effects) - 4: Weed (Is this plant - * weed-like and rather unwanted/quick-spreading? Rare super-breed plants - * should have low values here) - * - */ - @Override - @ZenMethod - public int stat(int n) { - return stats[n]; - } - - /** - * Gets any additional attributes of this crop - */ - @Override - @ZenGetter("attributes") - public String[] attributes() { - return attributes; - } - - /** - * Gets the maximum size of this crop - */ - @Override - @ZenGetter("maxSize") - public int maxSize() { - return maxSize; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerSprites(IIconRegister iconRegister) { - textures = new IIcon[maxSize()]; - - for (int i = 1; i <= textures.length; i++) { - textures[i - 1] = iconRegister.registerIcon(owner() + ":crop/crop" + name() + "." + i); - } - } - - @Override - public boolean canGrow(ICropTile crop) { - if (crop.getSize() == maxSize) { - return false; - } else if (reqs == null) { - return true; - } else { - if(!crop.isBlockBelow(MineTweakerMC.getBlock(reqs.getRequiredBlock()))) { - return false; - } else if(crop.getAirQuality() < reqs.getMinAirQuality()){ - return false; - } else if(crop.getHumidity() < reqs.getMinHumidity()) { - return false; - } else if(crop.getNutrients() < reqs.getMinNutrients()) { - return false; - } else { - int lgh = crop.getLightLevel(); - return reqs.getMinLight() < lgh && reqs.getMaxLight() > lgh; - } - } - } - - @Override - public int getOptimalHavestSize(ICropTile crop) { - return maxSize; - } - - @Override - public boolean canBeHarvested(ICropTile crop) { - return crop.getSize() == maxSize; - } - - @Override - public ItemStack getGain(ICropTile crop) { - return MineTweakerMC.getItemStack(fruit); - } - - /** - * Gets the chance for this crop to drop an item - */ - @Override - @ZenGetter("dropChance") - public float dropGainChance() { - return dropChance; - }; - - // ZS Support - - /** - * Sets the tier of this crop - * - * @param tier - * The new tier of this crop - */ - @ZenSetter("tier") - public void setTier(int tier) { - this.tier = tier; - } - - /** - * Sets all of the stats for this crop - * - * @param stats - * The new stats to give to this crop - */ - @ZenSetter("stats") - public void setStats(int[] stats) { - this.stats = stats; - } - - /** - * Sets an individual stat for this crop - * - * @param stat - * The stat to set a value for - * @param val - * The new value for this stat - */ - @ZenMethod - public void setStat(int stat, int val) { - if (stat < 0 || stat > 3) { - MineTweakerAPI.logWarning("invalid stat index " + stat); - } else { - stats[stat] = val; - } - } - - /** - * Sets the additional attributes for this crop - * - * @param attributes - * Sets the attributes of this crop - */ - @ZenSetter("attributes") - public void setAttributes(String[] attributes) { - this.attributes = attributes; - } - - /** - * Sets the maximum size this crop goes to - * - * @param maxSize - * The new max size of this crop - */ - @ZenSetter("maxSize") - public void setMaxSize(int maxSize) { - this.maxSize = maxSize; - } - - /** - * Sets the item this crop gives when harvested - * - * @param fruit - * The item to give from the crop - */ - @ZenSetter("fruit") - public void setFruit(IItemStack fruit) { - this.fruit = fruit; - } - - /** - * Sets the chance for this plant to yield its fruit - * - * @param dropChance - * The new chance for this plant to yield fruit - */ - @ZenSetter("dropChance") - public void setDropChance(int dropChance) { - this.dropChance = dropChance; - } - - /** - * Get the current requirements for this plant to grow - * - * @return The current growth requirements for this plant - */ - public GrowthRequirements getReqs() { - return reqs; - } - - /** - * Set the current growth requirements for this plant to grow - * - * @param reqs - * The new requirements for this plant to grow - */ - public void setReqs(GrowthRequirements reqs) { - this.reqs = reqs; - } - -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java deleted file mode 100644 index 864766a..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java +++ /dev/null @@ -1,54 +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.mods.ic2.expand; - -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.player.IPlayer; -import stanhebben.zenscript.annotations.ZenExpansion; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenExpansion("minetweaker.item.IIngredient") -@ModOnly("IC2") -public class IngredientExpansion { - @ZenMethod - public static IIngredient onlyIC2ChargeAtLeast(IIngredient ingredient, final int charge) { - return ingredient.only(new IItemCondition() { - @Override - public boolean matches(IItemStack stack) { - return ItemExpansion.getIC2Charge(stack) >= charge; - } - }); - } - - @ZenMethod - public static IIngredient onlyIC2ChargeAtMost(IIngredient ingredient, final int charge) { - return ingredient.only(new IItemCondition() { - @Override - public boolean matches(IItemStack stack) { - return ItemExpansion.getIC2Charge(stack) <= charge; - } - }); - } - - @ZenMethod - public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { - return ingredient.transform(new IItemTransformer() { - @Override - public IItemStack transform(IItemStack item, IPlayer byPlayer) { - return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); - } - }); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java deleted file mode 100644 index 14a1fe0..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java +++ /dev/null @@ -1,141 +0,0 @@ -package minetweaker.mods.ic2.expand; - -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import minetweaker.annotations.ModOnly; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import minetweaker.api.item.IItemStack; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenExpansion; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenExpansion("minetweaker.item.IItemStack") -@ModOnly("IC2") -public class ItemExpansion { - /** - * Gets the charge level of this item. - * - * @param stack target - * @return charge level - */ - @ZenGetter("ic2getCharge") - public static double getIC2Charge(IItemStack stack) { - return ElectricItem.manager.getCharge(getItemStack(stack)); - } - - /** - * Gets the tier level of this item. - * - * @param stack target - * @return tier level - */ - @ZenGetter("ic2tier") - public static int getIC2Tier(IItemStack stack) { - ItemStack iStack = getItemStack(stack); - if (iStack.getItem() instanceof IElectricItem) { - return ((IElectricItem) iStack.getItem()).getTier(iStack); - } else { - return 0; - } - } - - /** - * Gets the transfer limit of the specified stack. - * - * @param stack target - * @return - */ - @ZenGetter("ic2transferLimit") - public static double getIC2TransferLimit(IItemStack stack) { - ItemStack iStack = getItemStack(stack); - if (iStack.getItem() instanceof IElectricItem) { - return ((IElectricItem) iStack.getItem()).getTransferLimit(iStack); - } else { - return 0; - } - } - - /** - * Gets the fully charged IC2 item. - * - * @param stack target - * @return charged item - */ - @ZenGetter("ic2charged") - public static IItemStack getIC2Charged(IItemStack stack) { - ItemStack iStack = getItemStack(stack); - if (iStack.getItem() instanceof IElectricItem) { - IElectricItem eItem = (IElectricItem) iStack.getItem(); - Item item = eItem.getChargedItem(iStack); - ItemStack stack2 = new ItemStack(item, 1, 0); - ElectricItem.manager.charge(stack2, eItem.getMaxCharge(stack2), eItem.getTier(stack2), true, false); - return getIItemStack(stack2); - } else { - return null; - } - } - - /** - * Gets the fully discharged IC2 item. - * - * @param stack target - * @return discharged item - */ - @ZenGetter("ic2discharged") - public static IItemStack getIC2Discharged(IItemStack stack) { - ItemStack iStack = getItemStack(stack); - if (iStack.getItem() instanceof IElectricItem) { - IElectricItem eItem = (IElectricItem) iStack.getItem(); - Item item = eItem.getEmptyItem(iStack); - return getItemStack(item, 1, 0); - } else { - return null; - } - } - - /** - * Charges the item with the specified amount and returns the charged item. - * - * @param stack target - * @param amount charge amount - * @param tier charge tier - * @return charged item - */ - @ZenMethod("ic2charge") - public static IItemStack ic2Charge(IItemStack stack, double amount, @Optional int tier) { - if (tier == 0) { - tier = getIC2Tier(stack); - } - - ItemStack iStack = getItemStack(stack).copy(); - ElectricItem.manager.charge(iStack, amount, tier, true, false); - return getIItemStack(iStack); - } - - /** - * Discharges the item with the specified amount and returns the discharged item. - * - * @param stack target - * @param amount discharge amount - * @param tier charge tier - * @return discharged item - */ - @ZenMethod("ic2discharge") - public static IItemStack ic2Discharge(IItemStack stack, int amount, @Optional int tier) { - if (tier == 0) { - tier = getIC2Tier(stack); - } - - ItemStack iStack = getItemStack(stack).copy(); - ElectricItem.manager.discharge(iStack, amount, tier, true, false, false); - return getIItemStack(iStack); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java deleted file mode 100644 index ce6b8a6..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java +++ /dev/null @@ -1,71 +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.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Provides access to the IC2 Blast Furnace recipes. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.BlastFurnace") -@ModOnly("IC2") -public class BlastFurnace { - /** - * Adds a new recipe to the blast furnace. - * - * The recipe input can be any pattern, as long as the stack size is determined. - * The output can be any item stack. - * - * @param output recipe output - * @param ingredient recipe input - */ - @ZenMethod - public static void addRecipe( - @NotNull IItemStack output, - @NotNull IIngredient ingredient) { - if (ingredient.getAmount() < 0) { - MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); - } else { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "blast furnace", - Recipes.blastfurance, - getItemStacks(output), - null, - new IC2RecipeInput(ingredient))); - } - } - - /** - * Determines the recipe output for the given input. Will return the output - * of a single item, even if the stack contains multiple items. - * - * @param input recipe input - * @return recipe output - */ - @ZenMethod - public static IItemStack getOutput( - @NotNull IItemStack input) { - RecipeOutput output = Recipes.blastfurance.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java deleted file mode 100644 index 06231fd..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java +++ /dev/null @@ -1,71 +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.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Provides access to the IC2 Block Cutter recipes. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.BlockCutter") -@ModOnly("IC2") -public class BlockCutter { - /** - * Adds a new recipe to the block cutter. - * - * The recipe input can be any pattern, as long as the stack size is determined. - * The output can be any item stack. - * - * @param output recipe output - * @param ingredient recipe input - */ - @ZenMethod - public static void addRecipe( - @NotNull IItemStack output, - @NotNull IIngredient ingredient) { - if (ingredient.getAmount() < 0) { - MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); - } else { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "block cutter", - Recipes.blockcutter, - getItemStacks(output), - null, - new IC2RecipeInput(ingredient))); - } - } - - /** - * Determines the recipe output for the given input. Will return the output - * of a single item, even if the stack contains multiple items. - * - * @param input recipe input - * @return recipe output - */ - @ZenMethod - public static IItemStack getOutput( - @NotNull IItemStack input) { - RecipeOutput output = Recipes.blockcutter.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java deleted file mode 100644 index 6c698be..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ /dev/null @@ -1,259 +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.mods.ic2.machines; - -import ic2.api.recipe.RecipeInputFluidContainer; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.mods.ic2.IC2RecipeInput; -import net.minecraftforge.fluids.FluidStack; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.ic2.Canner") -@ModOnly("IC2") -public class Canner { - @ZenMethod - public static void addBottleRecipe(IItemStack output, IIngredient container, IIngredient fill) { - MineTweakerAPI.apply(new AddBottleIngredientAction(container, fill, output)); - } - - @ZenMethod - public static void addBottleRecipe(IItemStack output, IIngredient container, ILiquidStack liquid) { - MineTweakerAPI.apply(new AddBottleLiquidAction(container, liquid, output)); - } - - @ZenMethod - public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, IIngredient additive) { - MineTweakerAPI.apply(new AddEnrichIngredientAction(input, additive, output)); - } - - @ZenMethod - public static void addEnrichRecipe(ILiquidStack output, ILiquidStack input, ILiquidStack additive) { - MineTweakerAPI.apply(new AddEnrichLiquidAction(input, additive, output)); - } - - private static class AddBottleIngredientAction extends OneWayAction { - private final IIngredient container; - private final IIngredient fill; - private final IItemStack output; - - public AddBottleIngredientAction(IIngredient container, IIngredient fill, IItemStack output) { - this.container = container; - this.fill = fill; - this.output = output; - } - - @Override - public void apply() { - Recipes.cannerBottle.addRecipe( - new IC2RecipeInput(container), - new IC2RecipeInput(fill), - getItemStack(output)); - } - - @Override - public String describe() { - return "Adding canner bottle recipe " + container + " + " + fill + " => " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 67 * hash + (this.container != null ? this.container.hashCode() : 0); - hash = 67 * hash + (this.fill != null ? this.fill.hashCode() : 0); - hash = 67 * hash + (this.output != null ? this.output.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddBottleIngredientAction other = (AddBottleIngredientAction) obj; - if (this.container != other.container && (this.container == null || !this.container.equals(other.container))) { - return false; - } - if (this.fill != other.fill && (this.fill == null || !this.fill.equals(other.fill))) { - return false; - } - if (this.output != other.output && (this.output == null || !this.output.equals(other.output))) { - return false; - } - return true; - } - } - - private static class AddBottleLiquidAction extends OneWayAction { - private final IIngredient container; - private final ILiquidStack fill; - private final IItemStack output; - - public AddBottleLiquidAction(IIngredient container, ILiquidStack fill, IItemStack output) { - this.container = container; - this.fill = fill; - this.output = output; - } - - @Override - public void apply() { - Recipes.cannerBottle.addRecipe( - new IC2RecipeInput(container), - new RecipeInputFluidContainer( - ((FluidStack) fill.getInternal()).getFluid(), - fill.getAmount()), - getItemStack(output)); - } - - @Override - public String describe() { - return "Adding cannor bottle recipe " + container + " + " + fill + " => " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddEnrichIngredientAction extends OneWayAction { - private final ILiquidStack input; - private final IIngredient additive; - private final ILiquidStack output; - - public AddEnrichIngredientAction(ILiquidStack input, IIngredient additive, ILiquidStack output) { - this.input = input; - this.additive = additive; - this.output = output; - } - - @Override - public void apply() { - Recipes.cannerEnrich.addRecipe((FluidStack) input.getInternal(), new IC2RecipeInput(additive), (FluidStack) output.getInternal()); - } - - @Override - public String describe() { - return "Adding canner enrich recipe " + input + " + " + additive + " => " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 47 * hash + (this.input != null ? this.input.hashCode() : 0); - hash = 47 * hash + (this.additive != null ? this.additive.hashCode() : 0); - hash = 47 * hash + (this.output != null ? this.output.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddEnrichIngredientAction other = (AddEnrichIngredientAction) obj; - if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) { - return false; - } - if (this.additive != other.additive && (this.additive == null || !this.additive.equals(other.additive))) { - return false; - } - if (this.output != other.output && (this.output == null || !this.output.equals(other.output))) { - return false; - } - return true; - } - } - - private static class AddEnrichLiquidAction extends OneWayAction { - private final ILiquidStack input; - private final ILiquidStack additive; - private final ILiquidStack output; - - public AddEnrichLiquidAction(ILiquidStack input, ILiquidStack additive, ILiquidStack output) { - this.input = input; - this.additive = additive; - this.output = output; - } - - @Override - public void apply() { - Recipes.cannerEnrich.addRecipe( - (FluidStack) input.getInternal(), new RecipeInputFluidContainer( - ((FluidStack) additive.getInternal()).getFluid(), - additive.getAmount()), - (FluidStack) output.getInternal()); - } - - @Override - public String describe() { - return "Adding canner enrich recipe " + input + " + " + additive + " => " + output; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 19 * hash + (this.input != null ? this.input.hashCode() : 0); - hash = 19 * hash + (this.additive != null ? this.additive.hashCode() : 0); - hash = 19 * hash + (this.output != null ? this.output.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddEnrichLiquidAction other = (AddEnrichLiquidAction) obj; - if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) { - return false; - } - if (this.additive != other.additive && (this.additive == null || !this.additive.equals(other.additive))) { - return false; - } - if (this.output != other.output && (this.output == null || !this.output.equals(other.output))) { - return false; - } - return true; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java deleted file mode 100644 index 24bd1a6..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Compressor.java +++ /dev/null @@ -1,69 +0,0 @@ -package minetweaker.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Provides access to the IC2 compressor recipes. Recipes can be added but not - * removed, due to IC2 API restrictions. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.Compressor") -@ModOnly("IC2") -public class Compressor { - /** - * Adds a new recipe to the compressor. - * - * The recipe input can be any pattern, as long as the stack size is determined. - * The output can be any item stack. - * - * @param output recipe output - * @param ingredient recipe input - */ - @ZenMethod - public static void addRecipe( - @NotNull IItemStack output, - @NotNull IIngredient ingredient) { - if (ingredient.getAmount() < 0) { - MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); - } else { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "compressor", - Recipes.compressor, - getItemStacks(output), - null, - new IC2RecipeInput(ingredient))); - } - } - - /** - * Determines the recipe output for the given input. Will return the output - * of a single item, even if the stack contains multiple items. - * - * @param input recipe input - * @return recipe output - */ - @ZenMethod - public static IItemStack getOutput( - @NotNull IItemStack input) { - RecipeOutput output = Recipes.compressor.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) { - System.out.println("No output"); - return null; - } - return getIItemStack(output.items.get(0)); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java deleted file mode 100644 index f83590a..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Extractor.java +++ /dev/null @@ -1,71 +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.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Provides access to the IC2 Extractor recipes. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.Extractor") -@ModOnly("IC2") -public class Extractor { - /** - * Adds a new recipe to the extractor. - * - * The recipe input can be any pattern, as long as the stack size is determined. - * The output can be any item stack. - * - * @param output recipe output - * @param ingredient recipe input - */ - @ZenMethod - public static void addRecipe( - @NotNull IItemStack output, - @NotNull IIngredient ingredient) { - if (ingredient.getAmount() < 0) { - MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); - } else { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "extractor", - Recipes.extractor, - getItemStacks(output), - null, - new IC2RecipeInput(ingredient))); - } - } - - /** - * Determines the recipe output for the given input. Will return the output - * of a single item, even if the stack contains multiple items. - * - * @param input recipe input - * @return recipe output - */ - @ZenMethod - public static IItemStack getOutput( - @NotNull IItemStack input) { - RecipeOutput output = Recipes.extractor.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java deleted file mode 100644 index e061463..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java +++ /dev/null @@ -1,91 +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.mods.ic2.machines; - -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.liquid.ILiquidStack; -import net.minecraftforge.fluids.FluidRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Add a fluid to the fluid heat generator - * @author Stan - */ -@ZenClass("mods.ic2.FluidHeatGenerator") -@ModOnly("IC2") -public class FluidHeatGenerator { - @ZenMethod - public static void addFluid(ILiquidStack liquidPerTick, int heatPerTick) { - MineTweakerAPI.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), heatPerTick)); - } - - @ZenMethod - public static boolean accepts(ILiquidStack liquid) { - return Recipes.FluidHeatGenerator.acceptsFluid(FluidRegistry.getFluid(liquid.getName())); - } - - private static class AddFluidAction extends OneWayAction { - private final String name; - private final int liquidPerTick; - private final int heatPerTick; - - public AddFluidAction(String name, int liquidPerTick, int heatPerTick) { - this.name = name; - this.liquidPerTick = liquidPerTick; - this.heatPerTick = heatPerTick; - } - - @Override - public void apply() { - Recipes.FluidHeatGenerator.addFluid(name, liquidPerTick, heatPerTick); - } - - @Override - public String describe() { - return "Adding liquid " + name + " as fluid heat generator fuel"; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0); - hash = 47 * hash + this.liquidPerTick; - hash = 47 * hash + this.heatPerTick; - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddFluidAction other = (AddFluidAction) obj; - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - if (this.liquidPerTick != other.liquidPerTick) { - return false; - } - if (this.heatPerTick != other.heatPerTick) { - return false; - } - return true; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java deleted file mode 100644 index d985d16..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Macerator.java +++ /dev/null @@ -1,66 +0,0 @@ -package minetweaker.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Provides access to the IC2 macerator recipes. Recipes can be added but not - * removed, due to IC2 API restrictions. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.Macerator") -@ModOnly("IC2") -public class Macerator { - /** - * Adds a new recipe to the macerator. - * - * The recipe input can be any pattern, as long as the stack size is determined. - * The output can be any item stack. - * - * @param output recipe output - * @param ingredient recipe input - */ - @ZenMethod - public static void addRecipe( - @NotNull IItemStack output, - @NotNull IIngredient ingredient) { - if (ingredient.getAmount() < 0) { - MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); - } else { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "macerator", - Recipes.macerator, - getItemStacks(output), - null, - new IC2RecipeInput(ingredient))); - } - } - - /** - * Determines the recipe output for the given input. Will return the output - * of a single item, even if the stack contains multiple items. - * - * @param input recipe input - * @return recipe output - */ - @ZenMethod - public static IItemStack getOutput( - @NotNull IItemStack input) { - RecipeOutput output = Recipes.macerator.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java deleted file mode 100644 index 1a63967..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java +++ /dev/null @@ -1,35 +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.mods.ic2.machines; - -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.ic2.MatterAmplifier") -@ModOnly("IC2") -public class MatterAmplifier { - private MatterAmplifier() {} - - @ZenMethod - public static void setAmplifier(IIngredient item, int amplifier) { - NBTTagCompound data = new NBTTagCompound(); - data.setInteger("amplification", amplifier); - MineTweakerAPI.apply(new MachineAddRecipeAction("matter amplifier", Recipes.matterAmplifier, new ItemStack[0], data, new IC2RecipeInput(item))); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java deleted file mode 100644 index 774f081..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java +++ /dev/null @@ -1,115 +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.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.MetalFormer") -@ModOnly("IC2") -public class MetalFormer { - /** - * Adds an extruding recipe to the metal former. - * - * @param output output item - * @param input input item - */ - @ZenMethod - public static void addExtrudingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "metal former - extruding", - Recipes.metalformerExtruding, - getItemStacks(output), - null, - new IC2RecipeInput(input))); - } - - /** - * Gets the extruding output for the given input. - * - * @param input input item - * @return output item, or null - */ - @ZenMethod - public static IItemStack getExtrudingOutput(IItemStack input) { - RecipeOutput output = Recipes.metalformerExtruding.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } - - /** - * Adds a rolling recipe to the metal former. - * - * @param output output item - * @param input input item - */ - @ZenMethod - public static void addRollingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "metal former - rolling", - Recipes.metalformerRolling, - getItemStacks(output), - null, - new IC2RecipeInput(input))); - } - - /** - * Gets the extruding output for the given input. - * - * @param input input item - * @return output item, or null - */ - @ZenMethod - public static IItemStack getRollingOutput(IItemStack input) { - RecipeOutput output = Recipes.metalformerRolling.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } - /** - * Adds a extruding recipe to the metal former. - * - * @param output output item - * @param input input item - */ - @ZenMethod - public static void addCuttingRecipe(IItemStack output, IIngredient input) { - MineTweakerAPI.apply(new MachineAddRecipeAction( - "metal former - cutting", - Recipes.metalformerCutting, - getItemStacks(output), - null, - new IC2RecipeInput(input))); - } - - /** - * Gets the cutting output for the given input. - * - * @param input input item - * @return output item, or null - */ - @ZenMethod - public static IItemStack getCuttingOutput(IItemStack input) { - RecipeOutput output = Recipes.metalformerCutting.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStack(output.items.get(0)); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java deleted file mode 100644 index a0af2f9..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java +++ /dev/null @@ -1,43 +0,0 @@ -package minetweaker.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStacks; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import net.minecraft.nbt.NBTTagCompound; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.OreWasher") -@ModOnly("IC2") -public class OreWasher { - @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input, int millibuckets) { - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger("amount", millibuckets); - MineTweakerAPI.apply(new MachineAddRecipeAction( - "ore washer", - Recipes.oreWashing, - getItemStacks(output), - nbt, - new IC2RecipeInput(input))); - } - - @ZenMethod - public static IItemStack[] getOutput(IItemStack input) { - RecipeOutput output = Recipes.oreWashing.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStacks(output.items); - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java deleted file mode 100644 index d7d1d29..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/Recycler.java +++ /dev/null @@ -1,81 +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.mods.ic2.machines; - -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.mods.ic2.IC2RecipeInput; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.ic2.Recycler") -@ModOnly("IC2") -public class Recycler { - @ZenMethod - public static void addBlacklist(IIngredient ingredient) { - MineTweakerAPI.apply(new AddBlacklistAction(ingredient)); - } - - @ZenMethod - public static boolean isBlacklisted(IItemStack item) { - return Recipes.recyclerBlacklist.contains(getItemStack(item)); - } - - private static class AddBlacklistAction extends OneWayAction { - private IIngredient ingredient; - - public AddBlacklistAction(IIngredient ingredient) { - this.ingredient = ingredient; - } - - @Override - public void apply() { - Recipes.recyclerBlacklist.add(new IC2RecipeInput(ingredient)); - } - - @Override - public String describe() { - return "Adding " + ingredient + " to the recycler blacklist"; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 3; - hash = 29 * hash + (this.ingredient != null ? this.ingredient.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddBlacklistAction other = (AddBlacklistAction) obj; - if (this.ingredient != other.ingredient && (this.ingredient == null || !this.ingredient.equals(other.ingredient))) { - return false; - } - return true; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java deleted file mode 100644 index 943ff5c..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java +++ /dev/null @@ -1,90 +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.mods.ic2.machines; - -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.WeightedItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.ic2.ScrapBox") -@ModOnly("IC2") -public class ScrapBox { - /** - * Adds an item drop. - * - * Reference scrap box chance values: - * - * 0.1: Diamond - * 0.5: Cake, Gold Helmet, Iron Ore, Gold Ore - * 1.0: Wooden tools, Soul Sand, Sign, Leather, Feather, Bone - * 1.5: Apple, Bread - * 2.0: Netherrack, Rotten Flesh - * 3.0: Grass, Gravel - * 4.0: Stick - * 5.0: Dirt, Wooden Hoe - * - * @param stack weighted item stack to add - */ - @ZenMethod - public static void addDrop(WeightedItemStack stack) { - MineTweakerAPI.apply(new AddDropAction(stack)); - } - - private static class AddDropAction extends OneWayAction { - private final WeightedItemStack stack; - - public AddDropAction(WeightedItemStack stack) { - this.stack = stack; - } - - @Override - public void apply() { - Recipes.scrapboxDrops.addDrop(getItemStack(stack.getStack()), stack.getChance()); - } - - @Override - public String describe() { - return "Adding scrapbox drop " + stack.getStack(); - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 71 * hash + (this.stack != null ? this.stack.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddDropAction other = (AddDropAction) obj; - if (this.stack != other.stack && (this.stack == null || !this.stack.equals(other.stack))) { - return false; - } - return true; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java deleted file mode 100644 index 348713c..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java +++ /dev/null @@ -1,91 +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.mods.ic2.machines; - -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.liquid.ILiquidStack; -import net.minecraftforge.fluids.FluidRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Add a fluid to the semi-fluid generator - * @author Stan - */ -@ZenClass("mods.ic2.SemiFluidGenerator") -@ModOnly("IC2") -public class SemiFluidGenerator { - @ZenMethod - public static void addFluid(ILiquidStack liquidPerTick, int energyPerTick) { - MineTweakerAPI.apply(new AddFluidAction(liquidPerTick.getName(), liquidPerTick.getAmount(), energyPerTick)); - } - - @ZenMethod - public static boolean accepts(ILiquidStack liquid) { - return Recipes.semiFluidGenerator.acceptsFluid(FluidRegistry.getFluid(liquid.getName())); - } - - private static class AddFluidAction extends OneWayAction { - private final String name; - private final int liquidPerTick; - private final int energyPerTick; - - public AddFluidAction(String name, int liquidPerTick, int energyPerTick) { - this.name = name; - this.liquidPerTick = liquidPerTick; - this.energyPerTick = energyPerTick; - } - - @Override - public void apply() { - Recipes.semiFluidGenerator.addFluid(name, liquidPerTick, energyPerTick); - } - - @Override - public String describe() { - return "Adding liquid " + name + " as semifluid fuel"; - } - - @Override - public Object getOverrideKey() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0); - hash = 47 * hash + this.liquidPerTick; - hash = 47 * hash + this.energyPerTick; - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AddFluidAction other = (AddFluidAction) obj; - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - if (this.liquidPerTick != other.liquidPerTick) { - return false; - } - if (this.energyPerTick != other.energyPerTick) { - return false; - } - return true; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java deleted file mode 100644 index 9d7accf..0000000 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java +++ /dev/null @@ -1,81 +0,0 @@ -package minetweaker.mods.ic2.machines; - -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStacks; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; -import net.minecraft.nbt.NBTTagCompound; -import minetweaker.mods.ic2.IC2RecipeInput; -import minetweaker.mods.ic2.MachineAddRecipeAction; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * Provides access to the IC2 compressor recipes. Recipes can be added but not - * removed, due to IC2 API restrictions. - * - * @author Stan Hebben - */ -@ZenClass("mods.ic2.ThermalCentrifuge") -@ModOnly("IC2") -public class ThermalCentrifuge { - /** - * Adds a new recipe to the centrifuge. - * - * The recipe input can be any ingredient, as long as the stack size is determined. - * The output is an array of item stacks. - * - * @param output recipe outputs - * @param ingredient recipe input - * @param minHeat minimum centrifuge heat level - */ - @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient ingredient, int minHeat) { - if (ingredient.getAmount() < 0) { - MineTweakerAPI.logWarning("invalid ingredient: " + ingredient + " - stack size not known"); - } else { - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("minHeat", minHeat); - MineTweakerAPI.apply(new MachineAddRecipeAction( - "thermal centrifuge", - Recipes.centrifuge, - getItemStacks(output), - tag, - new IC2RecipeInput(ingredient))); - } - } - - /** - * Adds a new recipe to the centrifuge. - * - * The recipe input can be any ingredient, as long as the stack size is determined. - * The output can be any item stack. - * - * @param output recipe output - * @param ingredient recipe input - * @param minHeat minimum centrifuge heat level - */ - @ZenMethod - public static void addRecipe(IItemStack output, IIngredient ingredient, int minHeat) { - addRecipe(new IItemStack[] { output }, ingredient, minHeat); - } - - /** - * Determines the recipe output for the given input. Will return the output - * of a single item, even if the stack contains multiple items. - * - * @param input recipe input - * @return recipe output - */ - @ZenMethod - public static IItemStack[] getOutput(IItemStack input) { - RecipeOutput output = Recipes.centrifuge.getOutputFor(getItemStack(input), false); - if (output == null || output.items.isEmpty()) return null; - return getIItemStacks(output.items); - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/build.gradle b/MineTweaker3-MC1710-Mod-MFR/build.gradle deleted file mode 100644 index fc9033e..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -apply plugin: 'forge' - -minecraft { - version = forgeVersion1710 -} - -version = "1.0" -archivesBaseName = project.projectDir.name - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') - compile project(':MineTweaker3-MC1710-Main') - compile files('libs/MineFactoryReloaded-[1.7.10]2.8.0-104.jar', 'libs/ThermalFoundation-[1.7.10]1.2.0-102.jar', 'libs/CoFHCore-[1.7.10]3.0.3-303.jar') -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mods.mfr.ClassRegistry' -} - -tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1710-Mod-MFR/libs/CoFHCore-[1.7.10]3.0.3-303.jar b/MineTweaker3-MC1710-Mod-MFR/libs/CoFHCore-[1.7.10]3.0.3-303.jar deleted file mode 100644 index 1de6d6e..0000000 Binary files a/MineTweaker3-MC1710-Mod-MFR/libs/CoFHCore-[1.7.10]3.0.3-303.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-MFR/libs/MineFactoryReloaded-[1.7.10]2.8.0-104.jar b/MineTweaker3-MC1710-Mod-MFR/libs/MineFactoryReloaded-[1.7.10]2.8.0-104.jar deleted file mode 100644 index 19ef285..0000000 Binary files a/MineTweaker3-MC1710-Mod-MFR/libs/MineFactoryReloaded-[1.7.10]2.8.0-104.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-MFR/libs/ThermalFoundation-[1.7.10]1.2.0-102.jar b/MineTweaker3-MC1710-Mod-MFR/libs/ThermalFoundation-[1.7.10]1.2.0-102.jar deleted file mode 100644 index 33d20a5..0000000 Binary files a/MineTweaker3-MC1710-Mod-MFR/libs/ThermalFoundation-[1.7.10]1.2.0-102.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java deleted file mode 100644 index 770d9df..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/FertilizableType.java +++ /dev/null @@ -1,16 +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.mods.mfr; - -/** - * - * @author Stanneke - */ -public enum FertilizableType { - REPLACE, - BONEMEAL -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/MFRCommands.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/MFRCommands.java deleted file mode 100644 index a3f614e..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/MFRCommands.java +++ /dev/null @@ -1,131 +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.mods.mfr; - -import java.util.Map; -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.MineTweakerImplementationAPI.ReloadEvent; -import minetweaker.annotations.OnRegister; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.ICommandFunction; -import minetweaker.util.IEventHandler; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; -import cofh.lib.util.WeightedRandomItemStack; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.IFactoryFertilizer; -import powercrystals.minefactoryreloaded.api.IFactoryFruit; - -/** - * - * @author Stan - */ -public class MFRCommands { - private static final String[] DESCRIPTION = { - " MineFactory commands:", - " /minetweaker mfr fertilizers", - " Lists all fertilizers", - " /minetweaker mfr fruits", - " Lists all known fruit blocks", - " /minetweaker mfr laserores", - " Lists all ores known to the mining laser", - " /minetweaker mfr rubbertreebiomes", - " Lists all biomes for the rubber tree", - " /minetweaker mfr sludgedrops", - " Lists all sludge boiler drops" - }; - - @OnRegister - public static void onRegister() { - MineTweakerImplementationAPI.onReloadEvent(new IEventHandler() { - @Override - public void handle(ReloadEvent event) { - MineTweakerImplementationAPI.addMineTweakerCommand("mfr", DESCRIPTION, new ICommandFunction() { - @Override - public void execute(String[] arguments, IPlayer player) { - if (arguments.length < 1) { - player.sendChat("Please specify a mfr command"); - } else { - if (arguments[0].equals("fertilizers")) { - MineTweakerAPI.logCommand("Fertilizers:"); - - for (Map.Entry fertilizer : MFRRegistry.getFertilizers().entrySet()) { - IItemStack item = MineTweakerMC.getItemStack(fertilizer.getKey(), 1, 0); - String message = "- " + item + " (" + item.getDisplayName() + ")"; - MineTweakerAPI.logCommand(message); - } - - player.sendChat("Fertilizer list generated; see minetweaker.log"); - } else if (arguments[0].equals("fruits")) { - MineTweakerAPI.logCommand("Fruit Blocks:"); - - for (Map.Entry fruitBlock : MFRRegistry.getFruits().entrySet()) { - Block block = fruitBlock.getKey(); - String message = "- " + block.getUnlocalizedName() + " (" + block.getLocalizedName() + ")"; - MineTweakerAPI.logCommand(message); - } - - player.sendChat("Fluit blocks list generated; see minetweaker.log"); - } else if (arguments[0].equals("laserores")) { - MineTweakerAPI.logCommand("Laser ores:"); - - for (WeightedRandom.Item randomItem : MFRRegistry.getLaserOres()) { - if (randomItem instanceof WeightedRandomItemStack) { - WeightedRandomItemStack randomItemStack = (WeightedRandomItemStack) randomItem; - IItemStack item = MineTweakerMC.getIItemStack(randomItemStack.getStack()); - MineTweakerAPI.logCommand(" (" + randomItemStack.itemWeight + "): " + item + " (" + item.getDisplayName() + ")"); - } - } - - player.sendChat("Laser ore list generated; see minetweaker.log"); - - for (int i = 0; i < MineTweakerAPI.COLOR_NAMES.length; i++) { - if (MFRRegistry.getLaserPreferredOres(i) != null && !MFRRegistry.getLaserPreferredOres(i).isEmpty()) { - MineTweakerAPI.logCommand("Laser affinity " + i + " (" + MineTweakerAPI.COLOR_NAMES[i] + "):"); - - for (ItemStack item : MFRRegistry.getLaserPreferredOres(i)) { - IItemStack iitem = MineTweakerMC.getIItemStack(item); - MineTweakerAPI.logCommand(" " + iitem + " (" + iitem.getDisplayName() + ")"); - } - } - } - - player.sendChat("Laser preferred ore list generated; see minetweaker.log"); - } else if (arguments[0].equals("rubbertreebiomes")) { - MineTweakerAPI.logCommand("Rubber tree biomes:"); - for (String biome : MFRRegistry.getRubberTreeBiomes()) { - MineTweakerAPI.logCommand(" " + biome); - } - - player.sendChat("Rubber tree biome list generated; see minetweaker.log"); - } else if (arguments[0].equals("sludgedrops")) { - MineTweakerAPI.logCommand("Sludge drops:"); - - for (WeightedRandom.Item randItem : MFRRegistry.getSludgeDrops()) { - if (randItem instanceof WeightedRandomItemStack) { - WeightedRandomItemStack randomItem = (WeightedRandomItemStack) randItem; - IItemStack item = MineTweakerMC.getIItemStack(randomItem.getStack()); - MineTweakerAPI.logCommand(" (" + randomItem.itemWeight + "): " + item + " (" + item.getDisplayName() + ")"); - } - } - - player.sendChat("Sludge drop list generated; see minetweaker.log"); - } else { - player.sendChat("Unknown mfr command: " + arguments[1]); - } - } - } - }); - } - }); - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java deleted file mode 100644 index 9b4598a..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/PrePlantAction.java +++ /dev/null @@ -1,16 +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.mods.mfr; - -/** - * - * @author Stanneke - */ -public enum PrePlantAction { - NONE, - TILL -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/AutoSpawner.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/AutoSpawner.java deleted file mode 100644 index 5bbf87e..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/AutoSpawner.java +++ /dev/null @@ -1,116 +0,0 @@ -package minetweaker.mods.mfr.machines; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import static minetweaker.mc1710.util.MineTweakerPlatformUtils.getLivingEntityClass; -import net.minecraft.entity.EntityLivingBase; -import powercrystals.minefactoryreloaded.MFRRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.AutoSpawner") -@ModOnly("MineFactoryReloaded") -public class AutoSpawner { - @ZenMethod - public static void addBlacklist(String entityClassName) { - MineTweakerAPI.apply(new AutoSpawnerAddBlacklistAction(getLivingEntityClass(entityClassName))); - } - - @ZenMethod - public static void removeBlacklist(String entityClassName) { - MineTweakerAPI.apply(new AutoSpawnerRemoveBlacklistAction(getLivingEntityClass(entityClassName))); - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AutoSpawnerAddBlacklistAction implements IUndoableAction { - private final Class entityClass; - private final boolean existed; - - public AutoSpawnerAddBlacklistAction(Class entityClass) { - this.entityClass = entityClass; - existed = MFRRegistry.getAutoSpawnerClassBlacklist().contains(entityClass); - } - - @Override - public void apply() { - if (!existed) - MFRRegistry.registerAutoSpawnerBlacklistClass(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - if (!existed) - MFRRegistry.getAutoSpawnerClassBlacklist().remove(entityClass); - } - - @Override - public String describe() { - return "Adding auto-spawner blacklist " + entityClass.getCanonicalName(); - } - - @Override - public String describeUndo() { - return "Removing auto-spawner blacklist " + entityClass.getCanonicalName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AutoSpawnerRemoveBlacklistAction implements IUndoableAction { - private final Class entityClass; - private final boolean existed; - - public AutoSpawnerRemoveBlacklistAction(Class entityClass) { - this.entityClass = entityClass; - existed = MFRRegistry.getAutoSpawnerClassBlacklist().contains(entityClass); - } - - @Override - public void apply() { - if (existed) - MFRRegistry.getAutoSpawnerClassBlacklist().remove(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - if (existed) - MFRRegistry.getAutoSpawnerClassBlacklist().add(entityClass); - } - - @Override - public String describe() { - return "Removing auto-spawner blacklist " + entityClass.getCanonicalName(); - } - - @Override - public String describeUndo() { - return "Restoring auto-spawner blacklist " + entityClass.getCanonicalName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java deleted file mode 100644 index 6c3ce6c..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Fertilizer.java +++ /dev/null @@ -1,349 +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.mods.mfr.machines; - -import java.util.Random; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemDye; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.FertilizerType; -import powercrystals.minefactoryreloaded.api.IFactoryFertilizable; -import powercrystals.minefactoryreloaded.api.IFactoryFertilizer; -import minetweaker.mods.mfr.FertilizableType; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.Fertilizer") -@ModOnly("MineFactoryReloaded") -public class Fertilizer { - @ZenMethod - public static void addFertilizable(IItemStack block, String fertilizeType, @Optional String method, @Optional IItemStack replacement) { - FertilizerType fertilizer; - if (fertilizeType.equals("any")) { - fertilizer = null; - } else if (fertilizeType.equals("normal")) { - fertilizer = FertilizerType.GrowPlant; - } else if (fertilizeType.equals("grass")) { - fertilizer = FertilizerType.Grass; - } else if (fertilizeType.equals("magic")) { - fertilizer = FertilizerType.GrowMagicalCrop; - } else { - throw new IllegalArgumentException("Unknown fertilizer type: " + fertilizeType); - } - - FertilizableType type = FertilizableType.BONEMEAL; - - if (method == null || method.equals("bonemeal")) { - type = FertilizableType.BONEMEAL; - } else if (method.equals("replace")) { - type = FertilizableType.REPLACE; - if (replacement == null) - throw new IllegalArgumentException("replace method requires a replacement block"); - } else { - throw new IllegalArgumentException("Unknown fertilization method: " + method); - } - - MineTweakerAPI.apply(new FertilizerAddFertilizableAction(block, replacement, fertilizer, type)); - } - - @ZenMethod - public static void removeFertilizable(IItemStack item) { - MineTweakerAPI.apply(new FertilizerRemoveFertilizableAction(item)); - } - - @ZenMethod - public static void addFertilizer(IItemStack item, String type) { - FertilizerType fertilizerType; - if (type.equals("grass")) { - fertilizerType = FertilizerType.Grass; - } else if (type.equals("normal")) { - fertilizerType = FertilizerType.GrowPlant; - } else if (type.equals("magic")) { - fertilizerType = FertilizerType.GrowMagicalCrop; - } else { - throw new IllegalArgumentException("Unknown fertilizer type: " + type); - } - - MineTweakerAPI.apply(new FertilizerAddFertilizerAction(item, fertilizerType)); - } - - @ZenMethod - public static void removeFertilizer(IItemStack item) { - MineTweakerAPI.apply(new FertilizerRemoveFertilizerAction(item)); - } - - // ###################### - // ### Action Classes ### - // ###################### - - public static class FertilizerAddFertilizableAction implements IUndoableAction { - private final IItemStack block; - private final IItemStack plant; - private final FertilizerType type; - private final FertilizableType method; - - private final IFactoryFertilizable old; - - public FertilizerAddFertilizableAction(IItemStack block, IItemStack plant, FertilizerType type, FertilizableType method) { - this.block = block; - this.plant = plant; - this.type = type; - this.method = method; - - old = MFRRegistry.getFertilizables().get(MineTweakerMC.getBlock(block)); - } - - @Override - public void apply() { - MFRRegistry.registerFertilizable(new SimpleFertilizable(block, plant, type)); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - if (old == null) { - MFRRegistry.getFertilizables().remove(MineTweakerMC.getBlock(block)); - } else { - MFRRegistry.registerFertilizable(old); - } - } - - @Override - public String describe() { - return "Making " + block.getDisplayName() + " fertilizable"; - } - - @Override - public String describeUndo() { - if (old == null) { - return "Removing fertilizable " + block.getDisplayName(); - } else { - return "Restoring fertilizable " + block.getDisplayName(); - } - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class FertilizerAddFertilizerAction implements IUndoableAction { - private final IItemStack item; - private final FertilizerType type; - - private final IFactoryFertilizer old; - - public FertilizerAddFertilizerAction(IItemStack item, FertilizerType type) { - this.item = item; - this.type = type; - - old = MFRRegistry.getFertilizers().get(MineTweakerMC.getItemStack(item).getItem()); - } - - @Override - public void apply() { - MFRRegistry.registerFertilizer(new SimpleFertilizer(MineTweakerMC.getItemStack(item), type)); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - if (old == null) { - MFRRegistry.getFertilizers().remove(MineTweakerMC.getItemStack(item).getItem()); - } else { - MFRRegistry.registerFertilizer(old); - } - } - - @Override - public String describe() { - return "Adding fertilizer " + item.getDisplayName(); - } - - @Override - public String describeUndo() { - if (old == null) { - return "Removing fertilizer " + item.getDisplayName(); - } else { - return "Restoring fertilizer " + item.getDisplayName(); - } - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - public static class FertilizerRemoveFertilizableAction implements IUndoableAction { - private final IItemStack item; - private final IFactoryFertilizable old; - - public FertilizerRemoveFertilizableAction(IItemStack item) { - this.item = item; - old = MFRRegistry.getFertilizables().get(MineTweakerMC.getBlock(item)); - } - - @Override - public void apply() { - MFRRegistry.getFertilizables().remove(MineTweakerMC.getBlock(item)); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.registerFertilizable(old); - } - - @Override - public String describe() { - return "Removing fertilizable " + item.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Restoring fertilizable " + item.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - public static class FertilizerRemoveFertilizerAction implements IUndoableAction { - private final IItemStack item; - private final IFactoryFertilizer old; - - public FertilizerRemoveFertilizerAction(IItemStack item) { - this.item = item; - this.old = MFRRegistry.getFertilizers().get(MineTweakerMC.getItemStack(item).getItem()); - } - - @Override - public void apply() { - MFRRegistry.getFertilizers().remove(MineTweakerMC.getItemStack(item).getItem()); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.registerFertilizer(old); - } - - @Override - public String describe() { - return "Removing fertilizer " + item.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Restoring fertilizer " + item.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class SimpleFertilizable implements IFactoryFertilizable { - private final IItemStack block; - private final IItemStack plant; - private final FertilizerType type; - - public SimpleFertilizable(IItemStack block, IItemStack plant, FertilizerType type) { - this.block = block; - this.plant = plant; - this.type = type; - } - - @Override - public Block getPlant() { - return MineTweakerMC.getBlock(block); - } - - @Override - public boolean canFertilize(World world, int x, int y, int z, FertilizerType fertilizerType) { - if (this.type != null && type != fertilizerType) - return false; - - IItemStack blockAt = MineTweakerMC.getIItemStack(new ItemStack(world.getBlock(x, y, z), 1, world.getBlockMetadata(x, y, z))); - return block.matches(blockAt); - } - - @Override - public boolean fertilize(World world, Random rand, int x, int y, int z, FertilizerType fertilizerType) { - if (plant == null) { - return ItemDye.applyBonemeal( - new ItemStack((Item) Item.itemRegistry.getObject("minecraft:dyePowder"), 1, 15), - world, - x, y, z, - null); - } else { - ItemStack istack = MineTweakerMC.getItemStack(plant); - world.setBlock(x, y, z, Block.getBlockFromItem(istack.getItem()), plant.getDamage(), 0); - return true; - } - } - } - - private static class SimpleFertilizer implements IFactoryFertilizer { - private final ItemStack item; - private final FertilizerType type; - - public SimpleFertilizer(ItemStack item, FertilizerType type) { - this.item = item; - this.type = type; - } - - @Override - public Item getFertilizer() { - return item.getItem(); - } - - @Override - public FertilizerType getFertilizerType(ItemStack is) { - return type; - } - - @Override - public void consume(ItemStack fertilizer) { - fertilizer.stackSize--; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/FruitPicker.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/FruitPicker.java deleted file mode 100644 index b51ca83..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/FruitPicker.java +++ /dev/null @@ -1,360 +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.mods.mfr.machines; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.mc1710.block.MCBlockDefinition; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.IFactoryFruit; -import powercrystals.minefactoryreloaded.api.ReplacementBlock; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.FruitPicker") -@ModOnly("MineFactoryReloaded") -public class FruitPicker { - @ZenMethod - public static void addFruit(IBlockPattern block, IBlock replacement, WeightedItemStack drop) { - addFruit(block, replacement, new WeightedItemStack[] { drop }); - } - - @ZenMethod - public static void addFruit(IBlockPattern block, IBlock replacement, WeightedItemStack[] drops) { - TweakerFruit fruit = new TweakerFruit(block, replacement, drops); - MineTweakerAPI.apply(new AddFruitAction(fruit)); - } - - @ZenMethod - public static void removeFruit(IBlockPattern block) { - MineTweakerAPI.apply(new RemoveFruitAction(block)); - } - - @ZenMethod - public static void addLog(IBlockPattern block) { - MineTweakerAPI.apply(new AddLogAction(block)); - } - - @ZenMethod - public static void removeLog(IBlockPattern block) { - MineTweakerAPI.apply(new RemoveLogAction(block)); - } - - // ##################### - // ### Inner classes ### - // ##################### - - private static class TweakerFruit { - private final IBlockPattern block; - private final IBlock replacement; - private final WeightedItemStack[] possibleDrops; - - public TweakerFruit(IBlockPattern block, IBlock replacement, WeightedItemStack[] possibleDrops) { - this.block = block; - this.replacement = replacement; - this.possibleDrops = possibleDrops; - } - } - - private static class TweakerFruitPartial implements IFactoryFruit { - private final Block block; - private final List fruits; - - public TweakerFruitPartial(Block block) { - this.block = block; - fruits = new ArrayList(); - } - - @Override - public Block getPlant() { - return block; - } - - @Override - public boolean canBePicked(World world, int x, int y, int z) { - for (TweakerFruit fruit : fruits) { - if (fruit.block.matches(MineTweakerMC.getBlock(world, x, y, z))) - return true; - } - - return false; - } - - @Override - public boolean breakBlock() { - return false; - } - - @Override - public ReplacementBlock getReplacementBlock(World world, int x, int y, int z) { - IBlock iBlock = MineTweakerMC.getBlock(world, x, y, z); - for (TweakerFruit fruit : fruits) { - if (fruit.block.matches(iBlock)) - return new ReplacementBlock(MineTweakerMC.getBlock(fruit.replacement)).setMeta(iBlock.getMeta()); - } - return null; - } - - @Override - public void prePick(World world, int x, int y, int z) {} - - @Override - public List getDrops(World world, Random rand, int x, int y, int z) { - IBlock iBlock = MineTweakerMC.getBlock(world, x, y, z); - for (TweakerFruit fruit : fruits) { - if (fruit.block.matches(iBlock)) - return Arrays.asList(MineTweakerMC.getItemStacks(WeightedItemStack.pickRandomDrops(rand, fruit.possibleDrops))); - } - - return Collections.EMPTY_LIST; - } - - @Override - public void postPick(World world, int x, int y, int z) {} - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddFruitAction implements IUndoableAction { - private final TweakerFruit fruit; - - public AddFruitAction(TweakerFruit fruit) { - this.fruit = fruit; - } - - @Override - public void apply() { - Map fruits = MFRRegistry.getFruits(); - for (IBlock partial : fruit.block.getBlocks()) { - Block block = ((MCBlockDefinition) partial.getDefinition()).getInternalBlock(); - if (fruits != null && fruits.containsKey(block)) { - IFactoryFruit existingFruit = fruits.get(block); - if (existingFruit instanceof TweakerFruitPartial) { - TweakerFruitPartial existingFruitPartial = (TweakerFruitPartial) existingFruit; - if (!existingFruitPartial.fruits.contains(fruit)) { - existingFruitPartial.fruits.add(fruit); - } - } else { - MineTweakerAPI.logError("A non-MineTweaker fruit already exists for this ID"); - } - } else { - TweakerFruitPartial factoryFruit = new TweakerFruitPartial(block); - MFRRegistry.registerFruit(factoryFruit); - } - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - Map fruits = MFRRegistry.getFruits(); - for (IBlock partial : fruit.block.getBlocks()) { - Block block = MineTweakerMC.getBlock(partial); - IFactoryFruit factoryFruit = fruits.get(block); - if (factoryFruit != null && factoryFruit instanceof TweakerFruitPartial) { - ((TweakerFruitPartial) factoryFruit).fruits.remove(fruit); - } - } - } - - @Override - public String describe() { - return "Adding Fruit Picker fruit block " + fruit.block.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Removing Fruit Picker fruit block " + fruit.block.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveFruitAction implements IUndoableAction { - private final IBlockPattern block; - private final Map removed; - - public RemoveFruitAction(IBlockPattern block) { - this.block = block; - - Map fruits = MFRRegistry.getFruits(); - removed = new HashMap(); - for (IBlock partial : block.getBlocks()) { - Block mcBlock = MineTweakerMC.getBlock(partial); - if (fruits.containsKey(mcBlock)) { - removed.put(mcBlock, fruits.get(mcBlock)); - } - } - } - - @Override - public void apply() { - Map fruits = MFRRegistry.getFruits(); - for (Block key : removed.keySet()) { - fruits.remove(key); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - Map fruits = MFRRegistry.getFruits(); - for (Map.Entry restore : removed.entrySet()) { - fruits.put(restore.getKey(), restore.getValue()); - } - } - - @Override - public String describe() { - return "Removing fruit picker fruit block " + block.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Restoring fruit picker fruit block " + block.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddLogAction implements IUndoableAction { - private final IBlockPattern block; - private final List addedLogs = new ArrayList(); - - public AddLogAction(IBlockPattern block) { - this.block = block; - - for (IBlock partial : block.getBlocks()) { - Block mcBlock = MineTweakerMC.getBlock(partial); - if (!MFRRegistry.getFruitLogBlocks().contains(mcBlock)) { - if (!addedLogs.contains(mcBlock)) - addedLogs.add(mcBlock); - } - } - } - - @Override - public void apply() { - for (Block log : addedLogs) { - MFRRegistry.registerFruitLogBlock(log); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (Block log : addedLogs) { - MFRRegistry.getFruitLogBlocks().remove(log); - } - } - - @Override - public String describe() { - return "Adding MFR Fruit Picker log block " + block.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Removing MFR Fruit Picker log block " + block.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveLogAction implements IUndoableAction { - private final IBlockPattern block; - private final List removedLogs = new ArrayList(); - - public RemoveLogAction(IBlockPattern block) { - this.block = block; - - for (IBlock partial : block.getBlocks()) { - Block mcBlock = MineTweakerMC.getBlock(partial); - if (MFRRegistry.getFruitLogBlocks().contains(mcBlock)) { - if (!removedLogs.contains(mcBlock)) - removedLogs.add(mcBlock); - } - } - } - - @Override - public void apply() { - for (Block log : removedLogs) { - MFRRegistry.getFruitLogBlocks().remove(log); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (Block log : removedLogs) { - MFRRegistry.registerFruitLogBlock(log); - } - } - - @Override - public String describe() { - return "Removing MFR Fruit Picker log block " + block.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Restoring MFR Fruit Picker log block " + block.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Grinder.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Grinder.java deleted file mode 100644 index eab85e9..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Grinder.java +++ /dev/null @@ -1,261 +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.mods.mfr.machines; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import static minetweaker.mc1710.util.MineTweakerPlatformUtils.getLivingEntityClass; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.IFactoryGrindable; -import powercrystals.minefactoryreloaded.api.MobDrop; -import stanhebben.zenscript.annotations.ZenClass; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.Grinder") -@ModOnly("MineFactoryReloaded") -public class Grinder { - public static void addBlacklist(String entityClassName) { - Class entityClass = getLivingEntityClass(entityClassName); - MineTweakerAPI.apply(new AddBlacklistAction(entityClass)); - } - - public static void removeBlacklist(String entityClassName) { - Class entityClass = getLivingEntityClass(entityClassName); - if (!MFRRegistry.getGrinderBlacklist().contains(entityClass)) { - MineTweakerAPI.logWarning(entityClassName + " is not blacklisted in the MFR Grinder"); - } else { - MineTweakerAPI.apply(new RemoveBlacklistAction(entityClass)); - } - } - - public static void addGrindable(String entityClassName) { - addGrindable(entityClassName, new WeightedItemStack[0]); - } - - public static void addGrindable(String entityClassName, WeightedItemStack possibleDrop) { - addGrindable(entityClassName, new WeightedItemStack[] { possibleDrop }); - } - - public static void addGrindable(String entityClassName, WeightedItemStack[] possibleDrops) { - Class entityClass = getLivingEntityClass(entityClassName); - MineTweakerAPI.apply(new AddGrindableAction(entityClass, possibleDrops)); - } - - public static void removeGrindable(String entityClassName) { - Class entityClass = getLivingEntityClass(entityClassName); - if (!MFRRegistry.getGrindables().containsKey(entityClass)) { - MineTweakerAPI.logError("No such grindable entity: " + entityClassName); - } else { - MineTweakerAPI.apply(new RemoveGrindableAction(entityClass)); - } - } - - // ####################### - // ### Private classes ### - // ####################### - - private static class SimpleGrindable implements IFactoryGrindable { - private final Class entityClass; - private final WeightedItemStack[] drops; - - public SimpleGrindable(Class entityClass, WeightedItemStack[] drops) { - this.entityClass = entityClass; - this.drops = drops; - } - - @Override - public Class getGrindableEntity() { - return entityClass; - } - - @Override - public List grind(World world, EntityLivingBase entity, Random random) { - List dropList = new ArrayList(); - for (IItemStack itemStack : WeightedItemStack.pickRandomDrops(random, drops)) { - dropList.add(new MobDrop(1, MineTweakerMC.getItemStack(itemStack))); - } - return dropList; - } - - @Override - public boolean processEntity(EntityLivingBase entity) { - entity.attackEntityFrom(DamageSource.generic, entity.getMaxHealth() * 20); - return entity.isDead; - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddBlacklistAction implements IUndoableAction { - private final Class entityClass; - - public AddBlacklistAction(Class entityClass) { - this.entityClass = entityClass; - } - - @Override - public void apply() { - MFRRegistry.registerGrinderBlacklist(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getGrinderBlacklist().remove(entityClass); - } - - @Override - public String describe() { - return "Adding " + entityClass.getName() + " to the MFR Grinder blacklist"; - } - - @Override - public String describeUndo() { - return "Removing " + entityClass.getName() + " from the MFR Grinder blacklist"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveBlacklistAction implements IUndoableAction { - private final Class entityClass; - - public RemoveBlacklistAction(Class entityClass) { - this.entityClass = entityClass; - } - - @Override - public void apply() { - MFRRegistry.getGrinderBlacklist().remove(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.registerGrinderBlacklist(entityClass); - } - - @Override - public String describe() { - return "Removing " + entityClass + " from the MFR Grinder blacklist"; - } - - @Override - public String describeUndo() { - return "Restoring " + entityClass + " to the MFR Grinder blacklist"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddGrindableAction implements IUndoableAction { - private final SimpleGrindable grindable; - - public AddGrindableAction(Class entityClass, WeightedItemStack[] possibleDrops) { - grindable = new SimpleGrindable(entityClass, possibleDrops); - } - - @Override - public void apply() { - MFRRegistry.registerGrindable(grindable); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getGrindables().remove(grindable.entityClass); - } - - @Override - public String describe() { - return "Adding MFR Grindable " + grindable.entityClass.getName(); - } - - @Override - public String describeUndo() { - return "Removing MFR Grindable " + grindable.entityClass.getName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveGrindableAction implements IUndoableAction { - private final Class entityClass; - private final IFactoryGrindable grindable; - - public RemoveGrindableAction(Class entityClass) { - this.entityClass = entityClass; - grindable = MFRRegistry.getGrindables().get(entityClass); - } - - @Override - public void apply() { - MFRRegistry.getGrindables().remove(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.registerGrindable(grindable); - } - - @Override - public String describe() { - return "Removing grindable " + entityClass.getName(); - } - - @Override - public String describeUndo() { - return "Restoring grindable " + entityClass.getName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java deleted file mode 100644 index 1017361..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Harvester.java +++ /dev/null @@ -1,301 +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.mods.mfr.machines; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.mc1710.block.MCBlockDefinition; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.HarvestType; -import powercrystals.minefactoryreloaded.api.IFactoryHarvestable; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.Harvester") -@ModOnly("MineFactoryReloaded") -public class Harvester { - @ZenMethod - public static void addHarvestable(IItemStack item) { - addHarvestable(item.asBlock(), (WeightedItemStack[]) null, null); - } - - @ZenMethod - public static void addHarvestable(IItemStack item, String type) { - addHarvestable(item.asBlock(), (WeightedItemStack[]) null, type); - } - - @ZenMethod - public static void addHarvestable(IItemStack item, WeightedItemStack drop, @Optional String type) { - addHarvestable(item.asBlock(), drop, type); - } - - @ZenMethod - public static void addHarvestable(IItemStack item, WeightedItemStack[] drops, @Optional String type) { - addHarvestable(item.asBlock(), drops, type); - } - - @ZenMethod - public static void addHarvestable(IBlockPattern block, WeightedItemStack drop, @Optional String type) { - addHarvestable(block, new WeightedItemStack[] { drop }, type); - } - - @ZenMethod - public static void addHarvestable(IBlockPattern block, WeightedItemStack[] drops, @Optional String type) { - TweakerHarvestable harvestable = new TweakerHarvestable(block, drops, type); - MineTweakerAPI.apply(new AddHarvestableAction(harvestable)); - } - - @ZenMethod - public static void removeHarvestable(IBlockPattern block) { - MineTweakerAPI.apply(new RemoveHarvestableAction(block)); - } - - // ##################### - // ### Inner classes ### - // ##################### - - private static class TweakerHarvestable { - private final IBlockPattern block; - private final WeightedItemStack[] possibleDrops; - private final HarvestType type; - - public TweakerHarvestable(IBlockPattern block, WeightedItemStack[] possibleDrops, String stringType) { - this.block = block; - this.possibleDrops = possibleDrops; - - HarvestType type = HarvestType.Normal; - if (stringType == null || stringType.equals("normal")) { - type = HarvestType.Normal; - } else if (stringType.equals("column")) { - type = HarvestType.Column; - } else if (stringType.equals("leaveBottom")) { - type = HarvestType.LeaveBottom; - } else if (stringType.equals("tree")) { - type = HarvestType.Tree; - } else if (stringType.equals("treeFlipped")) { - type = HarvestType.TreeFlipped; - } else if (stringType.equals("treeLeaf")) { - type = HarvestType.TreeLeaf; - } else { - throw new IllegalArgumentException("Unknown harvestable type: " + stringType); - } - - this.type = type; - } - } - - private static class TweakerHarvestablePartial implements IFactoryHarvestable { - private final Block block; - private final List harvestables; - - public TweakerHarvestablePartial(Block block) { - this.block = block; - harvestables = new ArrayList(); - } - - @Override - public Block getPlant() { - return block; - } - - @Override - public HarvestType getHarvestType() { - // WARNING: first type will be used - // Also, take into account the possibility of having no harvestable yet - HarvestType result = harvestables.isEmpty() ? HarvestType.Normal : harvestables.get(0).type; - return result; - } - - @Override - public boolean breakBlock() { - return true; - } - - @Override - public boolean canBeHarvested(World world, Map map, int x, int y, int z) { - IBlock block = MineTweakerMC.getBlock(world, x, y, z); - - for (TweakerHarvestable harvestable : harvestables) { - if (harvestable.block.matches(block)) - return true; - } - - return false; - } - - @Override - public List getDrops(World world, Random random, Map map, int x, int y, int z) { - IBlock iBlock = MineTweakerMC.getBlock(world, x, y, z); - for (TweakerHarvestable harvestable : harvestables) { - if (harvestable.block.matches(iBlock)) { - if (harvestable.possibleDrops == null) { - Block mcBlock = ((MCBlockDefinition) iBlock.getDefinition()).getInternalBlock(); - List result = mcBlock.getDrops(world, x, y, z, iBlock.getMeta(), 0); - return result; - } else { - List result = Arrays.asList(MineTweakerMC.getItemStacks(WeightedItemStack.pickRandomDrops(random, harvestable.possibleDrops))); - return result; - } - } - } - - return Collections.EMPTY_LIST; - } - - @Override - public void preHarvest(World world, int x, int y, int z) { - - } - - @Override - public void postHarvest(World world, int x, int y, int z) { - - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddHarvestableAction implements IUndoableAction { - private final TweakerHarvestable harvestable; - - public AddHarvestableAction(TweakerHarvestable harvestable) { - this.harvestable = harvestable; - } - - @Override - public void apply() { - Map harvestables = MFRRegistry.getHarvestables(); - for (IBlock partial : harvestable.block.getBlocks()) { - Block block = MineTweakerMC.getBlock(partial); - if (harvestable != null && harvestables.containsKey(block)) { - IFactoryHarvestable existingHarvestable = harvestables.get(block); - if (existingHarvestable instanceof TweakerHarvestablePartial) { - TweakerHarvestablePartial existingHarvestablePartial = (TweakerHarvestablePartial) existingHarvestable; - if (!existingHarvestablePartial.harvestables.contains(harvestable)) { - existingHarvestablePartial.harvestables.add(harvestable); - } - } else { - MineTweakerAPI.logError("A non-MineTweaker fruit already exists for this ID"); - } - } else { - TweakerHarvestablePartial factoryFruit = new TweakerHarvestablePartial(block); - factoryFruit.harvestables.add(harvestable); - MFRRegistry.registerHarvestable(factoryFruit); - } - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - Map harvestables = MFRRegistry.getHarvestables(); - for (IBlock partial : harvestable.block.getBlocks()) { - Block block = MineTweakerMC.getBlock(partial); - IFactoryHarvestable factoryHarvestable = harvestables.get(block); - if (factoryHarvestable != null && factoryHarvestable instanceof TweakerHarvestablePartial) { - ((TweakerHarvestablePartial) factoryHarvestable).harvestables.remove(harvestable); - } - } - } - - @Override - public String describe() { - return "Adding Harvester harvestable block " + harvestable.block.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Removing Harvester harvestable block " + harvestable.block.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveHarvestableAction implements IUndoableAction { - private final IBlockPattern block; - private final Map removed; - - public RemoveHarvestableAction(IBlockPattern block) { - this.block = block; - - Map harvestables = MFRRegistry.getHarvestables(); - removed = new HashMap(); - for (IBlock partial : block.getBlocks()) { - Block iBlock = MineTweakerMC.getBlock(partial); - if (harvestables.containsKey(iBlock)) { - removed.put(iBlock, harvestables.get(iBlock)); - } - } - } - - @Override - public void apply() { - Map harvestables = MFRRegistry.getHarvestables(); - for (Block key : removed.keySet()) { - harvestables.remove(key); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - Map harvestables = MFRRegistry.getHarvestables(); - for (Map.Entry restore : removed.entrySet()) { - harvestables.put(restore.getKey(), restore.getValue()); - } - } - - @Override - public String describe() { - return "Removing Harvester harvestable block " + block.getDisplayName(); - } - - @Override - public String describeUndo() { - return "Restoring Harvester harvestable block " + block.getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/IRedNetFunction.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/IRedNetFunction.java deleted file mode 100644 index 90524d2..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/IRedNetFunction.java +++ /dev/null @@ -1,15 +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.mods.mfr.machines; - -/** - * - * @author Stan - */ -public interface IRedNetFunction { - public int[] calculate(long time, int[] inputs); -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/MiningLaser.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/MiningLaser.java deleted file mode 100644 index fe4219e..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/MiningLaser.java +++ /dev/null @@ -1,235 +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.mods.mfr.machines; - -import cofh.lib.util.WeightedRandomItemStack; -import java.util.ArrayList; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; -import powercrystals.minefactoryreloaded.MFRRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.MiningLaser") -@ModOnly("MineFactoryReloaded") -public class MiningLaser { - @ZenMethod - public static void addOre(WeightedItemStack ore) { - MineTweakerAPI.apply(new AddOreAction(ore)); - } - - @ZenMethod - public static void removeOre(IIngredient ore) { - MineTweakerAPI.apply(new RemoveOreAction(ore)); - } - - @ZenMethod - public static void addPreferredOre(int color, IIngredient ore) { - MineTweakerAPI.apply(new AddPreferredOreAction(color, ore)); - } - - @ZenMethod - public static void removePreferredOre(int color, IIngredient ore) { - MineTweakerAPI.apply(new RemovePreferredOreAction(color, ore)); - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddOreAction implements IUndoableAction { - private final WeightedRandomItemStack item; - - public AddOreAction(WeightedItemStack item) { - this.item = new WeightedRandomItemStack(MineTweakerMC.getItemStack(item.getStack()), (int) item.getChance()); - } - - @Override - public void apply() { - MFRRegistry.getLaserOres().add(item); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getLaserOres().remove(item); - } - - @Override - public String describe() { - return "Adding laser ore " + item.getStack().getDisplayName(); - } - - @Override - public String describeUndo() { - return "Removing laser ore " + item.getStack().getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveOreAction implements IUndoableAction { - private final IIngredient ingredient; - private final List removed; - - public RemoveOreAction(IIngredient ingredient) { - this.ingredient = ingredient; - removed = new ArrayList(); - - for (WeightedRandom.Item iStack : MFRRegistry.getLaserOres()) { - if (iStack instanceof WeightedRandomItemStack) { - WeightedRandomItemStack stack = (WeightedRandomItemStack) iStack; - if (ingredient.matches(MineTweakerMC.getIItemStack(stack.getStack()))) { - removed.add(stack); - } - } - } - } - - @Override - public void apply() { - MFRRegistry.getLaserOres().removeAll(removed); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getLaserOres().addAll(removed); - } - - @Override - public String describe() { - return "Removing laser ore " + ingredient.toString(); - } - - @Override - public String describeUndo() { - return "Restoring laser ore " + ingredient.toString(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddPreferredOreAction implements IUndoableAction { - private final int color; - private final IIngredient ore; - - public AddPreferredOreAction(int color, IIngredient ore) { - this.color = color; - this.ore = ore; - } - - @Override - public void apply() { - for (IItemStack item : ore.getItems()) { - MFRRegistry.addLaserPreferredOre(color, MineTweakerMC.getItemStack(item)); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (IItemStack item : ore.getItems()) { - ItemStack stack = MineTweakerMC.getItemStack(item); - MFRRegistry.getLaserPreferredOres(color).remove(stack); - } - } - - @Override - public String describe() { - return "Adding laser preferred ore " + ore + " to color " + color; - } - - @Override - public String describeUndo() { - return "Removing laser preferred ore " + ore + " from color " + color; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemovePreferredOreAction implements IUndoableAction { - private final int color; - private final IIngredient ore; - private final List toRemove; - - public RemovePreferredOreAction(int color, IIngredient ore) { - this.color = color; - this.ore = ore; - - toRemove = new ArrayList(); - for (ItemStack item : MFRRegistry.getLaserPreferredOres(color)) { - if (ore.matches(MineTweakerMC.getIItemStack(item))) { - toRemove.add(item); - } - } - } - - @Override - public void apply() { - MFRRegistry.getLaserPreferredOres(color).removeAll(toRemove); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getLaserPreferredOres(color).addAll(toRemove); - } - - @Override - public String describe() { - return "Removing preferred ore " + ore + " for color " + color; - } - - @Override - public String describeUndo() { - return "Adding preferred ore " + ore + " for color " + color; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Planter.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Planter.java deleted file mode 100644 index 2a8f387..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Planter.java +++ /dev/null @@ -1,282 +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.mods.mfr.machines; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.IFactoryPlantable; -import powercrystals.minefactoryreloaded.api.ReplacementBlock; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.Planter") -@ModOnly("MineFactoryReloaded") -public class Planter { - private static final IBlockPattern GRASS_OR_DIRT; - - static { - IBlock blockDirt = MineTweakerMC.getBlockAnyMeta((Block) Block.blockRegistry.getObject("minecraft:dirt")); - IBlock blockGrass = MineTweakerMC.getBlockAnyMeta((Block) Block.blockRegistry.getObject("minecraft:grass")); - GRASS_OR_DIRT = blockDirt.or(blockGrass); - } - - @ZenMethod - public static void addPlantable(IItemStack seed, @Optional IBlockPattern canPlantOn) { - IBlock block = seed.asBlock(); - if (block == null) { - MineTweakerAPI.logError("The given seed has no block equivalant"); - } - addPlantable(seed, block, canPlantOn); - } - - @ZenMethod - public static void addPlantable(IItemStack seed, IItemStack itemblock, @Optional IBlockPattern canPlantOn) { - IBlock block = itemblock.asBlock(); - if (block == null) { - MineTweakerAPI.logError("The given itemblock has no block equivalant"); - } - addPlantable(seed, block, canPlantOn); - } - - @ZenMethod - public static void addPlantable(IIngredient seed, IBlock block, @Optional IBlockPattern canPlantOn) { - if (canPlantOn == null) { - canPlantOn = GRASS_OR_DIRT; - } - - if (seed.getItems() == null) { - MineTweakerAPI.logError("Seed must be a defined ingredient and cannot be <*>"); - } else { - MineTweakerAPI.apply(new AddPlantableAction(new TweakerPlantable(seed, block, canPlantOn))); - } - } - - @ZenMethod - public static void removePlantable(IIngredient seed) { - MineTweakerAPI.apply(new RemovePlantableAction(seed)); - } - - // ##################### - // ### Inner classes ### - // ##################### - - private static class TweakerPlantable { - private final IIngredient seed; - private final IBlock block; - private final IBlockPattern canPlantOn; - - public TweakerPlantable(IIngredient seed, IBlock block, IBlockPattern canPlantOn) { - this.seed = seed; - this.block = block; - this.canPlantOn = canPlantOn; - } - } - - private static class TweakerPlantablePartial implements IFactoryPlantable { - private final Item seed; - private final List plantables; - - public TweakerPlantablePartial(Item seed) { - this.seed = seed; - plantables = new ArrayList(); - } - - public TweakerPlantablePartial(Item seed, TweakerPlantable plantable) { - this(seed); - - plantables.add(plantable); - } - - @Override - public Item getSeed() { - return seed; - } - - @Override - public boolean canBePlanted(ItemStack is, boolean bln) { - IItemStack iSeed = MineTweakerMC.getIItemStack(is); - for (TweakerPlantable plantable : plantables) { - if (plantable.seed.matches(iSeed)) - return true; - } - - return false; - } - - @Override - public ReplacementBlock getPlantedBlock(World world, int i, int i1, int i2, ItemStack seed) { - IItemStack iSeed = MineTweakerMC.getIItemStack(seed); - for (TweakerPlantable plantable : plantables) { - if (plantable.seed.matches(iSeed)) - return new ReplacementBlock(MineTweakerMC.getBlock(plantable.block)).setMeta(plantable.block.getMeta()); - } - - return null; - } - - @Override - public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack seed) { - if (!world.isAirBlock(x, y, z)) - return false; - - for (TweakerPlantable plantable : plantables) { - if (!plantable.seed.matches(MineTweakerMC.getIItemStack(seed))) - continue; - - if (!plantable.canPlantOn.matches(MineTweakerMC.getBlock(world, x, y - 1, z))) - continue; - - return true; - } - - return false; - } - - @Override - public void prePlant(World world, int i, int i1, int i2, ItemStack is) { - - } - - @Override - public void postPlant(World world, int i, int i1, int i2, ItemStack is) { - - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddPlantableAction implements IUndoableAction { - private final TweakerPlantable plantable; - - private AddPlantableAction(TweakerPlantable plantable) { - this.plantable = plantable; - } - - @Override - public void apply() { - for (IItemStack iitem : plantable.seed.getItems()) { - Item item = MineTweakerMC.getItemStack(iitem).getItem(); - if (MFRRegistry.getPlantables().containsKey(item)) { - IFactoryPlantable existing = MFRRegistry.getPlantables().get(item); - if (existing instanceof TweakerPlantablePartial) { - ((TweakerPlantablePartial) existing).plantables.add(plantable); - } else { - MineTweakerAPI.logError("Existing non-MineTweaker plantable already exists for seed ID " + Item.itemRegistry.getNameForObject(item)); - } - } else { - MFRRegistry.registerPlantable(new TweakerPlantablePartial(item, plantable)); - } - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (IItemStack iItem : plantable.seed.getItems()) { - Item item = MineTweakerMC.getItemStack(iItem).getItem(); - IFactoryPlantable existing = MFRRegistry.getPlantables().get(item); - if (existing instanceof TweakerPlantablePartial) { - ((TweakerPlantablePartial) existing).plantables.remove(plantable); - } - } - } - - @Override - public String describe() { - return "Adding MFR Plantable for seed " + plantable.seed; - } - - @Override - public String describeUndo() { - return "Removing MFR Plantable for seed " + plantable.seed; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemovePlantableAction implements IUndoableAction { - private final IIngredient seed; - private final Map removed; - - private RemovePlantableAction(IIngredient seed) { - this.seed = seed; - - removed = new HashMap(); - for (IItemStack iItem : seed.getItems()) { - Item item = MineTweakerMC.getItemStack(iItem).getItem(); - if (!removed.containsKey(item)) { - if (MFRRegistry.getPlantables().containsKey(item)) { - removed.put(item, MFRRegistry.getPlantables().get(item)); - } - } - } - } - - @Override - public void apply() { - for (Item seedItem : removed.keySet()) { - MFRRegistry.getPlantables().remove(seedItem); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (Map.Entry removedEntry : removed.entrySet()) { - MFRRegistry.getPlantables().put(removedEntry.getKey(), removedEntry.getValue()); - } - } - - @Override - public String describe() { - return "Removing MFR Planter seed " + seed; - } - - @Override - public String describeUndo() { - return "Restoring MFR Planter seed " + seed; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Rancher.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Rancher.java deleted file mode 100644 index 22acd8d..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/Rancher.java +++ /dev/null @@ -1,186 +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.mods.mfr.machines; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.liquid.WeightedLiquidStack; -import minetweaker.api.minecraft.MineTweakerMC; -import static minetweaker.mc1710.util.MineTweakerPlatformUtils.getLivingEntityClass; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidContainerRegistry; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.IFactoryRanchable; -import powercrystals.minefactoryreloaded.api.RanchedItem; -import stanhebben.zenscript.annotations.Optional; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.AutoSpawner") -@ModOnly("MineFactoryReloaded") -public class Rancher { - private static final Random random = new Random(); - - @ZenMethod - public static void addRanchable(String entityClassName, WeightedItemStack[] possibleDrops, @Optional WeightedLiquidStack[] possibleLiquids) { - if (possibleLiquids == null) - possibleLiquids = new WeightedLiquidStack[0]; - - Class entityClass = getLivingEntityClass(entityClassName); - MineTweakerAPI.apply(new AddRanchableAction(new TweakerRanchable(entityClass, possibleDrops, possibleLiquids))); - } - - @ZenMethod - public static void removeRanchable(String entityClassName) { - Class entityClass = getLivingEntityClass(entityClassName); - if (!MFRRegistry.getRanchables().containsKey(entityClass)) { - MineTweakerAPI.logWarning("No such ranchable: " + entityClassName); - } else { - MineTweakerAPI.apply(new RemoveRanchableAction(MFRRegistry.getRanchables().get(entityClass))); - } - } - - // ####################### - // ### Private classes ### - // ####################### - - private static class TweakerRanchable implements IFactoryRanchable { - private final Class entityClass; - private final WeightedItemStack[] possibleDrops; - private final WeightedLiquidStack[] possibleLiquids; - - public TweakerRanchable(Class entityClass, WeightedItemStack[] possibleDrops, WeightedLiquidStack[] possibleLiquids) { - this.entityClass = entityClass; - this.possibleDrops = possibleDrops; - this.possibleLiquids = possibleLiquids; - } - - @Override - public Class getRanchableEntity() { - return entityClass; - } - - @Override - public List ranch(World world, EntityLivingBase entity, IInventory inventory) { - List result = new ArrayList(); - if (entityClass.isAssignableFrom(entity.getClass())) { - for (IItemStack droppedItem : WeightedItemStack.pickRandomDrops(random, possibleDrops)) { - result.add(new RanchedItem(MineTweakerMC.getItemStack(droppedItem))); - } - - for (ILiquidStack droppedLiquid : WeightedLiquidStack.pickRandomDrops(random, possibleLiquids)) { - for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack != null) { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(MineTweakerMC.getLiquidStack(droppedLiquid), stack); - if (filled != null) { - inventory.setInventorySlotContents(i, filled); - break; - } - } - } - } - } - - return result; - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddRanchableAction implements IUndoableAction { - private final TweakerRanchable ranchable; - - public AddRanchableAction(TweakerRanchable ranchable) { - this.ranchable = ranchable; - } - - @Override - public void apply() { - MFRRegistry.registerRanchable(ranchable); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getRanchables().remove(ranchable.entityClass); - } - - @Override - public String describe() { - return "Adding ranchable entity " + ranchable.entityClass.getName(); - } - - @Override - public String describeUndo() { - return "Removing ranchable entity " + ranchable.entityClass.getName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveRanchableAction implements IUndoableAction { - private final IFactoryRanchable ranchable; - - public RemoveRanchableAction(IFactoryRanchable ranchable) { - this.ranchable = ranchable; - } - - @Override - public void apply() { - MFRRegistry.getRanchables().remove(ranchable.getRanchableEntity()); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getRanchables().put(ranchable.getRanchableEntity(), ranchable); - } - - @Override - public String describe() { - return "Removing ranchable entity " + ranchable.getRanchableEntity().getName(); - } - - @Override - public String describeUndo() { - return "Restoring ranchable entity " + ranchable.getRanchableEntity().getName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/RedNet.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/RedNet.java deleted file mode 100644 index e74bedc..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/RedNet.java +++ /dev/null @@ -1,185 +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.mods.mfr.machines; - -import java.util.ArrayList; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import net.minecraft.nbt.NBTTagCompound; -import powercrystals.minefactoryreloaded.MFRRegistry; -import powercrystals.minefactoryreloaded.api.rednet.IRedNetLogicCircuit; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.RedNet") -@ModOnly("MineFactoryReloaded") -public class RedNet { - @ZenMethod - public static void addCircuit(String name, String[] inputs, String[] outputs, IRedNetFunction function) { - MineTweakerAPI.apply(new AddCircuitAction(new TweakerRedNetLogicCircuit(name, inputs, outputs, function))); - } - - @ZenMethod - public static void removeCircuit(String name) { - List toRemove = new ArrayList(); - for (IRedNetLogicCircuit circuit : MFRRegistry.getRedNetLogicCircuits()) { - if (circuit.getUnlocalizedName().equals(name)) { - toRemove.add(circuit); - } - } - - if (toRemove.isEmpty()) { - MineTweakerAPI.logWarning("No such rednet circuit: " + name); - } else { - for (IRedNetLogicCircuit toRemoveEntry : toRemove) { - MineTweakerAPI.apply(new RemoveCircuitAction(toRemoveEntry)); - } - } - } - - // ############################# - // ### Private inner classes ### - // ############################# - - private static class TweakerRedNetLogicCircuit implements IRedNetLogicCircuit { - private final String name; - private final String[] inputs; - private final String[] outputs; - private final IRedNetFunction function; - - public TweakerRedNetLogicCircuit(String name, String[] inputs, String[] outputs, IRedNetFunction function) { - this.name = name; - this.inputs = inputs; - this.outputs = outputs; - this.function = function; - } - - @Override - public byte getInputCount() { - return (byte) inputs.length; - } - - @Override - public byte getOutputCount() { - return (byte) outputs.length; - } - - @Override - public int[] recalculateOutputValues(long l, int[] ints) { - return function.calculate(l, ints); - } - - @Override - public String getUnlocalizedName() { - return name; - } - - @Override - public String getInputPinLabel(int i) { - return inputs[i]; - } - - @Override - public String getOutputPinLabel(int i) { - return outputs[i]; - } - - @Override - public void readFromNBT(NBTTagCompound nbttc) { - } - - @Override - public void writeToNBT(NBTTagCompound nbttc) { - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddCircuitAction implements IUndoableAction { - private final TweakerRedNetLogicCircuit circuit; - - public AddCircuitAction(TweakerRedNetLogicCircuit circuit) { - this.circuit = circuit; - } - - @Override - public void apply() { - MFRRegistry.registerRedNetLogicCircuit(circuit); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getRedNetLogicCircuits().remove(circuit); - } - - @Override - public String describe() { - return "Adding rednet circuit " + circuit.name; - } - - @Override - public String describeUndo() { - return "Removing rednet circuit " + circuit.name; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveCircuitAction implements IUndoableAction { - private final IRedNetLogicCircuit circuit; - - public RemoveCircuitAction(IRedNetLogicCircuit circuit) { - this.circuit = circuit; - } - - @Override - public void apply() { - MFRRegistry.getRedNetLogicCircuits().remove(circuit); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getRedNetLogicCircuits().add(circuit); - } - - @Override - public String describe() { - return "Removing RedNet circuit " + circuit.getUnlocalizedName(); - } - - @Override - public String describeUndo() { - return "Restoring RedNet circuit " + circuit.getUnlocalizedName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/RubberTree.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/RubberTree.java deleted file mode 100644 index 5c73308..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/RubberTree.java +++ /dev/null @@ -1,112 +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.mods.mfr.machines; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import powercrystals.minefactoryreloaded.MFRRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.RubberTree") -@ModOnly("MineFactoryReloaded") -public class RubberTree { - @ZenMethod - public static void addBiome(String biome) { - MineTweakerAPI.apply(new AddBiomeAction(biome)); - } - - @ZenMethod - public static void removeBiome(String biome) { - MineTweakerAPI.apply(new RemoveBiomeAction(biome)); - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddBiomeAction implements IUndoableAction { - private final String biome; - - public AddBiomeAction(String biome) { - this.biome = biome; - } - - @Override - public void apply() { - MFRRegistry.registerRubberTreeBiome(biome); - } - - @Override - public boolean canUndo() { - return MFRRegistry.getRubberTreeBiomes() != null; - } - - @Override - public void undo() { - MFRRegistry.getRubberTreeBiomes().remove(biome); - } - - @Override - public String describe() { - return "Adding rubber tree biome " + biome; - } - - @Override - public String describeUndo() { - return "Removing rubber tree biome " + biome; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveBiomeAction implements IUndoableAction { - private final String biome; - - private RemoveBiomeAction(String biome) { - this.biome = biome; - } - - @Override - public void apply() { - MFRRegistry.getRubberTreeBiomes().remove(biome); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getRubberTreeBiomes().add(biome); - } - - @Override - public String describe() { - return "Removing rubber tree biome " + biome; - } - - @Override - public String describeUndo() { - return "Adding rubber tree biome " + biome; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/SafariNet.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/SafariNet.java deleted file mode 100644 index 9cc284d..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/SafariNet.java +++ /dev/null @@ -1,120 +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.mods.mfr.machines; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import static minetweaker.mc1710.util.MineTweakerPlatformUtils.getLivingEntityClass; -import net.minecraft.entity.EntityLivingBase; -import powercrystals.minefactoryreloaded.MFRRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.SafariNet") -@ModOnly("MineFactoryReloaded") -public class SafariNet { - @ZenMethod - public static void addBlacklist(String entityClassName) { - Class entityClass = getLivingEntityClass(entityClassName); - MineTweakerAPI.apply(new AddBlacklistAction(entityClass)); - } - - @ZenMethod - public static void removeBlacklist(String entityClassName) { - Class entityClass = getLivingEntityClass(entityClassName); - if (!MFRRegistry.getSafariNetBlacklist().contains(entityClass)) { - MineTweakerAPI.logWarning(entityClassName + " is not in the safari net blacklist"); - } else { - MineTweakerAPI.apply(new RemoveBlacklistAction(entityClass)); - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddBlacklistAction implements IUndoableAction { - private final Class entityClass; - - public AddBlacklistAction(Class entityClass) { - this.entityClass = entityClass; - } - - @Override - public void apply() { - MFRRegistry.registerSafariNetBlacklist(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getSafariNetBlacklist().remove(entityClass); - } - - @Override - public String describe() { - return "Blacklisting " + entityClass.getName() + " in the safari net"; - } - - @Override - public String describeUndo() { - return "Removing " + entityClass.getName() + " from the safari net blacklist"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveBlacklistAction implements IUndoableAction { - private final Class entityClass; - - public RemoveBlacklistAction(Class entityClass) { - this.entityClass = entityClass; - } - - @Override - public void apply() { - MFRRegistry.getSafariNetBlacklist().remove(entityClass); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getSafariNetBlacklist().add(entityClass); - } - - @Override - public String describe() { - return "Removing " + entityClass.getName() + " from the safari net blacklist"; - } - - @Override - public String describeUndo() { - return "Restoring " + entityClass.getName() + " to the safari net blacklist"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/SludgeBoiler.java b/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/SludgeBoiler.java deleted file mode 100644 index 60e147a..0000000 --- a/MineTweaker3-MC1710-Mod-MFR/src/main/java/minetweaker/mods/mfr/machines/SludgeBoiler.java +++ /dev/null @@ -1,138 +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.mods.mfr.machines; - -import cofh.lib.util.WeightedRandomItemStack; -import java.util.ArrayList; -import java.util.List; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.util.WeightedRandom; -import powercrystals.minefactoryreloaded.MFRRegistry; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * - * @author Stan - */ -@ZenClass("mods.mfr.SludgeBoiler") -@ModOnly("MineFactoryReloaded") -public class SludgeBoiler { - @ZenMethod - public static void addDrop(WeightedItemStack item) { - MineTweakerAPI.apply(new AddDropAction(item)); - } - - @ZenMethod - public static void removeDrop(IIngredient item) { - if (MFRRegistry.getSludgeDrops() == null) { - MineTweakerAPI.logWarning("Cannot remove drops from the sludge boiler"); - } else { - MineTweakerAPI.apply(new RemoveDropAction(item)); - } - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class AddDropAction implements IUndoableAction { - private final WeightedRandomItemStack item; - - public AddDropAction(WeightedItemStack item) { - this.item = new WeightedRandomItemStack(MineTweakerMC.getItemStack(item.getStack()), (int) item.getChance()); - } - - @Override - public void apply() { - MFRRegistry.getSludgeDrops().add(item); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - MFRRegistry.getSludgeDrops().remove(item); - } - - @Override - public String describe() { - return "Adding sludge boiler drop " + item.getStack().getDisplayName(); - } - - @Override - public String describeUndo() { - return "Removing sludge boiler drop " + item.getStack().getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class RemoveDropAction implements IUndoableAction { - private final IIngredient item; - private final List toRemove; - - private RemoveDropAction(IIngredient item) { - this.item = item; - - toRemove = new ArrayList(); - for (WeightedRandom.Item iStack : MFRRegistry.getSludgeDrops()) { - if (iStack instanceof WeightedRandomItemStack) { - WeightedRandomItemStack itemStack = (WeightedRandomItemStack) iStack; - if (item.matches(MineTweakerMC.getIItemStack(itemStack.getStack()))) { - toRemove.add(itemStack); - } - } - } - } - - @Override - public void apply() { - for (WeightedRandomItemStack itemStack : toRemove) { - MFRRegistry.getSludgeDrops().remove(itemStack); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (WeightedRandomItemStack item : toRemove) { - MFRRegistry.getSludgeDrops().add(item); - } - } - - @Override - public String describe() { - return "Removing " + toRemove.size() + " sludge boiler drops for " + item; - } - - @Override - public String describeUndo() { - return "Restoring " + toRemove.size() + " sludge boiler drops for " + item; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC1710-Mod-NEI/build.gradle b/MineTweaker3-MC1710-Mod-NEI/build.gradle deleted file mode 100644 index 5baac03..0000000 --- a/MineTweaker3-MC1710-Mod-NEI/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -apply plugin: 'forge' - -minecraft { - version = forgeVersion1710 -} - -version = "1.0" -archivesBaseName = project.projectDir.name - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') - compile project(':MineTweaker3-MC1710-Main') - compile files('libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar') -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mods.nei.ClassRegistry' -} - -tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC1710-Mod-NEI/libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar b/MineTweaker3-MC1710-Mod-NEI/libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar deleted file mode 100644 index 26b06b6..0000000 Binary files a/MineTweaker3-MC1710-Mod-NEI/libs/NotEnoughItems-1.7.10-1.0.2.15-dev.jar and /dev/null differ diff --git a/MineTweaker3-MC1710-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java b/MineTweaker3-MC1710-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java deleted file mode 100644 index ed53bca..0000000 --- a/MineTweaker3-MC1710-Mod-NEI/src/main/java/minetweaker/mods/nei/NEI.java +++ /dev/null @@ -1,165 +0,0 @@ -package minetweaker.mods.nei; - -import codechicken.nei.api.API; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import net.minecraft.item.ItemStack; - -/** - * MineTweaker NEI support. - * - * Enables hiding NEI items as well as adding new item stacks. These item stacks - * can then show a custom message or contain NBT data. Can be used to show - * a custom message or lore with certain items, or to provide spawnable items - * with specific NBT tags. - * - * @author Stan Hebben - */ -@ZenClass("mods.nei.NEI") -@ModOnly("NotEnoughItems") -public class NEI { - /** - * Hides a specific item in NEI. Will take into account metadata values, if - * any. - * - * @param item item to be hidden - */ - @ZenMethod - public static void hide(@NotNull IItemStack item) { - MineTweakerAPI.apply(new NEIHideItemAction(getItemStack(item))); - } - - /** - * Adds a NEI entry. The item stack can contain damage values and NBT tags. - * - * @param stack item stack to be added - */ - @ZenMethod - public static void addEntry(@NotNull IItemStack stack) { - MineTweakerAPI.apply(new NEIAddEntryAction(getItemStack(stack))); - } - - /** - * Overrides a name in NEI. Note that this will not change the original - * display name, but it will change the way it is displayed in NEI. - * - * @param item item - * @param name item name - */ - @ZenMethod - public static void overrideName(@NotNull IItemStack item, @NotNull String name) { - MineTweakerAPI.apply(new NEIOverrideNameAction(getItemStack(item), name)); - } - - // ############################# - // ### Private inner classes ### - // ############################# - - private static class NEIAddEntryAction implements IUndoableAction { - private final ItemStack item; - - public NEIAddEntryAction(ItemStack item) { - this.item = item; - } - - @Override - public void apply() { - API.addItemListEntry(item); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - API.hideItem(item); - } - - @Override - public String describe() { - return "Adding " + item.getDisplayName() + " as NEI entry"; - } - - @Override - public String describeUndo() { - return "Removing " + item.getDisplayName() + " as NEI entry"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class NEIHideItemAction implements IUndoableAction { - private final ItemStack stack; - - public NEIHideItemAction(ItemStack stack) { - this.stack = stack; - } - - @Override - public void apply() { - API.hideItem(stack); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - API.addItemListEntry(stack); - } - - @Override - public String describe() { - return "Hiding " + stack.getUnlocalizedName() + " in NEI"; - } - - @Override - public String describeUndo() { - return "Displaying " + stack.getUnlocalizedName() + " in NEI"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class NEIOverrideNameAction extends OneWayAction { - private final ItemStack item; - private final String name; - - public NEIOverrideNameAction(ItemStack item, String name) { - this.item = item; - this.name = name; - } - - @Override - public void apply() { - API.setOverrideName(item, name); - } - - @Override - public String describe() { - return "Overriding NEI item name of " + item.getUnlocalizedName() + " to " + name; - } - - @Override - public Object getOverrideKey() { - return item; - } - } -} diff --git a/MineTweaker3-MC18-Main/build.gradle b/MineTweaker3-MC18-Main/build.gradle deleted file mode 100644 index 1902f57..0000000 --- a/MineTweaker3-MC18-Main/build.gradle +++ /dev/null @@ -1,61 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' - } -} -apply plugin: 'net.minecraftforge.gradle.forge' - -version = "1.8.9-" + ext.mineTweakerVersion -archivesBaseName = project.projectDir.name - -minecraft { - version = forgeVersion18 - runDir = "eclipse" - mappings = "stable_20" -} - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mc18.MineTweakerRegistry' -} - -tasks.jar.dependsOn(makeRegistry) - -processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java deleted file mode 100644 index 9501142..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ /dev/null @@ -1,496 +0,0 @@ -package minetweaker.api.minecraft; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockDefinition; -import minetweaker.api.data.IData; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IngredientUnknown; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.api.player.IPlayer; -import minetweaker.api.world.IBiome; -import minetweaker.api.world.IDimension; -import minetweaker.mc18.block.MCBlockDefinition; -import minetweaker.mc18.block.MCSpecificBlock; -import minetweaker.mc18.block.MCWorldBlock; -import minetweaker.mc18.data.NBTConverter; -import minetweaker.mc18.item.MCItemStack; -import minetweaker.mc18.liquid.MCLiquidStack; -import minetweaker.mc18.oredict.MCOreDictEntry; -import minetweaker.mc18.player.MCPlayer; -import minetweaker.mc18.world.MCBiome; -import minetweaker.mc18.world.MCDimension; -import net.minecraft.block.Block; -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.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -/** - * MineTweaker - MineCraft API bridge. - * - * @author Stan Hebben - */ -public class MineTweakerMC { - private static final Map blockDefinitions = new HashMap(); - public static final IBiome[] biomes; - - static { - biomes = new IBiome[BiomeGenBase.getBiomeGenArray().length]; - for (int i = 0; i < BiomeGenBase.getBiomeGenArray().length; i++) { - if (BiomeGenBase.getBiomeGenArray()[i] != null) - biomes[i] = new MCBiome(BiomeGenBase.getBiomeGenArray()[i]); - } - } - - 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) { - if (item == null) - return null; - - Object internal = item.getInternal(); - if (internal == null || !(internal instanceof ItemStack)) { - MineTweakerAPI.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) { - if (ingredient == null) - return null; - - List items = ingredient.getItems(); - if (items.size() != 1) { - MineTweakerAPI.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) { - if (item == null) - return null; - - return new MCItemStack(item); - } - - /** - * Constructs an item stack with wildcard size. - * - * @param item minecraft item stack - * @return minetweaker stack - */ - public static IItemStack getIItemStackWildcardSize(ItemStack item) { - if (item == null) - return null; - - return new MCItemStack(item, true); - } - - /** - * Constructs an item stack with wildcard size. - * - * @param item - * @param meta - * @return minetweaker stack - */ - public static IItemStack getIItemStackWildcardSize(Item item, int meta) { - if (item == null) - return null; - - 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) { - if (item == null) - return null; - - return new MCItemStack(new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE)); - } - - public static ItemStack[] getExamples(IIngredient ingredient) { - List examples = ingredient.getItems(); - ItemStack[] result = new ItemStack[examples.size()]; - for (int i = 0; i < examples.size(); i++) { - result[i] = MineTweakerMC.getItemStack(examples.get(i)); - } - return result; - } - - /** - * 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) { - if (item == null) - return null; - - 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) { - if (items == null) - return null; - - 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 items) { - if (items == null) - return null; - - 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.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) { - if (items == null) - return null; - - 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 items) { - if (items == null) - return null; - - 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) { - if (player == null) - return null; - - 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 == null) - return null; - - if (!(player instanceof MCPlayer)) { - MineTweakerAPI.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) { - if (nbt == null) - return null; - - 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) { - if (nbt == null) - return null; - - 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) { - if (data == null) - return null; - - 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) { - if (data == null) - return null; - - return (NBTTagCompound) NBTConverter.from(data); - } - - /** - * Retrieves the block at the given position. - * - * @param blocks block access - * @param x block x position - * @param y block y position - * @param z block z position - * @return block instance - */ - public static IBlock getBlock(IBlockAccess blocks, int x, int y, int z) { - return new MCWorldBlock(blocks, x, y, z); - } - - /** - * Retrieves the block definition for the given block. - * - * @param block block object - * @return block definition - */ - public static IBlockDefinition getBlockDefinition(Block block) { - if (!blockDefinitions.containsKey(block)) { - blockDefinitions.put(block, new MCBlockDefinition(block)); - } - return blockDefinitions.get(block); - } - - /** - * Retrieves the dimension instance for a given world. - * - * @param world world - * @return dimension - */ - public static IDimension getDimension(World world) { - if (world == null) - return null; - - return new MCDimension(world); - } - - /** - * Returns an instance of the given block. - * - * @param block MC block definition - * @return MT block instance - */ - public static IBlock getBlockAnyMeta(Block block) { - return new MCSpecificBlock(block, OreDictionary.WILDCARD_VALUE); - } - - /** - * Returns an instance of the given block. - * - * @param block MC block definition - * @param meta block meta value - * @return MT block instance - */ - public static IBlock getBlock(Block block, int meta) { - return new MCSpecificBlock(block, meta); - } - - /** - * Retrieves the block from an item stack. - * - * @param itemStack - * @return - */ - public static Block getBlock(IItemStack itemStack) { - return ((MCBlockDefinition) itemStack.asBlock().getDefinition()).getInternalBlock(); - } - - public static Block getBlock(IBlock block) { - return ((MCBlockDefinition) block.getDefinition()).getInternalBlock(); - } - - /** - * Retrieves the internal fluid stack of the given stack. - * - * @param stack MT liquid stack - * @return MCF fluid stack - */ - public static FluidStack getLiquidStack(ILiquidStack stack) { - if (stack == null) - return null; - - return (FluidStack) stack.getInternal(); - } - - /** - * Converts an array of MT liquid stacks into an array of MCF fluid stacks - * - */ - public static FluidStack[] getLiquidStacks(ILiquidStack[] stacks) { - if (stacks == null) { - return null; - } - - FluidStack[] res = new FluidStack[stacks.length]; - - for (int i = 0; i < stacks.length; i++) { - ILiquidStack liquidStack = stacks[i]; - res[i] = getLiquidStack(liquidStack); - } - return res; - } - - private static final HashMap oreDictArrays = new HashMap(); - - public static IOreDictEntry getOreDictEntryFromArray(List array) { - if (!oreDictArrays.containsKey(array)) { - for (String ore : OreDictionary.getOreNames()) { - if (OreDictionary.getOres(ore) == array) { - oreDictArrays.put(array, MineTweakerAPI.oreDict.get(ore)); - } - } - } - - return oreDictArrays.get(array); - } - - /** - * Converts a Minecraft ingredient to a MineTweaker ingredient. - * - * @param ingredient minecraft ingredient - * @return minetweaker ingredient - */ - public static IIngredient getIIngredient(Object ingredient) { - if (ingredient == null) { - return null; - } else if (ingredient instanceof String) { - return MineTweakerAPI.oreDict.get((String) ingredient); - } else if (ingredient instanceof Item) { - return getIItemStack(new ItemStack((Item) ingredient, 1, 0)); - } else if (ingredient instanceof ItemStack) { - return getIItemStack((ItemStack) ingredient); - } else if (ingredient instanceof List) { - IOreDictEntry entry = getOreDictEntryFromArray((List) ingredient); - - if (entry == null) { - return IngredientUnknown.INSTANCE; - } - - return entry; - } else if (ingredient instanceof FluidStack) { - return new MCLiquidStack((FluidStack) ingredient); - } else { - throw new IllegalArgumentException("Not a valid ingredient: " + ingredient); - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/FMLEventHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/FMLEventHandler.java deleted file mode 100644 index f544987..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/FMLEventHandler.java +++ /dev/null @@ -1,56 +0,0 @@ -package minetweaker.mc18; - -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.api.event.PlayerCraftedEvent; -import minetweaker.api.event.PlayerLoggedInEvent; -import minetweaker.api.event.PlayerLoggedOutEvent; -import minetweaker.api.event.PlayerSmeltedEvent; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import minetweaker.mc18.network.MineTweakerLoadScriptsPacket; -import minetweaker.mc18.recipes.MCCraftingInventory; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; - -/** - * - * @author Stan - */ -public class FMLEventHandler { - @SubscribeEvent - public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent ev) { - if (ev.player instanceof EntityPlayerMP) { - EntityPlayerMP player = (EntityPlayerMP) ev.player; - MineTweakerMod.NETWORK.sendTo(new MineTweakerLoadScriptsPacket(MineTweakerAPI.tweaker.getScriptData()), player); - } - - MineTweakerImplementationAPI.events.publishPlayerLoggedIn(new PlayerLoggedInEvent(MineTweakerMC.getIPlayer(ev.player))); - } - - @SubscribeEvent - public void onPlayerItemCrafted(PlayerEvent.ItemCraftedEvent ev) { - IPlayer iPlayer = MineTweakerMC.getIPlayer(ev.player); - if (MineTweakerMod.INSTANCE.recipes.hasTransformerRecipes()) { - MineTweakerMod.INSTANCE.recipes.applyTransformations(MCCraftingInventory.get(ev.craftMatrix, ev.player), iPlayer); - } - - if (MineTweakerImplementationAPI.events.hasPlayerCrafted()) { - MineTweakerImplementationAPI.events.publishPlayerCrafted(new PlayerCraftedEvent(iPlayer, MineTweakerMC.getIItemStack(ev.crafting), MCCraftingInventory.get(ev.craftMatrix, ev.player))); - } - } - - @SubscribeEvent - public void onPlayerItemSmelted(PlayerEvent.ItemSmeltedEvent ev) { - if (MineTweakerImplementationAPI.events.hasPlayerSmelted()) { - MineTweakerImplementationAPI.events.publishPlayerSmelted(new PlayerSmeltedEvent(MineTweakerMC.getIPlayer(ev.player), MineTweakerMC.getIItemStack(ev.smelting))); - } - } - - @SubscribeEvent - public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent ev) { - MineTweakerImplementationAPI.events.publishPlayerLoggedOut(new PlayerLoggedOutEvent(MineTweakerMC.getIPlayer(ev.player))); - } - -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java deleted file mode 100644 index 8b37cd8..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java +++ /dev/null @@ -1,51 +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.mc18; - -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.api.formatting.IFormattedText; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.tooltip.IngredientTooltips; -import minetweaker.mc18.formatting.IMCFormattedString; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import org.lwjgl.input.Keyboard; - -/** - * - * @author Stan - */ -public class ForgeEventHandler { - @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent ev) { - minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent( - MineTweakerMC.getIPlayer(ev.entityPlayer), - MineTweakerMC.getDimension(ev.world), - ev.pos == null ? 0 : ev.pos.getX(), - ev.pos == null ? 0 : ev.pos.getY(), - ev.pos == null ? 0 : ev.pos.getZ()); - - MineTweakerImplementationAPI.events.publishPlayerInteract(event); - } - - @SubscribeEvent - public void onItemTooltip(ItemTooltipEvent ev) { - IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); - for (IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { - ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); - } - - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { - ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); - } - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MCPlatformFunctions.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MCPlatformFunctions.java deleted file mode 100644 index 46c953b..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MCPlatformFunctions.java +++ /dev/null @@ -1,47 +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.mc18; - -import static minetweaker.mc18.MineTweakerMod.NETWORK; -import minetweaker.IPlatformFunctions; -import minetweaker.api.chat.IChatMessage; -import minetweaker.api.item.IItemDefinition; -import minetweaker.mc18.brackets.ItemBracketHandler; -import minetweaker.mc18.chat.MCChatMessage; -import minetweaker.mc18.item.MCItemDefinition; -import minetweaker.mc18.network.MineTweakerLoadScriptsPacket; -import net.minecraft.item.Item; - -/** - * - * @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); - } - - @Override - public void distributeScripts(byte[] data) { - NETWORK.sendToAll(new MineTweakerLoadScriptsPacket(data)); - } - - @Override - public IItemDefinition getItemDefinition(int id) { - Item item = Item.getItemById(id); - if (item == null) - return null; - String sid = ItemBracketHandler.getStringFromItem(item); - return new MCItemDefinition(sid, item); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java deleted file mode 100644 index 91c72f1..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java +++ /dev/null @@ -1,191 +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.mc18; - -import java.io.File; - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; - -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.api.logger.FileLogger; -import minetweaker.mc18.brackets.ItemBracketHandler; -import minetweaker.mc18.brackets.LiquidBracketHandler; -import minetweaker.mc18.client.MCClient; -import minetweaker.mc18.formatting.MCFormatter; -import minetweaker.mc18.furnace.FuelTweaker; -import minetweaker.mc18.furnace.MCFurnaceManager; -import minetweaker.mc18.game.MCGame; -import minetweaker.mc18.mods.MCLoadedMods; -import minetweaker.mc18.network.MineTweakerCopyClipboardHandler; -import minetweaker.mc18.network.MineTweakerCopyClipboardPacket; -import minetweaker.mc18.network.MineTweakerLoadScriptsHandler; -import minetweaker.mc18.network.MineTweakerLoadScriptsPacket; -import minetweaker.mc18.network.MineTweakerOpenBrowserHandler; -import minetweaker.mc18.network.MineTweakerOpenBrowserPacket; -import minetweaker.mc18.oredict.MCOreDict; -import minetweaker.mc18.recipes.MCRecipeManager; -import minetweaker.mc18.server.MCServer; -import minetweaker.mc18.util.MineTweakerHacks; -import minetweaker.mc18.util.MineTweakerPlatformUtils; -import minetweaker.mc18.vanilla.MCVanilla; -import minetweaker.runtime.IScriptProvider; -import minetweaker.runtime.providers.ScriptProviderCascade; -import minetweaker.runtime.providers.ScriptProviderCustom; -import minetweaker.runtime.providers.ScriptProviderDirectory; -import net.minecraft.item.ItemFishingRod; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.WeightedRandomFishable; -import net.minecraftforge.common.FishingHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; - -/** - * Main mod class. Performs some general logic, initialization of the API and - * FML event handling. - * - * @author Stan Hebben - */ -@Mod(modid = MineTweakerMod.MODID, version = "3.0.0") -public class MineTweakerMod { - public static final String MODID = "crafttweaker"; - public static final String MCVERSION = "1.8.8"; - - public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(MODID); - - private static final String[] REGISTRIES = { - "minetweaker.mods.jei.ClassRegistry" - }; - private static final String[] REGISTRY_DESCRIPTIONS = { - "JEI mod support", - }; - - static { - NETWORK.registerMessage(MineTweakerLoadScriptsHandler.class, MineTweakerLoadScriptsPacket.class, 0, Side.CLIENT); - NETWORK.registerMessage(MineTweakerOpenBrowserHandler.class, MineTweakerOpenBrowserPacket.class, 1, Side.CLIENT); - NETWORK.registerMessage(MineTweakerCopyClipboardHandler.class, MineTweakerCopyClipboardPacket.class, 2, Side.CLIENT); - } - - @Mod.Instance(MODID) - public static MineTweakerMod INSTANCE; - - public final MCRecipeManager recipes; - private final IScriptProvider scriptsGlobal; - private final ScriptProviderCustom scriptsIMC; - - public MineTweakerMod() { - MineTweakerImplementationAPI.init( - new MCOreDict(), - recipes = new MCRecipeManager(), - new MCFurnaceManager(), - MCGame.INSTANCE, - new MCLoadedMods(), - new MCFormatter(), - new MCVanilla()); - - MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); - MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; - File globalDir = new File("scripts"); - if (!globalDir.exists()) - globalDir.mkdirs(); - - scriptsIMC = new ScriptProviderCustom("intermod"); - scriptsGlobal = new ScriptProviderDirectory(globalDir); - MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); - } - - // ########################## - // ### FML Event Handlers ### - // ########################## - - @EventHandler - public void onIMCEvent(FMLInterModComms.IMCEvent event) { - for (final FMLInterModComms.IMCMessage imcMessage : event.getMessages()) { - if (imcMessage.key.equalsIgnoreCase("addMineTweakerScript")) { - if (imcMessage.isStringMessage()) { - scriptsIMC.add(imcMessage.getSender() + "::imc", imcMessage.getStringValue()); - } else if (imcMessage.isNBTMessage()) { - NBTTagCompound message = imcMessage.getNBTValue(); - scriptsIMC.add(imcMessage.getSender() + "::" + message.getString("name"), message.getString("content")); - } - } - } - } - - @EventHandler - public void onLoad(FMLPreInitializationEvent ev) { - MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); - FMLCommonHandler.instance().bus().register(new FMLEventHandler()); - } - - @EventHandler - public void onPostInit(FMLPostInitializationEvent ev) { - MineTweakerAPI.registerClassRegistry(MineTweakerRegistry.class); - - for (int i = 0; i < REGISTRIES.length; i++) { - MineTweakerAPI.registerClassRegistry(REGISTRIES[i], REGISTRY_DESCRIPTIONS[i]); - } - - FuelTweaker.INSTANCE.register(); - - } - - @EventHandler - public void onComplete(FMLLoadCompleteEvent ev) { - MineTweakerAPI.logInfo("MineTweaker: Building registry"); - ItemBracketHandler.rebuildItemRegistry(); - LiquidBracketHandler.rebuildLiquidRegistry(); - MineTweakerAPI.logInfo("MineTweaker: Sucessfully built item registry"); - - - } - - @EventHandler - public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { - // starts before loading worlds - // perfect place to start MineTweaker! - - if (MineTweakerPlatformUtils.isClient()) { - MineTweakerAPI.client = new MCClient(); - } - - File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); - if (!scriptsDir.exists()) { - scriptsDir.mkdir(); - } - - IScriptProvider scriptsLocal = new ScriptProviderDirectory(scriptsDir); - IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsGlobal, scriptsLocal); - - MineTweakerImplementationAPI.setScriptProvider(cascaded); - MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); - } - - @EventHandler - public void onServerStarting(FMLServerStartingEvent ev) { - - } - - @EventHandler - public void onServerStopped(FMLServerStoppedEvent ev) { - MineTweakerImplementationAPI.onServerStop(); - MineTweakerImplementationAPI.setScriptProvider(scriptsGlobal); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java deleted file mode 100644 index 21d8530..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java +++ /dev/null @@ -1,84 +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.mc18.actions; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; - -/** - * - * @author Jared - */ -public class SetBlockHardnessAction implements IUndoableAction { - - private final ItemStack stack; - private final float hardness; - private final float oldHardness; - - public SetBlockHardnessAction(ItemStack stack, float hardness) { - this.stack = stack; - this.hardness = hardness; - this.oldHardness = Block.getBlockFromItem(stack.getItem()).getBlockHardness(null, null); - } - - @Override - public void apply() { - if (isBlock(stack)) { - set(stack, hardness); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - if (isBlock(stack)) - set(stack, oldHardness); - } - - @Override - public String describe() { - if (isBlock(stack)) { - return "Setting hardness of " + stack.getDisplayName() + " to " + hardness; - } - return "Unable to set hardness of " + stack.getDisplayName() + " because it is an Item"; - } - - @Override - public String describeUndo() { - if (isBlock(stack)) { - return "Reverting hardness of " + stack.getDisplayName() + " to " + oldHardness; - } - return "Unable to revert hardness of " + stack.getDisplayName() + " because it is an Item"; - } - - private static void set(ItemStack stack, float hardness) { - if (isBlock(stack)) { - Block block = Block.getBlockFromItem(stack.getItem()); - block.setHardness(hardness); - } else { - MineTweakerAPI.logError("Item is not a block"); - } - } - - public static boolean isBlock(ItemStack stack) { - ResourceLocation res = (ResourceLocation) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem())); - return !res.getResourcePath().equalsIgnoreCase("minecraft:air") && Block.blockRegistry.containsKey(res); - } - - @Override - public Object getOverrideKey() { - return null; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetTranslationAction.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetTranslationAction.java deleted file mode 100644 index c8882f3..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetTranslationAction.java +++ /dev/null @@ -1,67 +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.mc18.actions; - -import java.io.ByteArrayInputStream; -import java.nio.charset.Charset; - -import minetweaker.IUndoableAction; -import minetweaker.mc18.util.MineTweakerHacks; -import net.minecraft.util.StringTranslate; - -/** - * - * @author Stan - */ -public class SetTranslationAction implements IUndoableAction { - private static final StringTranslate INSTANCE = MineTweakerHacks.getStringTranslateInstance(); - private static final Charset UTF8 = Charset.forName("utf-8"); - - private final String key; - private final String newValue; - private final String oldValue; - - public SetTranslationAction(String key, String value) { - this.key = key; - newValue = value; - oldValue = INSTANCE.translateKey(key); - } - - @Override - public void apply() { - set(key, newValue); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - set(key, oldValue); - } - - @Override - public String describe() { - return "Translating " + key + " to " + newValue; - } - - @Override - public String describeUndo() { - return "Reverting " + key + " to " + oldValue; - } - - private static void set(String key, String value) { - StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8))); - } - - @Override - public Object getOverrideKey() { - return null; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCBlockDefinition.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCBlockDefinition.java deleted file mode 100644 index 695ac1f..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCBlockDefinition.java +++ /dev/null @@ -1,38 +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.mc18.block; - -import minetweaker.api.block.IBlockDefinition; -import net.minecraft.block.Block; -import net.minecraft.util.ResourceLocation; - -/** - * - * @author Stan - */ -public class MCBlockDefinition implements IBlockDefinition { - private final Block block; - - public MCBlockDefinition(Block block) { - this.block = block; - } - - public Block getInternalBlock() { - return block; - } - - @Override - public String getId() { - ResourceLocation res = Block.blockRegistry.getNameForObject(block); - return res.getResourceDomain()+ ":"+res.getResourcePath(); - } - - @Override - public String getDisplayName() { - return block.getLocalizedName(); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCItemBlock.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCItemBlock.java deleted file mode 100644 index fa2f109..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCItemBlock.java +++ /dev/null @@ -1,72 +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.mc18.block; - -import java.util.Collections; -import java.util.List; - -import minetweaker.api.block.BlockPatternOr; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockDefinition; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.data.IData; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCItemBlock implements IBlock { - private final ItemStack item; - - public MCItemBlock(ItemStack item) { - this.item = item; - } - - @Override - public IBlockDefinition getDefinition() { - return MineTweakerMC.getBlockDefinition(Block.getBlockFromItem(item.getItem())); - } - - @Override - public int getMeta() { - return item.getItemDamage(); - } - - @Override - public IData getTileData() { - if (item.getTagCompound()== null) - return null; - - return MineTweakerMC.getIData(item.getTagCompound()); - } - - @Override - public String getDisplayName() { - return item.getDisplayName(); - } - - @Override - public List getBlocks() { - return Collections.singletonList(this); - } - - @Override - public boolean matches(IBlock block) { - return getDefinition() == block.getDefinition() - && (getMeta() == OreDictionary.WILDCARD_VALUE || getMeta() == block.getMeta()) - && (getTileData() == null || (block.getTileData() != null && block.getTileData().contains(getTileData()))); - } - - @Override - public IBlockPattern or(IBlockPattern pattern) { - return new BlockPatternOr(this, pattern); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCSpecificBlock.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCSpecificBlock.java deleted file mode 100644 index 089ff21..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCSpecificBlock.java +++ /dev/null @@ -1,83 +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.mc18.block; - -import java.util.Collections; -import java.util.List; - -import javax.annotation.Resource; - -import minetweaker.api.block.BlockPatternOr; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockDefinition; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.data.IData; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCSpecificBlock implements IBlock { - private final Block block; - private final int meta; - - public MCSpecificBlock(Block block, int meta) { - this.block = block; - this.meta = meta; - } - - @Override - public IBlockDefinition getDefinition() { - return MineTweakerMC.getBlockDefinition(block); - } - - @Override - public int getMeta() { - return meta; - } - - @Override - public IData getTileData() { - return null; - } - - @Override - public List getBlocks() { - return Collections.singletonList(this); - } - - @Override - public boolean matches(IBlock block) { - return block.getDefinition() == getDefinition() - && (meta == OreDictionary.WILDCARD_VALUE || block.getMeta() == meta); - } - - @Override - public IBlockPattern or(IBlockPattern pattern) { - return new BlockPatternOr(this, pattern); - } - - @Override - public String getDisplayName() { - return block.getLocalizedName(); - } - - @Override - public String toString() { - return ""; - } - - private static String getBlockId(Block block) - { - ResourceLocation res = Block.blockRegistry.getNameForObject(block); - return res.getResourceDomain() + ":"+res.getResourcePath(); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCWorldBlock.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCWorldBlock.java deleted file mode 100644 index c13553a..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/block/MCWorldBlock.java +++ /dev/null @@ -1,96 +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.mc18.block; - -import java.util.Collections; -import java.util.List; - -import minetweaker.api.block.BlockPatternOr; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockDefinition; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.data.IData; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCWorldBlock implements IBlock { - private final IBlockAccess blocks; - private final int x; - private final int y; - private final int z; - private final BlockPos position; - - public MCWorldBlock(IBlockAccess blocks, int x, int y, int z) { - this.blocks = blocks; - this.x = x; - this.y = y; - this.z = z; - this.position = new BlockPos(x, y, z); - } - - @Override - public IBlockDefinition getDefinition() { - return MineTweakerMC.getBlockDefinition(blocks.getBlockState(position).getBlock()); - } - - @Override - public int getMeta() { - return blocks.getBlockState(position).getBlock().getMetaFromState(blocks.getBlockState(position)); - } - - @Override - public IData getTileData() { - TileEntity tileEntity = blocks.getTileEntity(position); - - if (tileEntity == null) - return null; - - NBTTagCompound nbt = new NBTTagCompound(); - tileEntity.writeToNBT(nbt); - return MineTweakerMC.getIData(nbt); - } - - @Override - public String getDisplayName() { - Block block = blocks.getBlockState(position).getBlock(); - Item item = Item.getItemFromBlock(block); - if (item != null) { - return (new ItemStack(item, 1, getMeta())).getDisplayName(); - } else { - return block.getLocalizedName(); - } - } - - @Override - public List getBlocks() { - return Collections.singletonList(this); - } - - @Override - public boolean matches(IBlock block) { - return getDefinition() == block.getDefinition() - && (getMeta() == OreDictionary.WILDCARD_VALUE || getMeta() == block.getMeta()) - && (getTileData() == null || (block.getTileData() != null && block.getTileData().contains(getTileData()))); - } - - @Override - public IBlockPattern or(IBlockPattern pattern) { - return new BlockPatternOr(this, pattern); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java deleted file mode 100644 index 4463e15..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java +++ /dev/null @@ -1,151 +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.mc18.brackets; - -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; - -import java.util.List; -import java.util.Set; - -import minetweaker.IBracketHandler; -import minetweaker.MineTweakerAPI; -import minetweaker.annotations.BracketHandler; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IngredientAny; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.oredict.OreDictionary; -import stanhebben.zenscript.ZenTokener; -import stanhebben.zenscript.compiler.IEnvironmentGlobal; -import stanhebben.zenscript.expression.ExpressionCallStatic; -import stanhebben.zenscript.expression.ExpressionInt; -import stanhebben.zenscript.expression.ExpressionString; -import stanhebben.zenscript.expression.partial.IPartialExpression; -import stanhebben.zenscript.parser.Token; -import stanhebben.zenscript.symbols.IZenSymbol; -import stanhebben.zenscript.type.ZenType; -import stanhebben.zenscript.type.natives.IJavaMethod; -import stanhebben.zenscript.util.ZenPosition; - -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - -/** - * - * @author Stan - */ -@BracketHandler(priority = 100) -public class ItemBracketHandler implements IBracketHandler { - private static final BiMap itemNames = HashBiMap.create(); - - @SuppressWarnings("unchecked") - public static void rebuildItemRegistry() { - itemNames.clear(); - for (ResourceLocation itemRes : (Set) Item.itemRegistry.getKeys()) { - String itemName = itemRes.getResourceDomain() + ":" + itemRes.getResourcePath(); - ResourceLocation res = new ResourceLocation(itemRes.getResourceDomain(), itemRes.getResourcePath().replace(" ", "")); - itemNames.put(itemName.replace(" ", "").replace("'", ""), (Item) Item.itemRegistry.getObject(itemRes)); - System.out.println(itemName + " : " + (Item) Item.itemRegistry.getObject(itemRes)); - } - } - - public static String getStringFromItem(Item item) { - return itemNames.inverse().get(item); - } - - public static IItemStack getItem(String name, int meta) { - // Item item = (Item) Item.itemRegistry.getObject(name); - Item item = itemNames.get(name); - if (item != null) { - return getIItemStackWildcardSize(item, meta); - } else { - return null; - } - } - - private final IZenSymbol symbolAny; - private final IJavaMethod method; - - public ItemBracketHandler() { - symbolAny = MineTweakerAPI.getJavaStaticFieldSymbol(IngredientAny.class, "INSTANCE"); - method = MineTweakerAPI.getJavaMethod( - ItemBracketHandler.class, - "getItem", - String.class, int.class); - } - - @Override - public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { - // any symbol - if (tokens.size() == 1 && tokens.get(0).getValue().equals("*")) { - return symbolAny; - } - - // detect special cases: - // item: at the start means item-specific syntax - // :xxx with xxx an integer means sub-item syntax - // :* means any-subitem-syntax - int fromIndex = 0; - int toIndex = tokens.size(); - int meta = 0; - - if (tokens.size() > 2) { - if (tokens.get(0).getValue().equals("item") && tokens.get(1).getValue().equals(":")) { - fromIndex = 2; - } - if (tokens.get(tokens.size() - 1).getType() == ZenTokener.T_INTVALUE - && tokens.get(tokens.size() - 2).getValue().equals(":")) { - toIndex = tokens.size() - 2; - meta = Integer.parseInt(tokens.get(tokens.size() - 1).getValue()); - } else if (tokens.get(tokens.size() - 1).getValue().equals("*") - && tokens.get(tokens.size() - 2).getValue().equals(":")) { - toIndex = tokens.size() - 2; - meta = OreDictionary.WILDCARD_VALUE; - } - } - - return find(environment, tokens, fromIndex, toIndex, meta); - } - - private IZenSymbol find(IEnvironmentGlobal environment, List tokens, int startIndex, int endIndex, int meta) { - StringBuilder valueBuilder = new StringBuilder(); - for (int i = startIndex; i < endIndex; i++) { - Token token = tokens.get(i); - valueBuilder.append(token.getValue()); - } - - String itemName = valueBuilder.toString(); - if (itemNames.containsKey(itemName)) { - return new ItemReferenceSymbol(environment, itemName, meta); - } - - return null; - } - - private class ItemReferenceSymbol implements IZenSymbol { - private final IEnvironmentGlobal environment; - private final String name; - private final int meta; - - public ItemReferenceSymbol(IEnvironmentGlobal environment, String name, int meta) { - this.environment = environment; - this.name = name; - this.meta = meta; - } - - @Override - public IPartialExpression instance(ZenPosition position) { - return new ExpressionCallStatic( - position, - environment, - method, - new ExpressionString(position, name), - new ExpressionInt(position, meta, ZenType.INT)); - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/LiquidBracketHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/LiquidBracketHandler.java deleted file mode 100644 index dc61757..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/LiquidBracketHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -package minetweaker.mc18.brackets; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import minetweaker.IBracketHandler; -import minetweaker.annotations.BracketHandler; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.mc18.liquid.MCLiquidStack; -import minetweaker.runtime.GlobalRegistry; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import stanhebben.zenscript.compiler.IEnvironmentGlobal; -import stanhebben.zenscript.expression.ExpressionCallStatic; -import stanhebben.zenscript.expression.ExpressionString; -import stanhebben.zenscript.expression.partial.IPartialExpression; -import stanhebben.zenscript.parser.Token; -import stanhebben.zenscript.symbols.IZenSymbol; -import stanhebben.zenscript.type.natives.IJavaMethod; -import stanhebben.zenscript.type.natives.JavaMethod; -import stanhebben.zenscript.util.ZenPosition; - -/** - * - * @author Stan - */ -@BracketHandler -public class LiquidBracketHandler implements IBracketHandler { - - private static final Map fluidNames = new HashMap(); - - @SuppressWarnings("unchecked") - public static void rebuildLiquidRegistry() { - fluidNames.clear(); - for (String fluidName : FluidRegistry.getRegisteredFluids().keySet()) { - fluidNames.put(fluidName.replace(" ", ""), FluidRegistry.getFluid(fluidName)); - } - } - public static ILiquidStack getLiquid(String name) { - Fluid fluid =fluidNames.get(name); - if (fluid != null) { - return new MCLiquidStack(new FluidStack(fluid, 1)); - } else { - return null; - } - } - - @Override - public IZenSymbol resolve(IEnvironmentGlobal environment, List tokens) { - if (tokens.size() > 2) { - if (tokens.get(0).getValue().equals("liquid") && tokens.get(1).getValue().equals(":")) { - return find(environment, tokens, 2, tokens.size()); - } - } - - return null; - } - - private IZenSymbol find(IEnvironmentGlobal environment, List tokens, int startIndex, int endIndex) { - StringBuilder valueBuilder = new StringBuilder(); - for (int i = startIndex; i < endIndex; i++) { - Token token = tokens.get(i); - valueBuilder.append(token.getValue()); - } - - Fluid fluid = fluidNames.get(valueBuilder.toString()); - if (fluid != null) { - return new LiquidReferenceSymbol(environment, valueBuilder.toString()); - } - - return null; - } - - private class LiquidReferenceSymbol implements IZenSymbol { - private final IEnvironmentGlobal environment; - private final String name; - - public LiquidReferenceSymbol(IEnvironmentGlobal environment, String name) { - this.environment = environment; - this.name = name; - } - - @Override - public IPartialExpression instance(ZenPosition position) { - IJavaMethod method = JavaMethod.get( - GlobalRegistry.getTypeRegistry(), - LiquidBracketHandler.class, - "getLiquid", - String.class); - - return new ExpressionCallStatic( - position, - environment, - method, - new ExpressionString(position, name)); - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/client/MCClient.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/client/MCClient.java deleted file mode 100644 index feb3088..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/client/MCClient.java +++ /dev/null @@ -1,29 +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.mc18.client; - -import minetweaker.api.client.IClient; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import net.minecraft.client.Minecraft; -import net.minecraftforge.fml.client.FMLClientHandler; - -/** - * - * @author Stan - */ -public class MCClient implements IClient { - @Override - public IPlayer getPlayer() { - return MineTweakerMC.getIPlayer(Minecraft.getMinecraft().thePlayer); - } - - @Override - public String getLanguage() { - return FMLClientHandler.instance().getCurrentLanguage(); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/data/NBTConverter.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/data/NBTConverter.java deleted file mode 100644 index d1e0270..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/data/NBTConverter.java +++ /dev/null @@ -1,172 +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.mc18.data; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import minetweaker.api.data.DataByte; -import minetweaker.api.data.DataByteArray; -import minetweaker.api.data.DataDouble; -import minetweaker.api.data.DataFloat; -import minetweaker.api.data.DataInt; -import minetweaker.api.data.DataIntArray; -import minetweaker.api.data.DataList; -import minetweaker.api.data.DataLong; -import minetweaker.api.data.DataMap; -import minetweaker.api.data.DataShort; -import minetweaker.api.data.DataString; -import minetweaker.api.data.IData; -import minetweaker.api.data.IDataConverter; -import minetweaker.mc18.util.MineTweakerHacks; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagByte; -import net.minecraft.nbt.NBTTagByteArray; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagDouble; -import net.minecraft.nbt.NBTTagFloat; -import net.minecraft.nbt.NBTTagInt; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagLong; -import net.minecraft.nbt.NBTTagShort; -import net.minecraft.nbt.NBTTagString; - -/** - * - * @author Stan - */ -public class NBTConverter implements IDataConverter { - private static final NBTConverter INSTANCE = new NBTConverter(); - - public static NBTBase from(IData data) { - return data.convert(INSTANCE); - } - - public static IData from(NBTBase nbt, boolean immutable) { - if (nbt == null) - return null; - - switch (nbt.getId()) { - case 1: // byte - return new DataByte(((NBTBase.NBTPrimitive) nbt).getByte()); - case 2: // short - return new DataShort(((NBTBase.NBTPrimitive) nbt).getShort()); - case 3: // int - return new DataInt(((NBTBase.NBTPrimitive) nbt).getInt()); - case 4: // long - return new DataLong(((NBTBase.NBTPrimitive) nbt).getLong()); - case 5: // float - return new DataFloat(((NBTBase.NBTPrimitive) nbt).getFloat()); - case 6: // double - return new DataDouble(((NBTBase.NBTPrimitive) nbt).getDouble()); - case 7: // byte[] - return new DataByteArray(((NBTTagByteArray) nbt).getByteArray(), immutable); - case 8: // string - return new DataString(((NBTTagString) nbt).getString()); - case 9: { // list - List values = new ArrayList(); - List original = MineTweakerHacks.getTagList((NBTTagList) nbt); - for (NBTBase value : original) { - values.add(from(value, immutable)); - } - return new DataList(values, immutable); - } - case 10: { // compound - Map values = new HashMap(); - NBTTagCompound original = (NBTTagCompound) nbt; - for (String key : (Set) original.getKeySet()) { - values.put(key, from(original.getTag(key), immutable)); - } - return new DataMap(values, immutable); - } - case 11: // int[] - return new DataIntArray(((NBTTagIntArray) nbt).getIntArray(), immutable); - default: - throw new RuntimeException("Unknown tag type: " + nbt.getId()); - } - } - - public static void updateMap(NBTTagCompound nbt, IData data) { - NBTUpdater updater = new NBTUpdater(nbt); - data.convert(updater); - } - - public NBTConverter() { - } - - @Override - public NBTBase fromBool(boolean value) { - return new NBTTagInt(value ? 1 : 0); - } - - @Override - public NBTBase fromByte(byte value) { - return new NBTTagByte(value); - } - - @Override - public NBTBase fromShort(short value) { - return new NBTTagShort(value); - } - - @Override - public NBTBase fromInt(int value) { - return new NBTTagInt(value); - } - - @Override - public NBTBase fromLong(long value) { - return new NBTTagLong(value); - } - - @Override - public NBTBase fromFloat(float value) { - return new NBTTagFloat(value); - } - - @Override - public NBTBase fromDouble(double value) { - return new NBTTagDouble(value); - } - - @Override - public NBTBase fromString(String value) { - return new NBTTagString(value); - } - - @Override - public NBTBase fromList(List values) { - NBTTagList result = new NBTTagList(); - for (IData value : values) { - result.appendTag(from(value)); - } - return result; - } - - @Override - public NBTBase fromMap(Map values) { - NBTTagCompound result = new NBTTagCompound(); - for (Map.Entry entry : values.entrySet()) { - result.setTag(entry.getKey(), from(entry.getValue())); - } - return result; - } - - @Override - public NBTBase fromByteArray(byte[] value) { - return new NBTTagByteArray(value); - } - - @Override - public NBTBase fromIntArray(int[] value) { - return new NBTTagIntArray(value); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/entity/MCEntityDefinition.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/entity/MCEntityDefinition.java deleted file mode 100644 index f366061..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/entity/MCEntityDefinition.java +++ /dev/null @@ -1,32 +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.mc18.entity; - -import minetweaker.api.entity.IEntityDefinition; -import net.minecraftforge.fml.common.registry.EntityRegistry; - -/** - * - * @author Stan - */ -public class MCEntityDefinition implements IEntityDefinition { - private final EntityRegistry.EntityRegistration registration; - - public MCEntityDefinition(EntityRegistry.EntityRegistration registration) { - this.registration = registration; - } - - @Override - public String getId() { - return registration.getEntityClass().getName(); - } - - @Override - public String getName() { - return registration.getEntityName(); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/FuelTweaker.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/FuelTweaker.java deleted file mode 100644 index 9809536..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/FuelTweaker.java +++ /dev/null @@ -1,95 +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.mc18.furnace; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.registry.GameRegistry; - -public class FuelTweaker { - public static final FuelTweaker INSTANCE = new FuelTweaker(); - - private List original; - private final HashMap> quickList = new HashMap>(); - - private FuelTweaker() { - } - - public void register() { - try { - Field fuelHandlers = GameRegistry.class.getDeclaredField("fuelHandlers"); - fuelHandlers.setAccessible(true); - original = (List) fuelHandlers.get(null); - List modified = new ArrayList(); - modified.add(new OverridingFuelHandler()); - fuelHandlers.set(null, modified); - } catch (NoSuchFieldException ex) { - System.out.println("[MineTweaker] Error: could not get GameRegistry fuel handlers field. Cannot use custom fuel values."); - } catch (SecurityException ex) { - System.out.println("[MineTweaker] Error: could not alter GameRegistry fuel handlers field. Cannot use custom fuel values."); - } catch (IllegalAccessException ex) { - System.out.println("[MineTweaker] Error: could not alter GameRegistry fuel handlers field. Cannot use custom fuel values."); - } - } - - public void addFuelPattern(SetFuelPattern pattern) { - List items = pattern.getPattern().getItems(); - if (items == null) { - MineTweakerAPI.logError("Cannot set fuel for <*>"); - return; - } - - for (IItemStack item : pattern.getPattern().getItems()) { - ItemStack itemStack = MineTweakerMC.getItemStack(item); - Item mcItem = itemStack.getItem(); - if (!quickList.containsKey(mcItem)) { - quickList.put(mcItem, new ArrayList()); - } - quickList.get(mcItem).add(pattern); - } - } - - public void removeFuelPattern(SetFuelPattern pattern) { - for (IItemStack item : pattern.getPattern().getItems()) { - ItemStack itemStack = MineTweakerMC.getItemStack(item); - Item mcItem = itemStack.getItem(); - if (quickList.containsKey(mcItem)) { - quickList.get(mcItem).remove(pattern); - } - } - } - - private class OverridingFuelHandler implements IFuelHandler { - @Override - public int getBurnTime(ItemStack fuel) { - if (quickList.containsKey(fuel.getItem())) { - IItemStack stack = MineTweakerMC.getIItemStack(fuel); - - for (SetFuelPattern override : quickList.get(fuel.getItem())) { - if (override.getPattern().matches(stack)) { - return override.getValue(); - } - } - } - - int max = 0; - for (IFuelHandler handler : original) { - max = Math.max(max, handler.getBurnTime(fuel)); - } - return max; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/MCFurnaceManager.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/MCFurnaceManager.java deleted file mode 100644 index 5f8f93e..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/furnace/MCFurnaceManager.java +++ /dev/null @@ -1,214 +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.mc18.furnace; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.recipes.IFurnaceManager; -import minetweaker.mc18.item.MCItemStack; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.fml.common.registry.GameRegistry; - -/** - * - * @author Stan - */ -public class MCFurnaceManager implements IFurnaceManager { - public MCFurnaceManager() { - - } - - @Override - public void remove(IIngredient output, IIngredient input) { - if (output == null) - throw new IllegalArgumentException("output cannot be null"); - - Map smeltingList = FurnaceRecipes.instance().getSmeltingList(); - - List toRemove = new ArrayList(); - List toRemoveValues = new ArrayList(); - for (Map.Entry entry : smeltingList.entrySet()) { - if (output.matches(new MCItemStack(entry.getValue())) - && (input == null || input.matches(new MCItemStack(entry.getKey())))) { - toRemove.add(entry.getKey()); - toRemoveValues.add(entry.getValue()); - } - } - - if (toRemove.isEmpty()) { - MineTweakerAPI.logWarning("No furnace recipes for " + output.toString()); - } else { - MineTweakerAPI.apply(new RemoveAction(toRemove, toRemoveValues)); - } - } - - @Override - public void addRecipe(IItemStack output, IIngredient input, double xp) { - List items = input.getItems(); - if (items == null) { - MineTweakerAPI.logError("Cannot turn " + input.toString() + " into a furnace recipe"); - } - - ItemStack[] items2 = getItemStacks(items); - ItemStack output2 = getItemStack(output); - MineTweakerAPI.apply(new AddRecipeAction(input, items2, output2, xp)); - } - - @Override - public void setFuel(IIngredient item, int fuel) { - MineTweakerAPI.apply(new SetFuelAction(new SetFuelPattern(item, fuel))); - } - - @Override - public int getFuel(IItemStack item) { - return GameRegistry.getFuelValue(getItemStack(item)); - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class RemoveAction implements IUndoableAction { - private final List items; - private final List values; - - public RemoveAction(List items, List values) { - this.items = items; - this.values = values; - } - - @Override - public void apply() { - for (ItemStack item : items) { - FurnaceRecipes.instance().getSmeltingList().remove(item); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (int i = 0; i < items.size(); i++) { - FurnaceRecipes.instance().getSmeltingList().put(items.get(i), values.get(i)); - } - } - - @Override - public String describe() { - return "Removing " + items.size() + " furnace recipes"; - } - - @Override - public String describeUndo() { - return "Restoring " + items.size() + " furnace recipes"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class AddRecipeAction implements IUndoableAction { - private final IIngredient ingredient; - private final ItemStack[] input; - private final ItemStack output; - private final double xp; - - public AddRecipeAction(IIngredient ingredient, ItemStack[] input, ItemStack output, double xp) { - this.ingredient = ingredient; - this.input = input; - this.output = output; - this.xp = xp; - } - - @Override - public void apply() { - for (ItemStack inputStack : input) { - FurnaceRecipes.instance().addSmeltingRecipe(inputStack, output, (float) xp); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (ItemStack inputStack : input) { - FurnaceRecipes.instance().getSmeltingList().remove(inputStack); - } - } - - @Override - public String describe() { - return "Adding furnace recipe for " + ingredient; - } - - @Override - public String describeUndo() { - return "Removing furnace recipe for " + ingredient; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class SetFuelAction implements IUndoableAction { - private final SetFuelPattern pattern; - - public SetFuelAction(SetFuelPattern pattern) { - this.pattern = pattern; - } - - @Override - public void apply() { - FuelTweaker.INSTANCE.addFuelPattern(pattern); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - FuelTweaker.INSTANCE.removeFuelPattern(pattern); - } - - @Override - public String describe() { - return "Setting fuel for " + pattern.getPattern(); - } - - @Override - public String describeUndo() { - return "Removing fuel for " + pattern.getPattern(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/game/MCGame.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/game/MCGame.java deleted file mode 100644 index 9dc9c60..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/game/MCGame.java +++ /dev/null @@ -1,216 +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.mc18.game; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.block.IBlockDefinition; -import minetweaker.api.entity.IEntityDefinition; -import minetweaker.api.game.IGame; -import minetweaker.api.item.IItemDefinition; -import minetweaker.api.liquid.ILiquidDefinition; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.world.IBiome; -// TODO Find this -// import minetweaker.mc1710.GuiCannotRemodify; -import minetweaker.mc18.entity.MCEntityDefinition; -import minetweaker.mc18.item.MCItemDefinition; -import minetweaker.mc18.liquid.MCLiquidDefinition; -import minetweaker.mc18.util.MineTweakerHacks; -import minetweaker.mc18.util.MineTweakerPlatformUtils; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.registry.EntityRegistry; -import net.minecraftforge.fml.common.registry.LanguageRegistry; - -/** - * - * @author Stan - */ -public class MCGame implements IGame { - private static final Map TRANSLATIONS = MineTweakerHacks.getTranslations(); - - public static final MCGame INSTANCE = new MCGame(); - - private boolean locked = false; - - private MCGame() { - } - - @Override - public List getItems() { - List result = new ArrayList(); - for (ResourceLocation res: (Set) Item.itemRegistry.getKeys()) { - - result.add(new MCItemDefinition(res.getResourceDomain() + ":" + res.getResourcePath(), (Item) Item.itemRegistry.getObject(res))); - } - return result; - } - - @Override - public List getBlocks() { - List result = new ArrayList(); - for (ResourceLocation block : (Set) Block.blockRegistry.getKeys()) { - result.add(MineTweakerMC.getBlockDefinition((Block) Block.blockRegistry.getObject(block))); - } - - return result; - } - - @Override - public List getLiquids() { - List result = new ArrayList(); - for (Map.Entry entry : FluidRegistry.getRegisteredFluids().entrySet()) { - result.add(new MCLiquidDefinition(entry.getValue())); - } - return result; - } - - @Override - public List getBiomes() { - List result = new ArrayList(); - for (IBiome biome : MineTweakerMC.biomes) { - if (biome != null) { - result.add(biome); - } - } - return result; - } - - @Override - public List getEntities() { - List result = new ArrayList(); - - for (EntityRegistry.EntityRegistration entityRegistration : MineTweakerHacks.getEntityClassRegistrations().values()) { - result.add(new MCEntityDefinition(entityRegistration)); - } - - return result; - } - - @Override - public void setLocalization(String key, String value) { - MineTweakerAPI.apply(new SetTranslation(null, key, value)); - } - - @Override - public void setLocalization(String lang, String key, String value) { - MineTweakerAPI.apply(new SetTranslation(lang, key, value)); - } - - @Override - public String localize(String key) { - return LanguageRegistry.instance().getStringLocalization(key); - } - - @Override - public String localize(String key, String lang) { - return LanguageRegistry.instance().getStringLocalization(key, lang); - } - - @Override - public void lock() - { - locked = true; - } - - @Override - public boolean isLocked() - { - return locked; - } - - @Override - public void signalLockError() - { - MineTweakerAPI.getLogger().logError("Reload of scripts blocked (script lock)"); - - if (Minecraft.isGuiEnabled()) { - // Commented out due to unresolved import - /** - * Minecraft.getMinecraft().displayGuiScreen( new GuiCannotRemodify( - * "Minecraft has been tweaked for another server", - * "with modifications that cannot be rolled back.", - * "Please restart your game.")); - **/ - } - } - - // ###################### - // ### Action classes ### - // ###################### - - /** - * Ported from ModTweaker. - * - * @author Joshiejack - */ - private static class SetTranslation implements IUndoableAction { - private String original; - private final String lang; - private final String key; - private final String text; - private boolean added; - - public SetTranslation(String lang, String key, String text) { - this.lang = lang; - this.key = key; - this.text = text; - } - - @Override - public void apply() { - if (lang == null || MineTweakerPlatformUtils.isLanguageActive(lang)) { - original = TRANSLATIONS.get(key); - TRANSLATIONS.put(key, text); - added = true; - } else { - added = false; - } - } - - @Override - public boolean canUndo() { - return TRANSLATIONS != null; - } - - @Override - public void undo() { - if (added) { - if (original == null) { - TRANSLATIONS.remove(key); - } else { - TRANSLATIONS.put(key, original); - } - } - } - - @Override - public String describe() { - return "Setting localization for the key: " + key + " to " + text; - } - - @Override - public String describeUndo() { - return "Setting localization for the key: " + key + " to " + original; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java deleted file mode 100644 index 95ec853..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java +++ /dev/null @@ -1,411 +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.mc18.item; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.block.IBlock; -import minetweaker.api.data.DataMap; -import minetweaker.api.data.IData; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemDefinition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.item.IngredientItem; -import minetweaker.api.item.IngredientOr; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.api.player.IPlayer; -import minetweaker.mc18.actions.SetBlockHardnessAction; -import minetweaker.mc18.actions.SetStackSizeAction; -import minetweaker.mc18.actions.SetStackmaxDamageAction; -import minetweaker.mc18.actions.SetTranslationAction; -import minetweaker.mc18.block.MCItemBlock; -import minetweaker.mc18.brackets.ItemBracketHandler; -import minetweaker.mc18.data.NBTConverter; -import minetweaker.mc18.liquid.MCLiquidStack; -import minetweaker.util.ArrayUtil; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCItemStack implements IItemStack { - private final ItemStack stack; - private final List items; - private IData tag = null; - private boolean wildcardSize; - - public MCItemStack(ItemStack itemStack) { - if (itemStack == null) - throw new IllegalArgumentException("stack cannot be null"); - - stack = itemStack.copy(); - items = Collections. singletonList(this); - } - - public MCItemStack(ItemStack itemStack, boolean wildcardSize) { - this(itemStack); - - this.wildcardSize = wildcardSize; - } - - private MCItemStack(ItemStack itemStack, IData tag) { - if (itemStack == null) - throw new IllegalArgumentException("stack cannot be null"); - - stack = itemStack; - items = Collections. singletonList(this); - this.tag = tag; - } - - private MCItemStack(ItemStack itemStack, IData tag, boolean wildcardSize) { - stack = itemStack; - items = Collections. singletonList(this); - this.tag = tag; - this.wildcardSize = wildcardSize; - } - - @Override - public IItemDefinition getDefinition() { - return new MCItemDefinition(ItemBracketHandler.getStringFromItem(stack.getItem()), stack.getItem()); - } - - @Override - public String getName() { - return stack.getUnlocalizedName(); - } - - @Override - public String getDisplayName() { - return stack.getDisplayName(); - } - - @Override - public void setDisplayName(String name) { - MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); - } - - @Override - public void setMaxDamage(int damage) { - MineTweakerAPI.apply(new SetStackmaxDamageAction(stack, damage)); - } - - @Override - public int getMaxStackSize() { - return stack.getMaxStackSize(); - } - - @Override - public void setMaxStackSize(int size) { - MineTweakerAPI.apply(new SetStackSizeAction((ItemStack) getInternal(), size)); - } - - @Override - public float getBlockHardness() { - return ReflectionHelper.getPrivateValue(Block.class, Block.getBlockFromItem(stack.getItem()), "blockHardness"); - } - - @Override - public void setBlockHardness(float hardness) { - MineTweakerAPI.apply(new SetBlockHardnessAction(stack, hardness)); - } - - @Override - public int getDamage() { - return stack.getItemDamage(); - } - - @Override - public IData getTag() { - if (tag == null) { - if (stack.getTagCompound() == null) { - return DataMap.EMPTY; - } - - tag = NBTConverter.from(stack.getTagCompound(), true); - } - return tag; - } - - @Override - public int getMaxDamage() { - return stack.getMaxDamage(); - } - - @Override - public ILiquidStack getLiquid() { - FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(stack); - return liquid == null ? null : new MCLiquidStack(liquid); - } - - @Override - public IIngredient anyDamage() { - if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.logWarning("subitems don't have damaged states"); - return this; - } else { - ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, OreDictionary.WILDCARD_VALUE); - result.setTagCompound(stack.getTagCompound()); - return new MCItemStack(result, tag); - } - } - - @Override - public IItemStack withDamage(int damage) { - if (stack.getItem().getHasSubtypes()) { - MineTweakerAPI.logWarning("subitems don't have damaged states"); - return this; - } else { - ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, damage); - result.setTagCompound(stack.getTagCompound()); - return new MCItemStack(result, tag); - } - } - - @Override - public IItemStack anyAmount() { - ItemStack result = new ItemStack(stack.getItem(), 1, stack.getItemDamage()); - result.setTagCompound(stack.getTagCompound()); - return new MCItemStack(result, tag, true); - } - - @Override - public IItemStack withAmount(int amount) { - ItemStack result = new ItemStack(stack.getItem(), amount, stack.getItemDamage()); - result.setTagCompound(stack.getTagCompound()); - return new MCItemStack(result, tag); - } - - @Override - public IItemStack withTag(IData tag) { - ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage()); - if (tag == null) { - result.setTagCompound(null); - } else { - result.setTagCompound((NBTTagCompound) NBTConverter.from(tag)); - } - return new MCItemStack(result, tag); - } - - @Override - public IItemStack updateTag(IData tagUpdate) { - if (tag == null) { - if (stack.getTagCompound() == null) { - return withTag(tagUpdate); - } - - tag = NBTConverter.from(stack.getTagCompound(), true); - } - - IData updated = tag.update(tagUpdate); - return withTag(updated); - } - - @Override - public IItemStack removeTag(String tag) { - ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage()); - - if (tag == null) { - result.setTagCompound(null); - } else { - result.getTagCompound().removeTag(tag); - } - IData dataTag = NBTConverter.from(result.getTagCompound(), false); - return new MCItemStack(result, dataTag); - } - - @Override - public String getMark() { - return null; - } - - @Override - public int getAmount() { - return stack.stackSize; - } - - @Override - public List getItems() { - return items; - } - - @Override - public List getLiquids() { - return Collections.emptyList(); - } - - @Override - public IItemStack amount(int amount) { - return withAmount(amount); - } - - @Override - public WeightedItemStack percent(float chance) { - return new WeightedItemStack(this, chance * 0.01f); - } - - @Override - public WeightedItemStack weight(float chance) { - return new WeightedItemStack(this, chance); - } - - @Override - public IIngredient transform(IItemTransformer transformer) { - return new IngredientItem(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer }); - } - - @Override - public IIngredient only(IItemCondition condition) { - return new IngredientItem(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS); - } - - @Override - public IIngredient marked(String mark) { - return new IngredientItem(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS); - } - - @Override - public IIngredient or(IIngredient ingredient) { - return new IngredientOr(this, ingredient); - } - - @Override - public boolean matches(IItemStack item) { - ItemStack internal = getItemStack(item); - return internal.getItem() == stack.getItem() && (wildcardSize || internal.stackSize >= stack.stackSize) && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == internal.getItemDamage() || (!stack.getHasSubtypes() && !stack.getItem().isDamageable())); - } - - @Override - public boolean matches(ILiquidStack liquid) { - return false; - } - - @Override - public boolean contains(IIngredient ingredient) { - List iitems = ingredient.getItems(); - if (iitems == null || iitems.size() != 1) - return false; - return matches(iitems.get(0)); - } - - @Override - public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { - return item; - } - - @Override - public boolean hasTransformers() { - return false; - } - - @Override - public Object getInternal() { - return stack; - } - - @Override - public IBlock asBlock() { - ResourceLocation res = (ResourceLocation) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem())); - if (Block.blockRegistry.containsKey(res)) { - return new MCItemBlock(stack); - } else { - throw new ClassCastException("This item is not a block"); - } - } - - @Override - public List getOres() { - List result = new ArrayList(); - - for (String key : OreDictionary.getOreNames()) { - for (ItemStack is : OreDictionary.getOres(key)) { - if (is.getItem() == stack.getItem() && (is.getItemDamage() == OreDictionary.WILDCARD_VALUE || is.getItemDamage() == stack.getItemDamage())) { - result.add(MineTweakerAPI.oreDict.get(key)); - break; - } - } - } - - return result; - } - - // ############################# - // ### Object implementation ### - // ############################# - - @Override - public int hashCode() { - int hash = 7; - hash = 41 * hash + stack.getItem().hashCode(); - hash = 41 * hash + stack.getItemDamage(); - hash = 41 * hash + stack.stackSize; - hash = 41 * hash + (stack.getTagCompound() == null ? 0 : stack.getTagCompound().hashCode()); - hash = 41 * hash + (this.wildcardSize ? 1 : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final MCItemStack other = (MCItemStack) obj; - if (this.stack.getItem() != other.stack.getItem()) - return false; - if (this.stack.getItemDamage() != other.stack.getItemDamage()) - return false; - if (this.stack.stackSize != other.stack.stackSize) - return false; - if (this.stack.getTagCompound() != other.stack.getTagCompound() && (this.stack == null || this.stack.equals(other.stack))) - return false; - if (this.wildcardSize != other.wildcardSize) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder result = new StringBuilder(); - result.append('<'); - result.append(ItemBracketHandler.getStringFromItem(stack.getItem())); - - if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) { - result.append(":*"); - } else if (stack.getItemDamage() > 0) { - result.append(':').append(stack.getItemDamage()); - } - result.append('>'); - - if (stack.getTagCompound() != null) { - result.append(".withTag("); - result.append(NBTConverter.from(stack.getTagCompound(), wildcardSize).toString()); - result.append(")"); - } - - return result.toString(); - } - -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/liquid/MCLiquidDefinition.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/liquid/MCLiquidDefinition.java deleted file mode 100644 index 79613c9..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/liquid/MCLiquidDefinition.java +++ /dev/null @@ -1,425 +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.mc18.liquid; - -import java.util.ArrayList; -import java.util.List; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidDefinition; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -/** - * - * @author Stan - */ -public class MCLiquidDefinition implements ILiquidDefinition { - private final Fluid fluid; - - public MCLiquidDefinition(Fluid fluid) { - this.fluid = fluid; - } - - @Override - public String getName() { - return fluid.getName(); - } - - @Override - public String getDisplayName() { - return fluid.getUnlocalizedName() == null ? "" : StatCollector.translateToLocal(fluid.getUnlocalizedName()); - } - - @Override - public ILiquidStack asStack(int millibuckets) { - return new MCLiquidStack(new FluidStack(fluid, millibuckets)); - } - - @Override - public int getLuminosity() { - return fluid.getLuminosity(); - } - - @Override - public void setLuminosity(int value) { - MineTweakerAPI.apply(new ActionSetLuminosity(value)); - } - - @Override - public int getDensity() { - return fluid.getDensity(); - } - - @Override - public void setDensity(int density) { - MineTweakerAPI.apply(new ActionSetDensity(density)); - } - - @Override - public int getTemperature() { - return fluid.getTemperature(); - } - - @Override - public void setTemperature(int temperature) { - MineTweakerAPI.apply(new ActionSetTemperature(temperature)); - } - - @Override - public int getViscosity() { - return fluid.getViscosity(); - } - - @Override - public void setViscosity(int viscosity) { - MineTweakerAPI.apply(new ActionSetViscosity(viscosity)); - } - - @Override - public boolean isGaseous() { - return fluid.isGaseous(); - } - - @Override - public void setGaseous(boolean gaseous) { - MineTweakerAPI.apply(new ActionSetGaseous(gaseous)); - } - - @Override - public List getContainers() { - List result = new ArrayList(); - for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (data.fluid.getFluid() == fluid) { - result.add(MineTweakerMC.getIItemStack(data.filledContainer)); - } - } - return result; - } - - @Override - public void addContainer(IItemStack filled, IItemStack empty, int amount) { - MineTweakerAPI.apply(new AddContainerAction(filled, empty, amount)); - } - - @Override - public void removeContainer(IItemStack filled) { - // MineTweakerAPI.apply(new RemoveContainerAction(filled)); - MineTweakerAPI.logError("Cannot remove container items in MineCraft 1.7.X"); - } - - // ####################### - // ### Private methods ### - // ####################### - - /* - * private void removeContainerInner(IItemStack filled) { ItemStack - * filledItem = MineTweakerMC.getItemStack(filled); - * FluidContainerRegistry.FluidContainerData data = - * filledContainerMap.get(Arrays.asList(filledItem.itemID, - * filledItem.getItemDamage())); if (data != null) { - * filledContainerMap.remove(Arrays.asList(filledItem.itemID, - * filledItem.getItemDamage())); - * containerFluidMap.remove(Arrays.asList(data.emptyContainer.itemID, - * data.emptyContainer.getItemDamage())); - * - * // rebuild empty containers set emptyContainers.clear(); for - * (FluidContainerRegistry.FluidContainerData fdata : - * filledContainerMap.values()) { - * emptyContainers.add(Arrays.asList(fdata.emptyContainer.itemID, - * fdata.emptyContainer.getItemDamage())); } } - * MineTweakerAPI.logError("Removal of containers is not possible in 1.7.X" - * ); } - */ - - /* - * private FluidContainerRegistry.FluidContainerData getData(IItemStack - * filled) { ItemStack filledStack = MineTweakerMC.getItemStack(filled); - * return filledContainerMap.get(Arrays.asList(filledStack.itemID, - * filledStack.getItemDamage())); } - */ - - // ###################### - // ### Action classes ### - // ###################### - - private class AddContainerAction implements IUndoableAction { - private final IItemStack filled; - private final IItemStack empty; - private final int amount; - - public AddContainerAction(IItemStack filled, IItemStack empty, int amount) { - this.filled = filled; - this.empty = empty; - this.amount = amount; - } - - @Override - public void apply() { - FluidContainerRegistry.registerFluidContainer(new FluidStack(fluid, amount), MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); - } - - @Override - public boolean canUndo() { - return false; - // return true; - } - - @Override - public void undo() { - // removeContainerInner(filled); - } - - @Override - public String describe() { - return "Adding " + filled.getDisplayName() + " as liquid container for " + fluid.getUnlocalizedName() == null ? "" : StatCollector.translateToLocal(fluid.getUnlocalizedName()); - } - - @Override - public String describeUndo() { - return "Removing liquid container " + filled; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - /* - * private class RemoveContainerAction implements IUndoableAction { private - * final IItemStack filled; private final IItemStack empty; private final - * FluidStack amount; - * - * public RemoveContainerAction(IItemStack filled) { this.filled = filled; - * - * FluidContainerRegistry.FluidContainerData data = getData(filled); empty = - * MineTweakerMC.getIItemStack(data.emptyContainer); amount = data.fluid; } - * - * @Override public void apply() { removeContainerInner(filled); } - * - * @Override public boolean canUndo() { return true; } - * - * @Override public void undo() { - * FluidContainerRegistry.registerFluidContainer(amount, - * MineTweakerMC.getItemStack(filled), MineTweakerMC.getItemStack(empty)); } - * - * @Override public String describe() { return "Removing liquid container " - * + filled; } - * - * @Override public String describeUndo() { return - * "Restoring liquid container " + filled; } - * - * @Override public Object getOverrideKey() { return null; } } - */ - - private class ActionSetLuminosity implements IUndoableAction { - private final int oldValue; - private final int newValue; - - public ActionSetLuminosity(int newValue) { - oldValue = getLuminosity(); - this.newValue = newValue; - } - - @Override - public void apply() { - fluid.setLuminosity(newValue); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - fluid.setLuminosity(oldValue); - } - - @Override - public String describe() { - return "Setting " + fluid.getName() + " luminosity to " + newValue; - } - - @Override - public String describeUndo() { - return "Restoring " + fluid.getName() + " luminosity to " + oldValue; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private class ActionSetDensity implements IUndoableAction { - private final int oldValue; - private final int newValue; - - public ActionSetDensity(int newValue) { - oldValue = getDensity(); - this.newValue = newValue; - } - - @Override - public void apply() { - fluid.setDensity(newValue); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - fluid.setDensity(oldValue); - } - - @Override - public String describe() { - return "Setting " + fluid.getName() + " density to " + newValue; - } - - @Override - public String describeUndo() { - return "Restoring " + fluid.getName() + " density to " + oldValue; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private class ActionSetTemperature implements IUndoableAction { - private final int oldValue; - private final int newValue; - - public ActionSetTemperature(int newValue) { - oldValue = getTemperature(); - this.newValue = newValue; - } - - @Override - public void apply() { - fluid.setTemperature(newValue); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - fluid.setTemperature(oldValue); - } - - @Override - public String describe() { - return "Setting " + fluid.getName() + " temperature to " + newValue; - } - - @Override - public String describeUndo() { - return "Restoring " + fluid.getName() + " temperature to " + oldValue; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private class ActionSetViscosity implements IUndoableAction { - private final int oldValue; - private final int newValue; - - public ActionSetViscosity(int newValue) { - oldValue = getViscosity(); - this.newValue = newValue; - } - - @Override - public void apply() { - fluid.setViscosity(newValue); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - fluid.setViscosity(oldValue); - } - - @Override - public String describe() { - return "Setting " + fluid.getName() + " viscosity to " + newValue; - } - - @Override - public String describeUndo() { - return "Restoring " + fluid.getName() + " viscosity to " + oldValue; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private class ActionSetGaseous implements IUndoableAction { - private final boolean oldValue; - private final boolean newValue; - - public ActionSetGaseous(boolean newValue) { - oldValue = isGaseous(); - this.newValue = newValue; - } - - @Override - public void apply() { - fluid.setGaseous(newValue); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - fluid.setGaseous(oldValue); - } - - @Override - public String describe() { - return "Setting " + fluid.getName() + " gaseous to " + newValue; - } - - @Override - public String describeUndo() { - return "Restoring " + fluid.getName() + " gaseous to " + oldValue; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/liquid/MCLiquidStack.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/liquid/MCLiquidStack.java deleted file mode 100644 index 0e03699..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/liquid/MCLiquidStack.java +++ /dev/null @@ -1,210 +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.mc18.liquid; - -import java.util.Collections; -import java.util.List; - -import minetweaker.api.data.IData; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.item.IngredientOr; -import minetweaker.api.liquid.ILiquidDefinition; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.player.IPlayer; -import minetweaker.mc18.data.NBTConverter; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; - -/** - * - * @author Stan - */ -public class MCLiquidStack implements ILiquidStack { - private final FluidStack stack; - private IData tag = null; - - public MCLiquidStack(FluidStack stack) { - this.stack = stack; - } - - private MCLiquidStack(FluidStack stack, IData tag) { - this.stack = stack; - this.tag = tag; - } - - @Override - public ILiquidDefinition getDefinition() { - return new MCLiquidDefinition(stack.getFluid()); - } - - @Override - public String getName() { - return stack.getFluid().getName(); - } - - @Override - public String getDisplayName() { - return stack.getFluid().getLocalizedName(stack); - } - - @Override - public int getAmount() { - return stack.amount; - } - - @Override - public IData getTag() { - if (tag == null) { - if (stack.tag == null) { - return null; - } - - tag = NBTConverter.from(stack.tag, true); - } - - return tag; - } - - @Override - public ILiquidStack withTag(IData data) { - FluidStack result = new FluidStack(stack.getFluid(), stack.amount); - result.tag = (NBTTagCompound) NBTConverter.from(data); - return new MCLiquidStack(result, data.immutable()); - } - - @Override - public ILiquidStack withAmount(int amount) { - FluidStack result = new FluidStack(stack.getFluid(), amount); - result.tag = stack.tag; - return new MCLiquidStack(result, tag); - } - - @Override - public int getLuminosity() { - return stack.getFluid().getLuminosity(stack); - } - - @Override - public int getDensity() { - return stack.getFluid().getDensity(stack); - } - - @Override - public int getTemperature() { - return stack.getFluid().getTemperature(stack); - } - - @Override - public int getViscosity() { - return stack.getFluid().getViscosity(stack); - } - - @Override - public boolean isGaseous() { - return stack.getFluid().isGaseous(stack); - } - - @Override - public Object getInternal() { - return stack; - } - - // ################################## - // ### IIngredient implementation ### - // ################################## - - @Override - public String getMark() - { - return null; - } - - @Override - public List getItems() - { - return Collections.emptyList(); - } - - @Override - public List getLiquids() - { - return Collections.singletonList(this); - } - - @Override - public IIngredient amount(int amount) - { - return withAmount(amount); - } - - @Override - public IIngredient or(IIngredient ingredient) - { - return new IngredientOr(this, ingredient); - } - - @Override - public IIngredient transform(IItemTransformer transformer) - { - throw new UnsupportedOperationException("Liquid stack can't have transformers"); - } - - @Override - public IIngredient only(IItemCondition condition) - { - throw new UnsupportedOperationException("Liquid stack can't have conditions"); - } - - @Override - public IIngredient marked(String mark) - { - throw new UnsupportedOperationException("Liquid stack can't be marked"); - } - - @Override - public boolean matches(IItemStack item) - { - return false; - } - - @Override - public boolean matches(ILiquidStack liquid) - { - return getDefinition().equals(liquid.getDefinition()) - && getAmount() <= liquid.getAmount(); - } - - @Override - public boolean contains(IIngredient ingredient) - { - if (!ingredient.getItems().isEmpty()) - return false; - - for (ILiquidStack liquid : ingredient.getLiquids()) - { - if (!matches(liquid)) - return false; - } - - return false; - } - - @Override - public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) - { - return item; - } - - @Override - public boolean hasTransformers() - { - return false; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/mods/MCLoadedMods.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/mods/MCLoadedMods.java deleted file mode 100644 index b9c0c64..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/mods/MCLoadedMods.java +++ /dev/null @@ -1,46 +0,0 @@ -package minetweaker.mc18.mods; - -import java.util.Iterator; -import java.util.List; - -import minetweaker.api.mods.ILoadedMods; -import minetweaker.api.mods.IMod; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; -import stanhebben.zenscript.util.MappingIterator; - -/** - * - * @author Stan - */ -public class MCLoadedMods implements ILoadedMods { - public MCLoadedMods() { - } - - @Override - public boolean contains(String name) { - return Loader.isModLoaded(name); - } - - @Override - public IMod get(String name) { - for (ModContainer mod : Loader.instance().getActiveModList()) { - if (mod.getModId().equals(name)) { - return new MCMod(mod); - } - } - - return null; - } - - @Override - public Iterator iterator() { - List mods = Loader.instance().getActiveModList(); - return new MappingIterator(mods.iterator()) { - @Override - public IMod map(ModContainer value) { - return new MCMod(value); - } - }; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/mods/MCMod.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/mods/MCMod.java deleted file mode 100644 index 344f8e1..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/mods/MCMod.java +++ /dev/null @@ -1,42 +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.mc18.mods; - -import minetweaker.api.mods.IMod; -import net.minecraftforge.fml.common.ModContainer; - -/** - * - * @author Stan - */ -public class MCMod implements IMod { - private final ModContainer mod; - - public MCMod(ModContainer mod) { - this.mod = mod; - } - - @Override - public String getId() { - return mod.getModId(); - } - - @Override - public String getName() { - return mod.getName(); - } - - @Override - public String getVersion() { - return mod.getVersion(); - } - - @Override - public String getDescription() { - return mod.getMetadata().description; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerCopyClipboardHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerCopyClipboardHandler.java deleted file mode 100644 index 29a970a..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerCopyClipboardHandler.java +++ /dev/null @@ -1,33 +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.mc18.network; - -import java.awt.Desktop; -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.StringSelection; - -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -/** - * - * @author Stan - */ -public class MineTweakerCopyClipboardHandler implements IMessageHandler { - @Override - public IMessage onMessage(MineTweakerCopyClipboardPacket message, MessageContext ctx) { - if (Desktop.isDesktopSupported()) { - StringSelection stringSelection = new StringSelection(message.getData()); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(stringSelection, null); - } - - return null; - } -} \ No newline at end of file diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerCopyClipboardPacket.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerCopyClipboardPacket.java deleted file mode 100644 index 1a21bd4..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerCopyClipboardPacket.java +++ /dev/null @@ -1,44 +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.mc18.network; - -import static com.google.common.base.Charsets.UTF_8; -import io.netty.buffer.ByteBuf; - -import java.nio.ByteBuffer; - -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; - -/** - * - * @author Stan - */ -public class MineTweakerCopyClipboardPacket implements IMessage -{ - private String data; - - public MineTweakerCopyClipboardPacket() { - } - - public MineTweakerCopyClipboardPacket(String data) { - this.data = data; - } - - public String getData() { - return data; - } - - @Override - public void fromBytes(ByteBuf buf) { - data = UTF_8.decode(ByteBuffer.wrap(buf.array())).toString().trim(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBytes(UTF_8.encode(data).array()); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerLoadScriptsHandler.java deleted file mode 100644 index 6661f7d..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerLoadScriptsHandler.java +++ /dev/null @@ -1,33 +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.mc18.network; - -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.mc18.client.MCClient; -import minetweaker.runtime.providers.ScriptProviderMemory; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -/** - * - * @author Stan - */ -public class MineTweakerLoadScriptsHandler implements IMessageHandler { - @Override - public IMessage onMessage(MineTweakerLoadScriptsPacket message, MessageContext ctx) { - if (MineTweakerAPI.server == null) { - MineTweakerAPI.client = new MCClient(); - - MineTweakerImplementationAPI.setScriptProvider(new ScriptProviderMemory(message.getData())); - MineTweakerImplementationAPI.reload(); - } - - return null; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerLoadScriptsPacket.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerLoadScriptsPacket.java deleted file mode 100644 index 1c83e2f..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerLoadScriptsPacket.java +++ /dev/null @@ -1,43 +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.mc18.network; - -import io.netty.buffer.ByteBuf; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; - -/** - * - * @author Stan - */ -public class MineTweakerLoadScriptsPacket implements IMessage { - private byte[] data; - - public MineTweakerLoadScriptsPacket() { - // used for deserialization - } - - public MineTweakerLoadScriptsPacket(byte[] data) { - this.data = data; - } - - public byte[] getData() { - return data; - } - - @Override - public void fromBytes(ByteBuf buf) { - int size = buf.readInt(); - data = new byte[size]; - buf.readBytes(data); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(data.length); - buf.writeBytes(data); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerOpenBrowserHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerOpenBrowserHandler.java deleted file mode 100644 index b92cd38..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerOpenBrowserHandler.java +++ /dev/null @@ -1,38 +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.mc18.network; - -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; - -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -/** - * - * @author Stan - */ -public class MineTweakerOpenBrowserHandler implements IMessageHandler { - @Override - public IMessage onMessage(MineTweakerOpenBrowserPacket message, MessageContext ctx) { - if (Desktop.isDesktopSupported()) { - Desktop desktop = Desktop.getDesktop(); - try { - desktop.browse(new URI(message.getUrl())); - } catch (IOException e) { - } catch (URISyntaxException e) { - } - } else { - System.out.println("Desktop not supported"); - } - - return null; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerOpenBrowserPacket.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerOpenBrowserPacket.java deleted file mode 100644 index 01ef93d..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/network/MineTweakerOpenBrowserPacket.java +++ /dev/null @@ -1,46 +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.mc18.network; - -import io.netty.buffer.ByteBuf; - -import java.nio.ByteBuffer; -import java.nio.charset.Charset; - -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; - -/** - * - * @author Stan - */ -public class MineTweakerOpenBrowserPacket implements IMessage { - private static final Charset UTF8 = Charset.forName("utf-8"); - - private String url; - - public MineTweakerOpenBrowserPacket() { - - } - - public MineTweakerOpenBrowserPacket(String url) { - this.url = url; - } - - public String getUrl() { - return url; - } - - @Override - public void fromBytes(ByteBuf buf) { - url = UTF8.decode(ByteBuffer.wrap(buf.array())).toString().trim(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBytes(UTF8.encode(url).array()); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java deleted file mode 100644 index b523fed..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/oredict/MCOreDictEntry.java +++ /dev/null @@ -1,413 +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.mc18.oredict; - -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.item.IngredientOr; -import minetweaker.api.item.IngredientStack; -import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.api.oredict.IngredientOreDict; -import minetweaker.api.player.IPlayer; -import minetweaker.mc18.util.MineTweakerHacks; -import minetweaker.util.ArrayUtil; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -/** - * - * @author Stan - */ -public class MCOreDictEntry implements IOreDictEntry { - - private static final List> OREDICT_CONTENTS = MineTweakerHacks.getOreIdStacks(); - private static final List> OREDICT_CONTENTS_UN = MineTweakerHacks.getOreIdStacksUn(); - - private final String id; - - public MCOreDictEntry(String id) { - this.id = id; - } - - - // #################################### - // ### IOreDictEntry implementation ### - // #################################### - - @Override - public String getName() { - return id; - } - - @Override - public boolean isEmpty() { - return OreDictionary.getOres(getName()).isEmpty(); - } - - @Override - public IItemStack getFirstItem() { - List items = OreDictionary.getOres(getName()); - if (items.isEmpty()) { - return null; - } - return getIItemStackWildcardSize(items.get(0)); - } - - @Override - public void add(IItemStack item) { - ItemStack stack = getItemStack(item); - if (stack != null) { - MineTweakerAPI.apply(new ActionAddItem(id, stack)); - } - } - - @Override - public void addAll(IOreDictEntry entry) { - if (entry instanceof MCOreDictEntry) { - MineTweakerAPI.apply(new ActionAddAll(id, ((MCOreDictEntry) entry).id)); - } else { - MineTweakerAPI.logError("not a valid entry"); - } - } - - @Override - public void remove(IItemStack item) { - ItemStack result = null; - for (ItemStack itemStack : OreDictionary.getOres(getName())) { - if (item.matches(getIItemStackWildcardSize(itemStack))) { - result = itemStack; - break; - } - } - - if (result != null) { - MineTweakerAPI.apply(new ActionRemoveItem(id, result)); - } - } - - @Override - public boolean contains(IItemStack item) { - for (ItemStack itemStack : OreDictionary.getOres(getName())) { - if (getIItemStackWildcardSize(itemStack).matches(item)) { - return true; - } - } - - return false; - } - - @Override - public void mirror(IOreDictEntry other) { - if (other instanceof MCOreDictEntry) { - MineTweakerAPI.apply(new ActionMirror(id, ((MCOreDictEntry) other).id)); - } else { - MineTweakerAPI.logError("not a valid oredict entry"); - } - } - - @Override - public String getMark() { - return null; - } - - @Override - public int getAmount() { - return 1; - } - - @Override - public List getItems() { - List result = new ArrayList(); - for (ItemStack item : OreDictionary.getOres(getName())) { - result.add(getIItemStackWildcardSize(item)); - } - return result; - } - - @Override - public List getLiquids() { - return Collections.emptyList(); - } - - @Override - public IIngredient amount(int amount) { - return new IngredientStack(this, amount); - } - - @Override - public IIngredient transform(IItemTransformer transformer) { - return new IngredientOreDict(this, null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer }); - } - - @Override - public IIngredient only(IItemCondition condition) { - return new IngredientOreDict(this, null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS); - } - - @Override - public IIngredient marked(String mark) { - return new IngredientOreDict(this, mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS); - } - - @Override - public IIngredient or(IIngredient ingredient) { - return new IngredientOr(this, ingredient); - } - - @Override - public boolean matches(IItemStack item) { - return contains(item); - } - - @Override - public boolean matches(ILiquidStack liquid) { - return false; - } - - @Override - public boolean contains(IIngredient ingredient) { - List items = ingredient.getItems(); - for (IItemStack item : items) { - if (!matches(item)) - return false; - } - - return true; - } - - @Override - public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { - return item; - } - - @Override - public boolean hasTransformers() { - return false; - } - - @Override - public Object getInternal() { - return id; - } - - // ############################# - // ### Object implementation ### - // ############################# - - @Override - public String toString() { - return ""; - } - - @Override - public int hashCode() { - return id.hashCode(); - } - - @Override - public boolean equals(Object other) { - if (!(other instanceof MCOreDictEntry)) - return false; - return ((MCOreDictEntry) other).id == id; - } - - // ###################### - // ### Action classes ### - // ###################### - - private static class ActionAddItem implements IUndoableAction { - private final String id; - private final ItemStack item; - - public ActionAddItem(String id, ItemStack item) { - this.id = id; - this.item = item; - } - - @Override - public void apply() { - OreDictionary.registerOre(id, item); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - int oreId = OreDictionary.getOreID(id); - OREDICT_CONTENTS.get(oreId).remove(item); - } - - @Override - public String describe() { - return "Adding " + item.getDisplayName() + " to ore dictionary entry " + id; - } - - @Override - public String describeUndo() { - return "Removing " + item.getDisplayName() + " from ore dictionary entry " + id; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class ActionMirror implements IUndoableAction { - private final String idTarget; - private final String idSource; - - private final ArrayList targetCopy; - private final ArrayList targetCopyUn; - - public ActionMirror(String idTarget, String idSource) { - this.idTarget = idTarget; - this.idSource = idSource; - - int targetOreId = OreDictionary.getOreID(idTarget); - targetCopy = OREDICT_CONTENTS.get(targetOreId); - targetCopyUn = OREDICT_CONTENTS_UN.get(targetOreId); - } - - @Override - public void apply() { - int sourceOreId = OreDictionary.getOreID(idSource); - int targetOreId = OreDictionary.getOreID(idTarget); - OREDICT_CONTENTS.set(targetOreId, OREDICT_CONTENTS.get(sourceOreId)); - OREDICT_CONTENTS_UN.set(targetOreId, OREDICT_CONTENTS_UN.get(sourceOreId)); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - int targetOreId = OreDictionary.getOreID(idTarget); - OREDICT_CONTENTS.set(targetOreId, targetCopy); - OREDICT_CONTENTS_UN.set(targetOreId, targetCopyUn); - } - - @Override - public String describe() { - return "Mirroring " + idSource + " to " + idTarget; - } - - @Override - public String describeUndo() { - return "Undoing mirror of " + idSource+ " to " + idTarget; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class ActionRemoveItem implements IUndoableAction { - private final String id; - private final ItemStack item; - - public ActionRemoveItem(String id, ItemStack item) { - this.id = id; - this.item = item; - } - - @Override - public void apply() { - int oreId = OreDictionary.getOreID(id); - OREDICT_CONTENTS.get(oreId).remove(item); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - int oreId = OreDictionary.getOreID(id); - OREDICT_CONTENTS.get(oreId).add(item); - } - - @Override - public String describe() { - return "Removing " + item.getDisplayName() + " from ore dictionary entry " + id; - } - - @Override - public String describeUndo() { - return "Restoring " + item.getDisplayName() + " to ore dictionary entry " + id; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private static class ActionAddAll implements IUndoableAction { - private final String idTarget; - private final String idSource; - - public ActionAddAll(String idTarget, String idSource) { - this.idTarget = idTarget; - this.idSource = idSource; - } - - @Override - public void apply() { - for (ItemStack stack : OreDictionary.getOres(idSource)) { - OreDictionary.registerOre(idTarget, stack); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - int targetOreId = OreDictionary.getOreID(idTarget); - for (ItemStack stack : OreDictionary.getOres(idSource)) { - OREDICT_CONTENTS.get(targetOreId).remove(stack); - } - } - - @Override - public String describe() { - return "Copying contents of ore dictionary entry " + idSource + " to " + idTarget; - } - - @Override - public String describeUndo() { - return "Removing contents of ore dictionary entry " + idSource + " from " + idTarget; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/player/MCPlayer.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/player/MCPlayer.java deleted file mode 100644 index 6893ce6..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/player/MCPlayer.java +++ /dev/null @@ -1,146 +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.mc18.player; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.chat.IChatMessage; -import minetweaker.api.data.IData; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import minetweaker.mc18.MineTweakerMod; -import minetweaker.mc18.data.NBTConverter; -import minetweaker.mc18.network.MineTweakerCopyClipboardPacket; -import minetweaker.mc18.network.MineTweakerOpenBrowserPacket; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - -/** - * - * @author Stan - */ -public class MCPlayer implements IPlayer { - private final EntityPlayer player; - - public MCPlayer(EntityPlayer player) { - this.player = player; - } - - public EntityPlayer getInternal() { - return player; - } - - @Override - public String getId() { - return null; // TODO: we should be having this for MC 1.7.10, right? - } - - @Override - public String getName() { - return player.getName(); - } - - @Override - public IData getData() { - return NBTConverter.from(player.getEntityData(), true); - } - - @Override - 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.logError("not a valid chat message"); - return; - } - player.addChatMessage((IChatComponent) internal); - } - - @Override - public void sendChat(String message) { - player.addChatMessage(new ChatComponentText(message)); - } - - @Override - public int getHotbarSize() { - return 9; - } - - @Override - public IItemStack getHotbarStack(int i) { - return i < 0 || i >= 9 ? null : MineTweakerMC.getIItemStack(player.inventory.getStackInSlot(i)); - } - - @Override - public int getInventorySize() { - return player.inventory.getSizeInventory(); - } - - @Override - public IItemStack getInventoryStack(int i) { - return MineTweakerMC.getIItemStack(player.inventory.getStackInSlot(i)); - } - - @Override - public IItemStack getCurrentItem() { - return MineTweakerMC.getIItemStack(player.getCurrentEquippedItem()); - } - - @Override - public boolean isCreative() { - return player.capabilities.isCreativeMode; - } - - @Override - public boolean isAdventure() { - return !player.capabilities.allowEdit; - } - - @Override - public void openBrowser(String url) { - if (player instanceof EntityPlayerMP) { - MineTweakerMod.NETWORK.sendTo( - new MineTweakerOpenBrowserPacket(url), - (EntityPlayerMP) player); - } - } - - @Override - public void copyToClipboard(String value) { - if (player instanceof EntityPlayerMP) { - MineTweakerMod.NETWORK.sendTo( - new MineTweakerCopyClipboardPacket(value), - (EntityPlayerMP) player); - } - } - - @Override - public boolean equals(Object other) { - if (other.getClass() != this.getClass()) - return false; - - return ((MCPlayer) other).player == player; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 23 * hash + (this.player != null ? this.player.hashCode() : 0); - return hash; - } - - @Override - public void give(IItemStack stack) { - player.inventory.addItemStackToInventory(MineTweakerMC.getItemStack(stack).copy()); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/player/RconPlayer.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/player/RconPlayer.java deleted file mode 100644 index 9a8dd50..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/player/RconPlayer.java +++ /dev/null @@ -1,123 +0,0 @@ -package minetweaker.mc18.player; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.chat.IChatMessage; -import minetweaker.api.data.IData; -import minetweaker.api.item.IItemStack; -import minetweaker.api.player.IPlayer; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - -/** - * - * @author Jared - */ -public class RconPlayer implements IPlayer { - private final ICommandSender sender; - - public RconPlayer(ICommandSender sender) { - this.sender = sender; - } - - public ICommandSender getInternal() { - return sender; - } - - @Override - public String getId() { - return null; // TODO: we should be having this for MC 1.7.10, right? - } - - @Override - public String getName() { - return sender.getName(); - } - - @Override - public IData getData() { - return null; - } - - @Override - public void update(IData data) { - - } - - @Override - public void sendChat(IChatMessage message) { - Object internal = message.getInternal(); - if (!(internal instanceof IChatComponent)) { - MineTweakerAPI.logError("not a valid chat message"); - return; - } - sender.addChatMessage((IChatComponent) internal); - } - - @Override - public void sendChat(String message) { - sender.addChatMessage(new ChatComponentText(message)); - } - - @Override - public int getHotbarSize() { - return 0; - } - - @Override - public IItemStack getHotbarStack(int i) { - return null; - } - - @Override - public int getInventorySize() { - return 0; - } - - @Override - public IItemStack getInventoryStack(int i) { - return null; - } - - @Override - public IItemStack getCurrentItem() { - return null; - } - - @Override - public boolean isCreative() { - return false; - } - - @Override - public boolean isAdventure() { - return false; - } - - @Override - public void openBrowser(String url) { - } - - @Override - public void copyToClipboard(String value) { - } - - @Override - public boolean equals(Object other) { - if (other.getClass() != this.getClass()) - return false; - - return ((RconPlayer) other).sender == sender; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 23 * hash + (this.sender != null ? this.sender.hashCode() : 0); - return hash; - } - - @Override - public void give(IItemStack stack) { - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/MCRecipeManager.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/MCRecipeManager.java deleted file mode 100644 index c902c1b..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/MCRecipeManager.java +++ /dev/null @@ -1,422 +0,0 @@ -package minetweaker.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; - -import java.util.ArrayList; -import java.util.List; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import minetweaker.api.recipes.ICraftingInventory; -import minetweaker.api.recipes.ICraftingRecipe; -import minetweaker.api.recipes.IRecipeFunction; -import minetweaker.api.recipes.IRecipeManager; -import minetweaker.api.recipes.ShapedRecipe; -import minetweaker.api.recipes.ShapelessRecipe; -import minetweaker.mc18.util.MineTweakerHacks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -/** - * - * @author Stan - */ -public class MCRecipeManager implements IRecipeManager { - private final List recipes; - private final List transformerRecipes; - - public MCRecipeManager() { - recipes = (List) CraftingManager.getInstance().getRecipeList(); - transformerRecipes = new ArrayList(); - } - - public boolean hasTransformerRecipes() { - return transformerRecipes.size() > 0; - } - - public void applyTransformations(ICraftingInventory inventory, IPlayer byPlayer) { - for (ICraftingRecipe recipe : transformerRecipes) { - if (recipe.matches(inventory)) { - recipe.applyTransformers(inventory, byPlayer); - return; - } - } - } - - @Override - public List getRecipesFor(IIngredient ingredient) { - List results = new ArrayList(); - - for (IRecipe recipe : recipes) { - if (ingredient.matches(MineTweakerMC.getIItemStack(recipe.getRecipeOutput()))) { - ICraftingRecipe converted = RecipeConverter.toCraftingRecipe(recipe); - results.add(converted); - } - } - - return results; - } - - @Override - public List getAll() { - List results = new ArrayList(); - - for (IRecipe recipe : recipes) { - ICraftingRecipe converted = RecipeConverter.toCraftingRecipe(recipe); - results.add(converted); - } - - return results; - } - - @Override - public int remove(IIngredient output) { - List toRemove = new ArrayList(); - List removeIndex = new ArrayList(); - for (int i = 0; i < recipes.size(); i++) { - IRecipe recipe = recipes.get(i); - - // certain special recipes have no predefined output. ignore those - // since these cannot be removed with MineTweaker scripts - if (recipe.getRecipeOutput() != null) { - if (output.matches(getIItemStack(recipe.getRecipeOutput()))) { - toRemove.add(recipe); - removeIndex.add(i); - } - } - } - - MineTweakerAPI.apply(new ActionRemoveRecipes(toRemove, removeIndex)); - return toRemove.size(); - } - - @Override - public void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function) { - addShaped(output, ingredients, function, false); - } - - @Override - public void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function) { - addShaped(output, ingredients, function, true); - } - - @Override - public void addShapeless(IItemStack output, IIngredient[] ingredients, IRecipeFunction function) { - ShapelessRecipe recipe = new ShapelessRecipe(output, ingredients, function); - IRecipe irecipe = RecipeConverter.convert(recipe); - MineTweakerAPI.apply(new ActionAddRecipe(irecipe, recipe)); - } - - @Override - public int removeShaped(IIngredient output, IIngredient[][] ingredients) { - int ingredientsWidth = 0; - int ingredientsHeight = 0; - - if (ingredients != null) { - ingredientsHeight = ingredients.length; - - for (int i = 0; i < ingredients.length; i++) { - ingredientsWidth = Math.max(ingredientsWidth, ingredients[i].length); - } - } - - List toRemove = new ArrayList(); - List removeIndex = new ArrayList(); - outer: for (int i = 0; i < recipes.size(); i++) { - IRecipe recipe = recipes.get(i); - - if (recipe.getRecipeOutput() == null || !output.matches(getIItemStack(recipe.getRecipeOutput()))) { - continue; - } - - if (ingredients != null) { - if (recipe instanceof ShapedRecipes) { - ShapedRecipes srecipe = (ShapedRecipes) recipe; - if (ingredientsWidth != srecipe.recipeWidth || ingredientsHeight != srecipe.recipeHeight) { - continue; - } - - for (int j = 0; j < ingredientsHeight; j++) { - IIngredient[] row = ingredients[j]; - for (int k = 0; k < ingredientsWidth; k++) { - IIngredient ingredient = k > row.length ? null : row[k]; - ItemStack recipeIngredient = srecipe.recipeItems[j * srecipe.recipeWidth + k]; - - if (!matches(recipeIngredient, ingredient)) { - continue outer; - } - } - } - } else if (recipe instanceof ShapedOreRecipe) { - ShapedOreRecipe srecipe = (ShapedOreRecipe) recipe; - int recipeWidth = MineTweakerHacks.getShapedOreRecipeWidth(srecipe); - int recipeHeight = srecipe.getRecipeSize() / recipeWidth; - if (ingredientsWidth != recipeWidth || ingredientsHeight != recipeHeight) { - continue; - } - - for (int j = 0; j < ingredientsHeight; j++) { - IIngredient[] row = ingredients[j]; - for (int k = 0; k < ingredientsWidth; k++) { - IIngredient ingredient = k > row.length ? null : row[k]; - Object input = srecipe.getInput()[j * recipeWidth + k]; - if (!matches(input, ingredient)) { - continue outer; - } - } - } - } - } else { - if (recipe instanceof ShapedRecipes) { - - } else if (recipe instanceof ShapedOreRecipe) { - - } else { - continue; - } - } - - toRemove.add(recipe); - removeIndex.add(i); - } - - MineTweakerAPI.apply(new ActionRemoveRecipes(toRemove, removeIndex)); - return toRemove.size(); - } - - @Override - public int removeShapeless(IIngredient output, IIngredient[] ingredients, boolean wildcard) { - List toRemove = new ArrayList(); - List removeIndex = new ArrayList(); - outer: for (int i = 0; i < recipes.size(); i++) { - IRecipe recipe = recipes.get(i); - - if (recipe.getRecipeOutput() == null || !output.matches(getIItemStack(recipe.getRecipeOutput()))) { - continue; - } - - if (ingredients != null) { - if (recipe instanceof ShapelessRecipes) { - ShapelessRecipes srecipe = (ShapelessRecipes) recipe; - - if (ingredients.length > srecipe.getRecipeSize() || ingredients.length< srecipe.getRecipeSize()) { - continue; - } else if (!wildcard && (ingredients.length > srecipe.getRecipeSize() || ingredients.length< srecipe.getRecipeSize())) { - continue; - } - - checkIngredient: for (int j = 0; j < ingredients.length; j++) { - for (int k = 0; k < srecipe.getRecipeSize(); k++) { - if (matches(srecipe.recipeItems.get(k), ingredients[j])) { - continue checkIngredient; - } - } - - continue outer; - } - } else if (recipe instanceof ShapelessOreRecipe) { - ShapelessOreRecipe srecipe = (ShapelessOreRecipe) recipe; - ArrayList inputs = srecipe.getInput(); - - if (inputs.size() < ingredients.length) { - continue; - } - if (!wildcard && inputs.size() > ingredients.length) { - continue; - } - - checkIngredient: for (int j = 0; j < ingredients.length; j++) { - for (int k = 0; k < srecipe.getRecipeSize(); k++) { - if (matches(inputs.get(k), ingredients[j])) { - continue checkIngredient; - } - } - - continue outer; - } - } - } else { - if (recipe instanceof ShapelessRecipes) { - continue; - } else if (recipe instanceof ShapelessOreRecipe) { - continue; - } else { - continue; - } - } - - toRemove.add(recipe); - removeIndex.add(i); - } - - MineTweakerAPI.apply(new ActionRemoveRecipes(toRemove, removeIndex)); - return toRemove.size(); - } - - @Override - public IItemStack craft(IItemStack[][] contents) { - Container container = new ContainerVirtual(); - - int width = 0; - int height = contents.length; - for (IItemStack[] row : contents) { - width = Math.max(width, row.length); - } - - ItemStack[] iContents = new ItemStack[width * height]; - for (int i = 0; i < height; i++) { - for (int j = 0; j < contents[i].length; j++) { - if (contents[i][j] != null) { - iContents[i * width + j] = getItemStack(contents[i][j]); - } - } - } - - InventoryCrafting inventory = new InventoryCrafting(container, width, height); - for (int i = 0; i < iContents.length; i++) { - inventory.setInventorySlotContents(i, iContents[i]); - } - ItemStack result = CraftingManager.getInstance().findMatchingRecipe(inventory, null); - if (result == null) { - return null; - } else { - return getIItemStack(result); - } - } - - private class ContainerVirtual extends Container { - @Override - public boolean canInteractWith(EntityPlayer var1) { - return false; - } - } - - private class ActionRemoveRecipes implements IUndoableAction { - private final List removingIndices; - private final List removingRecipes; - - public ActionRemoveRecipes(List recipes, List indices) { - this.removingIndices = indices; - this.removingRecipes = recipes; - } - - @Override - public void apply() { - for (int i = removingIndices.size() - 1; i >= 0; i--) { - recipes.remove((int) removingIndices.get(i)); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - for (int i = 0; i < removingIndices.size(); i++) { - int index = Math.min(recipes.size(), removingIndices.get(i)); - recipes.add(index, removingRecipes.get(i)); - } - } - - @Override - public String describe() { - return "Removing " + removingIndices.size() + " recipes"; - } - - @Override - public String describeUndo() { - return "Restoring " + removingIndices.size() + " recipes"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private class ActionAddRecipe implements IUndoableAction { - private final IRecipe recipe; - private final ICraftingRecipe craftingRecipe; - - public ActionAddRecipe(IRecipe recipe, ICraftingRecipe craftingRecipe) { - this.recipe = recipe; - this.craftingRecipe = craftingRecipe; - } - - @Override - public void apply() { - recipes.add(recipe); - if (craftingRecipe.hasTransformers()) { - transformerRecipes.add(craftingRecipe); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - recipes.remove(recipe); - if (craftingRecipe.hasTransformers()) { - transformerRecipes.remove(craftingRecipe); - } - } - - @Override - public String describe() { - return "Adding recipe for " + recipe.getRecipeOutput().getDisplayName(); - } - - @Override - public String describeUndo() { - return "Removing recipe for " + recipe.getRecipeOutput().getDisplayName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, boolean mirrored) { - ShapedRecipe recipe = new ShapedRecipe(output, ingredients, function, mirrored); - IRecipe irecipe = RecipeConverter.convert(recipe); - MineTweakerAPI.apply(new ActionAddRecipe(irecipe, recipe)); - } - - private static boolean matches(Object input, IIngredient ingredient) { - if ((input == null) != (ingredient == null)) { - return false; - } else if (ingredient != null) { - if (input instanceof ItemStack) { - if (!ingredient.matches(getIItemStack((ItemStack) input))) { - return false; - } - } else if (input instanceof String) { - if (!ingredient.contains(getOreDict((String) input))) { - return false; - } - } - } - - return true; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeAdvanced.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeAdvanced.java deleted file mode 100644 index f9d83d8..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeAdvanced.java +++ /dev/null @@ -1,52 +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.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapedRecipe; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; - -/** - * TODO: NEI integration for this kind of recipes. - * - * @author Stan - */ -public class ShapedRecipeAdvanced implements IRecipe { - private final ShapedRecipe recipe; - - public ShapedRecipeAdvanced(ShapedRecipe recipe) { - this.recipe = recipe; - } - - @Override - public boolean matches(InventoryCrafting inventory, World world) { - return recipe.matches(MCCraftingInventory.get(inventory)); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inventory) { - return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy(); - } - - @Override - public int getRecipeSize() { - return recipe.getWidth() * recipe.getHeight(); - } - - @Override - public ItemStack getRecipeOutput() { - return getItemStack(recipe.getOutput()); - } - - @Override - public ItemStack[] getRemainingItems(InventoryCrafting p_179532_1_) { - return new ItemStack[]{}; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeOre.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeOre.java deleted file mode 100644 index 96350ab..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapedRecipeOre.java +++ /dev/null @@ -1,44 +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.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; - -import minetweaker.api.recipes.ShapedRecipe; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.ShapedOreRecipe; - -/** - * - * @author Stan - */ -public class ShapedRecipeOre extends ShapedOreRecipe { - private final ShapedRecipe recipe; - - public ShapedRecipeOre(Object[] contents, ShapedRecipe recipe) { - super(getItemStack(recipe.getOutput()), contents); - - this.recipe = recipe; - } - - @Override - public boolean matches(InventoryCrafting inventory, World world) { - return recipe.matches(MCCraftingInventory.get(inventory)); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inventory) { - if(recipe !=null){ - if(recipe.getCraftingResult(MCCraftingInventory.get(inventory))!=null){ - return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy(); - } - } - return null; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeAdvanced.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeAdvanced.java deleted file mode 100644 index 592daf7..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeAdvanced.java +++ /dev/null @@ -1,51 +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.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapelessRecipe; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; - -/** - * - * @author Stan - */ -public class ShapelessRecipeAdvanced implements IRecipe { - private final ShapelessRecipe recipe; - - public ShapelessRecipeAdvanced(ShapelessRecipe recipe) { - this.recipe = recipe; - } - - @Override - public boolean matches(InventoryCrafting inventory, World world) { - return recipe.matches(MCCraftingInventory.get(inventory)); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inventory) { - return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy(); - } - - @Override - public int getRecipeSize() { - return recipe.getSize(); - } - - @Override - public ItemStack getRecipeOutput() { - return getItemStack(recipe.getOutput()); - } - - @Override - public ItemStack[] getRemainingItems(InventoryCrafting p_179532_1_) { - return new ItemStack[] {}; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeBasic.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeBasic.java deleted file mode 100644 index ca87458..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/recipes/ShapelessRecipeBasic.java +++ /dev/null @@ -1,41 +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.mc18.recipes; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; - -import java.util.Arrays; - -import minetweaker.api.recipes.ShapelessRecipe; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraft.world.World; - -/** - * - * @author Stan - */ -public class ShapelessRecipeBasic extends ShapelessRecipes { - private final ShapelessRecipe recipe; - - public ShapelessRecipeBasic(ItemStack[] ingredients, ShapelessRecipe recipe) { - super(getItemStack(recipe.getOutput()), Arrays.asList(ingredients)); - - this.recipe = recipe; - } - - @Override - public boolean matches(InventoryCrafting inventory, World world) { - return recipe.matches(MCCraftingInventory.get(inventory)); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inventory) { - return getItemStack(recipe.getCraftingResult(MCCraftingInventory.get(inventory))).copy(); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java deleted file mode 100644 index bb74daa..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java +++ /dev/null @@ -1,241 +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.mc18.server; - -import java.util.Arrays; -import java.util.List; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.AbstractServer; -import minetweaker.api.server.ICommandFunction; -import minetweaker.api.server.ICommandTabCompletion; -import minetweaker.api.server.ICommandValidator; -import minetweaker.mc18.player.RconPlayer; -import net.minecraft.command.CommandException; -import net.minecraft.command.CommandHandler; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.rcon.RConConsoleSource; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.management.UserListOps; -import net.minecraft.util.BlockPos; - -/** - * - * @author Stan - */ -public class MCServer extends AbstractServer { - private final MinecraftServer server; - - public MCServer(MinecraftServer server) { - this.server = server; - } - - @Override - public void addCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) { - ICommand command = new MCCommand(name, usage, aliases, function, validator, completion); - MineTweakerAPI.apply(new AddCommandAction(command)); - } - - @Override - public void removeCommand(String name) { - ICommand command = (ICommand) ((CommandHandler) server.getCommandManager()).getCommands().get(name); - if (command == null) { - MineTweakerAPI.logWarning("No such command: " + name); - } else { - MineTweakerAPI.apply(new RemoveCommandAction(command)); - } - } - - @Override - public boolean isOp(IPlayer player) { - if (player == ServerPlayer.INSTANCE) - return true; - - UserListOps ops = MinecraftServer.getServer().getConfigurationManager().getOppedPlayers(); - if (server.isDedicatedServer() && ops != null) { - return ops.getKeys().length > 0 || ops.getGameProfileFromName(player.getName()) != null || player instanceof RconPlayer; - } else { - return true; - } - } - - private static IPlayer getPlayer(ICommandSender commandSender) { - if (commandSender instanceof EntityPlayer) { - return MineTweakerMC.getIPlayer((EntityPlayer) commandSender); - } else if (commandSender instanceof DedicatedServer) { - return ServerPlayer.INSTANCE; - } else if (commandSender instanceof RConConsoleSource) { - return new RconPlayer(commandSender); - } else { - System.out.println("Unsupported command sender: " + commandSender); - System.out.println("player name: " + commandSender.getName()); - return null; - } - } - - private static void removeCommand(ICommand command) { - CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager(); - ch.getCommands().remove(command.getCommandName()); - - if (command.getCommandAliases() != null) { - for (String alias : (List) command.getCommandAliases()) { - ch.getCommands().remove(alias); - } - } - } - - private class MCCommand implements ICommand { - private final String name; - private final String usage; - private final List aliases; - private final ICommandFunction function; - private final ICommandValidator validator; - private final ICommandTabCompletion completion; - - public MCCommand(String name, String usage, String[] aliases, ICommandFunction function, ICommandValidator validator, ICommandTabCompletion completion) { - this.name = name; - this.usage = usage; - this.aliases = Arrays.asList(aliases); - this.function = function; - this.validator = validator; - this.completion = completion; - } - - @Override - public String getCommandName() { - return name; - } - - @Override - public String getCommandUsage(ICommandSender var1) { - return usage; - } - - @Override - public List getCommandAliases() { - return aliases; - } - - @Override - public boolean canCommandSenderUseCommand(ICommandSender var1) { - if (validator == null) { - return true; - } else { - return validator.canExecute(getPlayer(var1)); - } - } - - @Override - public boolean isUsernameIndex(String[] var1, int var2) { - return false; - } - - @Override - public int compareTo(ICommand o) { - return 0; - } - - @Override - public void processCommand(ICommandSender sender, String[] args) throws CommandException { - function.execute(args, getPlayer(sender)); - } - - @Override - public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) { - if (completion != null) { - return Arrays.asList(completion.getTabCompletionOptions(args, getPlayer(sender))); - } else { - return null; - } - } - - } - - private class AddCommandAction implements IUndoableAction { - private final ICommand command; - - public AddCommandAction(ICommand command) { - this.command = command; - } - - @Override - public void apply() { - CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager(); - ch.registerCommand(command); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - removeCommand(command); - } - - @Override - public String describe() { - return "Adding command " + command.getCommandName(); - } - - @Override - public String describeUndo() { - return "Removing command " + command.getCommandName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - private class RemoveCommandAction implements IUndoableAction { - private final ICommand command; - - public RemoveCommandAction(ICommand command) { - this.command = command; - } - - @Override - public void apply() { - removeCommand(command); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - CommandHandler ch = (CommandHandler) MinecraftServer.getServer().getCommandManager(); - ch.registerCommand(command); - } - - @Override - public String describe() { - return "Adding command " + command.getCommandName(); - } - - @Override - public String describeUndo() { - return "Removing command " + command.getCommandName(); - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerHacks.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerHacks.java deleted file mode 100644 index ff06ea5..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerHacks.java +++ /dev/null @@ -1,291 +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.mc18.util; - -import java.io.File; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.SlotCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.StatCollector; -import net.minecraft.util.StringTranslate; -import net.minecraft.util.WeightedRandom; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.registry.EntityRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import com.google.common.collect.BiMap; - -/** - * Common class for all runtime hacks (stuff requiring reflection). It is not - * unexpected to have it break with new minecraft versions and may need regular - * adjustment - as such, those have been collected here. - * - * @author Stan Hebben - */ -public class MineTweakerHacks { - private static final Field NBTTAGLIST_TAGLIST; - private static final Field OREDICTIONARY_IDTOSTACK; - private static final Field OREDICTIONARY_IDTOSTACKUN; - private static final Field MINECRAFTSERVER_ANVILFILE; - private static final Field SHAPEDORERECIPE_WIDTH; - private static final Field INVENTORYCRAFTING_EVENTHANDLER; - private static final Field SLOTCRAFTING_PLAYER; - - private static final Field ENTITYREGISTRY_CLASSREGISTRATIONS; - private static final Field SEEDENTRY_SEED; - private static final Constructor SEEDENTRY_CONSTRUCTOR; - - static { - NBTTAGLIST_TAGLIST = getField(NBTTagList.class, MineTweakerObfuscation.NBTTAGLIST_TAGLIST); - OREDICTIONARY_IDTOSTACK = getField(OreDictionary.class, MineTweakerObfuscation.OREDICTIONARY_IDTOSTACK); - OREDICTIONARY_IDTOSTACKUN = getField(OreDictionary.class, MineTweakerObfuscation.OREDICTIONARY_IDTOSTACKUN); - MINECRAFTSERVER_ANVILFILE = getField(MinecraftServer.class, MineTweakerObfuscation.MINECRAFTSERVER_ANVILFILE); - SHAPEDORERECIPE_WIDTH = getField(ShapedOreRecipe.class, new String[] { "width" }); - INVENTORYCRAFTING_EVENTHANDLER = getField(InventoryCrafting.class, MineTweakerObfuscation.INVENTORYCRAFTING_EVENTHANDLER); - SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); - - ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] { "entityClassRegistrations" }); - - Class forgeSeedEntry = null; - try { - forgeSeedEntry = (Class) Class.forName("net.minecraftforge.common.ForgeHooks$SeedEntry"); - } catch (ClassNotFoundException ex) { - } - - SEEDENTRY_SEED = getField(forgeSeedEntry, "seed"); - - Constructor seedEntryConstructor = null; - - try { - seedEntryConstructor = forgeSeedEntry.getConstructor(ItemStack.class, int.class); - seedEntryConstructor.setAccessible(true); - } catch (NoSuchMethodException ex) { - Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); - } catch (SecurityException ex) { - Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); - } - - SEEDENTRY_CONSTRUCTOR = seedEntryConstructor; - } - - private MineTweakerHacks() { - } - - public static BiMap, EntityRegistry.EntityRegistration> getEntityClassRegistrations() { - try { - return (BiMap, EntityRegistry.EntityRegistration>) ENTITYREGISTRY_CLASSREGISTRATIONS.get(EntityRegistry.instance()); - } catch (IllegalArgumentException ex) { - return null; - } catch (IllegalAccessException ex) { - return null; - } - } - - public static List getTagList(NBTTagList list) { - if (NBTTAGLIST_TAGLIST == null) { - return null; - } - try { - return (List) NBTTAGLIST_TAGLIST.get(list); - } catch (IllegalArgumentException ex) { - return null; - } catch (IllegalAccessException ex) { - return null; - } - } - - public static List getSeeds() { - return getPrivateStaticObject(ForgeHooks.class, "seedList"); - } - - public static Map getChestLoot() { - return getPrivateStaticObject(ChestGenHooks.class, "chestInfo"); - } - - public static Map getTranslations() { - return getPrivateObject( - getPrivateStaticObject(StatCollector.class, "localizedName", "field_74839_a"), - "languageList", - "field_74816_c"); - } - - public static List> getOreIdStacks() { - try { - return (List>) OREDICTIONARY_IDTOSTACK.get(null); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); - return null; - } - } - - public static List> getOreIdStacksUn() { - try { - return (List>) OREDICTIONARY_IDTOSTACKUN.get(null); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("ERROR - could not load ore dictionary stacks!"); - return null; - } - } - - public static File getAnvilFile(MinecraftServer server) { - try { - return (File) MINECRAFTSERVER_ANVILFILE.get(server); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not load anvil file!"); - return null; - } - } - - public static File getWorldDirectory(MinecraftServer server) { - if (server.isDedicatedServer()) { - return server.getFile("world"); - } else { - File worldsDir = getAnvilFile(server); - if (worldsDir == null) - return null; - - return new File(worldsDir, server.getFolderName()); - } - } - - public static int getShapedOreRecipeWidth(ShapedOreRecipe recipe) { - try { - return SHAPEDORERECIPE_WIDTH.getInt(recipe); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not load anvil file!"); - return 3; - } - } - - public static Container getCraftingContainer(InventoryCrafting inventory) { - try { - return (Container) INVENTORYCRAFTING_EVENTHANDLER.get(inventory); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not get inventory eventhandler"); - return null; - } - } - - public static EntityPlayer getCraftingSlotPlayer(SlotCrafting slot) { - try { - return (EntityPlayer) SLOTCRAFTING_PLAYER.get(slot); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not get inventory eventhandler"); - return null; - } - } - - public static StringTranslate getStringTranslateInstance() { - try { - Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); - return (StringTranslate) field.get(null); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not get string translator"); - return null; - } - } - - public static ItemStack getSeedEntrySeed(Object entry) { - try { - return (ItemStack) SEEDENTRY_SEED.get(entry); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not get SeedEntry seed"); - return null; - } - } - - public static WeightedRandom.Item constructSeedEntry(WeightedItemStack stack) { - try { - return SEEDENTRY_CONSTRUCTOR.newInstance(MineTweakerMC.getItemStack(stack.getStack()), (int) stack.getChance()); - } catch (InstantiationException ex) { - MineTweakerAPI.logError("could not construct SeedEntry"); - } catch (IllegalAccessException ex) { - MineTweakerAPI.logError("could not construct SeedEntry"); - } catch (IllegalArgumentException ex) { - MineTweakerAPI.logError("could not construct SeedEntry"); - } catch (InvocationTargetException ex) { - MineTweakerAPI.logError("could not construct SeedEntry"); - } - - return null; - } - - public static T getPrivateStaticObject(Class cls, String... names) { - for (String name : names) { - try { - Field field = cls.getDeclaredField(name); - field.setAccessible(true); - return (T) field.get(null); - } catch (NoSuchFieldException ex) { - - } catch (SecurityException ex) { - - } catch (IllegalAccessException ex) { - - } - } - - return null; - } - - public static T getPrivateObject(Object object, String... names) { - Class cls = object.getClass(); - for (String name : names) { - try { - Field field = cls.getDeclaredField(name); - field.setAccessible(true); - return (T) field.get(object); - } catch (NoSuchFieldException ex) { - - } catch (SecurityException ex) { - - } catch (IllegalAccessException ex) { - - } - } - - return null; - } - - // ####################### - // ### Private Methods ### - // ####################### - - private static Field getField(Class cls, String... names) { - for (String name : names) { - try { - Field field = cls.getDeclaredField(name); - field.setAccessible(true); - return field; - } catch (NoSuchFieldException ex) { - } catch (SecurityException ex) { - } - } - - return null; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerPlatformUtils.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerPlatformUtils.java deleted file mode 100644 index aa211fb..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/util/MineTweakerPlatformUtils.java +++ /dev/null @@ -1,46 +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.mc18.util; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; - -/** - * - * @author Stan - */ -public class MineTweakerPlatformUtils { - private MineTweakerPlatformUtils() { - } - - public static Class getLivingEntityClass(String entityClassName) { - try { - Class entityClass = Class.forName(entityClassName); - if (!EntityLivingBase.class.isAssignableFrom(entityClass)) { - throw new RuntimeException("Not an entity class: " + entityClassName); - } - return (Class) entityClass; - } catch (ClassNotFoundException ex) { - throw new RuntimeException("entity class not found: " + entityClassName); - } - } - - public static String getLanguage() { - return FMLCommonHandler.instance().getSide() == Side.SERVER ? null : FMLClientHandler.instance().getCurrentLanguage(); - } - - public static boolean isLanguageActive(String lang) { - String current = getLanguage(); - return current != null && current.equals(lang); - } - - public static boolean isClient() { - return FMLCommonHandler.instance().getSide() == Side.CLIENT; - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCLootRegistry.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCLootRegistry.java deleted file mode 100644 index 654c0fe..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/vanilla/MCLootRegistry.java +++ /dev/null @@ -1,204 +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.mc18.vanilla; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.vanilla.ILootRegistry; -import minetweaker.api.vanilla.LootEntry; -import minetweaker.mc18.util.MineTweakerHacks; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; - -/** - * - * @author Stan - */ -public class MCLootRegistry implements ILootRegistry { - private static final Map LOOT = MineTweakerHacks.getChestLoot(); - - @Override - public void addChestLoot(String type, WeightedItemStack item) { - WeightedRandomChestContent content = new WeightedRandomChestContent( - MineTweakerMC.getItemStack(item.getStack()), - 1, - 1, - (int) item.getChance()); - MineTweakerAPI.apply(new AddLootAction(type, content)); - } - - @Override - public void addChestLoot(String type, WeightedItemStack item, int min, int max) { - WeightedRandomChestContent content = new WeightedRandomChestContent( - MineTweakerMC.getItemStack(item.getStack()), - min, - max, - (int) item.getChance()); - MineTweakerAPI.apply(new AddLootAction(type, content)); - } - - @Override - public void removeChestLoot(String type, IIngredient pattern) { - MineTweakerAPI.apply(new RemoveLootAction(type, pattern)); - } - - @Override - public List getLoot(String type) { - ChestGenHooks recipe = LOOT.get(type); - List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); - - List results = new ArrayList(); - for (WeightedRandomChestContent content : contents) { - results.add(new LootEntry(new WeightedItemStack( - MineTweakerMC.getIItemStack(content.theItemId), - content.itemWeight), - content.minStackSize, - content.maxStackSize)); - } - return results; - } - - @Override - public List getLootTypes() { - Set keys = LOOT.keySet(); - List keyList = new ArrayList(); - keyList.addAll(keys); - return keyList; - } - - // ###################### - // ### Action Classes ### - // ###################### - - /** - * Ported from ModTweaker. - * - * @author JoshieJack - */ - private static class AddLootAction implements IUndoableAction { - private final String chest; - private final WeightedRandomChestContent content; - - public AddLootAction(String chest, WeightedRandomChestContent content) { - this.chest = chest; - this.content = content; - } - - @Override - public void apply() { - ChestGenHooks recipe = LOOT.get(chest); - List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); - - contents.add(content); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - ChestGenHooks recipe = LOOT.get(chest); - List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); - - contents.remove(content); - } - - public String getRecipeInfo() { - return content.theItemId.getDisplayName(); - } - - @Override - public String describe() { - return "Adding chest loot " + content.theItemId.getDisplayName() + " to loot class " + chest; - } - - @Override - public String describeUndo() { - return "Removing chest loot " + content.theItemId.getDisplayName() + " from loot class " + chest; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - /** - * Ported from ModTweaker. - * - * @author JoshieJack - */ - private static class RemoveLootAction implements IUndoableAction { - private final String chest; - private final IIngredient pattern; - private final List removed; - - public RemoveLootAction(String chest, IIngredient pattern) { - this.chest = chest; - this.pattern = pattern; - removed = new ArrayList(); - } - - @Override - public void apply() { - removed.clear(); - - ChestGenHooks recipe = LOOT.get(chest); - List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); - - for (WeightedRandomChestContent r : contents) { - if (pattern.matches(MineTweakerMC.getIItemStack(r.theItemId))) { - removed.add(r); - } - } - - for (WeightedRandomChestContent r : removed) { - contents.remove(r); - } - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - ChestGenHooks recipe = LOOT.get(chest); - List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); - - for (WeightedRandomChestContent entry : removed) { - contents.add(entry); - } - } - - @Override - public String describe() { - return "Removing chest loot " + pattern + " for loot type " + chest; - } - - @Override - public String describeUndo() { - return "Restoring chest loot " + pattern + " for loot type " + chest + " (" + removed.size() + " entries)"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } -} diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/world/MCDimension.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/world/MCDimension.java deleted file mode 100644 index e822cbb..0000000 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/world/MCDimension.java +++ /dev/null @@ -1,45 +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.mc18.world; - -import minetweaker.api.block.IBlock; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.world.IDimension; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - -/** - * - * @author Stan - */ -public class MCDimension implements IDimension { - private final World world; - - public MCDimension(World world) { - this.world = world; - } - - @Override - public boolean isDay() { - return world.isDaytime(); - } - - @Override - public int getBrightness(int x, int y, int z) { - return (int) world.getLightBrightness(new BlockPos(x, y, z)); - } - - @Override - public IDimension getDimension() { - return this; - } - - @Override - public IBlock getBlock(int x, int y, int z) { - return MineTweakerMC.getBlock(world, x, y, z); - } -} diff --git a/MineTweaker3-MC18-Main/src/main/resources/assets/minetweaker/logo.png b/MineTweaker3-MC18-Main/src/main/resources/assets/minetweaker/logo.png deleted file mode 100644 index 674382e..0000000 Binary files a/MineTweaker3-MC18-Main/src/main/resources/assets/minetweaker/logo.png and /dev/null differ diff --git a/MineTweaker3-MC18-Main/src/main/resources/mcmod.info b/MineTweaker3-MC18-Main/src/main/resources/mcmod.info deleted file mode 100644 index b4de473..0000000 --- a/MineTweaker3-MC18-Main/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ -{ - "modid": "MineTweaker3", - "name": "MineTweaker 3", - "version": "${version}", - "mcversion": "${mcversion}", - "description": "Customize your minecraft experience!", - "credits": "Created By Stan Hebben", - "logoFile": "assets/minetweaker/logo.png", - "url": "http://minetweaker3.powerofbytes.com", - "authorList": [ "Stan Hebben" ], - "parent": "", - "screenshots": [], - "dependencies": [] -} -] diff --git a/MineTweaker3-MC18-Mod-JEI/build.gradle b/MineTweaker3-MC18-Mod-JEI/build.gradle deleted file mode 100644 index 249848e..0000000 --- a/MineTweaker3-MC18-Mod-JEI/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -import minetweaker.tasks.RegisterZenClassesTask; - -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' - } -} -apply plugin: 'net.minecraftforge.gradle.forge' - -version = "1.8.9-" + ext.mineTweakerVersion -archivesBaseName = project.projectDir.name - -minecraft { - version = forgeVersion18 - runDir = "eclipse" - mappings = "stable_20" - useDepAts = true - } -repositories { - maven { - url "http://dvs1.progwml6.com/files/maven" - } -} - -dependencies { - compile project(':ZenScript') - compile project(':MineTweaker3-API') - compile project(':MineTweaker3-MC18-Main') - deobfCompile "mezz.jei:jei_1.8.9:2.14.0.67" -} - -task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') - className = 'minetweaker.mods.jei.ClassRegistry' -} - -tasks.jar.dependsOn(makeRegistry) \ No newline at end of file diff --git a/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java b/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java deleted file mode 100644 index 8b208e3..0000000 --- a/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java +++ /dev/null @@ -1,96 +0,0 @@ -package minetweaker.mods.jei; - -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; - -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; -import stanhebben.zenscript.annotations.NotNull; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - -/** - * MineTweaker JEI support. - * - * Adds support to hide Items in JEI - * - * @author Jared - */ -@ZenClass("mods.jei.JEI") -public class JEI { - /** - * Hides a specific item in NEI. Will take into account metadata values, if - * any. - * - * @param item - * item to be hidden - */ - @ZenMethod - public static void hide(@NotNull IItemStack item) { - MineTweakerAPI.apply(new JEIHideItemAction(item)); - } - - private static class JEIHideItemAction implements IUndoableAction { - private final IItemStack stack; - - public JEIHideItemAction(IItemStack stack) { - this.stack = stack; - } - - @Override - public void apply() { - JEIAddonPlugin.jeiHelpers.getItemBlacklist().addItemToBlacklist(getItemStack(stack)); - } - - @Override - public boolean canUndo() { - return true; - } - - @Override - public void undo() { - JEIAddonPlugin.jeiHelpers.getItemBlacklist().removeItemFromBlacklist(getItemStack(stack)); - } - - @Override - public String describe() { - return "Hiding " + stack + " in JEI"; - } - - @Override - public String describeUndo() { - return "Displaying " + stack + " in JEI"; - } - - @Override - public Object getOverrideKey() { - return null; - } - } - - // private static class NEIOverrideNameAction extends OneWayAction { - // private final ItemStack item; - // private final String name; - // - // public NEIOverrideNameAction(ItemStack item, String name) { - // this.item = item; - // this.name = name; - // } - // - // @Override - // public void apply() { - // API.setOverrideName(item, name); - // } - // - // @Override - // public String describe() { - // return "Overriding NEI item name of " + item.getUnlocalizedName() + " to - // " + name; - // } - // - // @Override - // public Object getOverrideKey() { - // return item; - // } - // } -} diff --git a/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java b/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java deleted file mode 100644 index b3a0c1d..0000000 --- a/MineTweaker3-MC18-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java +++ /dev/null @@ -1,50 +0,0 @@ -package minetweaker.mods.jei; - -import mezz.jei.api.IItemRegistry; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.IRecipeRegistry; -import minetweaker.MineTweakerAPI; -import net.minecraft.util.ChatComponentText; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.CommandEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@mezz.jei.api.JEIPlugin -public class JEIAddonPlugin implements IModPlugin { - - public static IJeiHelpers jeiHelpers; - public static IItemRegistry itemRegistry; - public static IRecipeRegistry recipeRegistry; - - @Override - public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { - this.jeiHelpers = jeiHelpers; - } - - @Override - public void onItemRegistryAvailable(IItemRegistry itemRegistry) { - this.itemRegistry = itemRegistry; - } - - @Override - public void register(IModRegistry registry) { - FMLCommonHandler.instance().bus().register(this); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void command(CommandEvent e) { - if (e.command.getCommandAliases().contains("mt") && e.parameters[0].equals("reload")) { - jeiHelpers.reload(); - } - } - - @Override - public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { - this.recipeRegistry = recipeRegistry; - } - -} diff --git a/build.gradle b/build.gradle index 874f880..85e6940 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import org.gradle.api.artifacts.* - apply plugin: 'base' // To add "clean" task to the root project. apply from: 'configuration.gradle' @@ -13,7 +11,7 @@ task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper subprojects.each { subproject -> evaluationDependsOn( subproject.path ) } -task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" } + projects18.collect { ':' + it + ':setupDecompWorkspace'}) {} +task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" } + projects19.collect { ':' + it + ':setupDecompWorkspace'}) {} task assembleMC1710(type: Jar, dependsOn: [\ ':ZenScript:build', @@ -29,16 +27,17 @@ task assembleMC1710(type: Jar, dependsOn: [\ } } -task assembleMC18(type: Jar, dependsOn: [\ + +task assembleMC19(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build'] - + projects18.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Customized-1.8.8-${mineTweakerVersion}.jar" + + projects19.collect { ':' + it + ":build" }) { + archiveName="CraftTweaker-Customized-1.9-${mineTweakerVersion}.jar" from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) - for (p in projects18) { + for (p in projects19) { from zipTree(project(p).jar.archivePath) } } @@ -54,15 +53,15 @@ task assembleDevBase1710(type: Jar, dependsOn: [ from project(':MineTweaker3-MC1710-Main').sourceSets.main.output } -task assembleDevBase18(type: Jar, dependsOn: [ +task assembleDevBase19(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build', - ':MineTweaker3-MC18-Main:build']) { - archiveName="CraftTweaker-Customized-Dev-1.8.8-${mineTweakerVersion}.jar" + ':MineTweaker3-MC19-Main:build']) { + archiveName="CraftTweaker-Customized-Dev-1.9-${mineTweakerVersion}.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output - from project(':MineTweaker3-MC18-Main').sourceSets.main.output + from project(':MineTweaker3-MC19-Main').sourceSets.main.output } task assembleDevFull1710(type: Jar, dependsOn: [ @@ -79,27 +78,29 @@ task assembleDevFull1710(type: Jar, dependsOn: [ } } -task assembleDevFull18(type: Jar, dependsOn: [ + + +task assembleDevFull19(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build'] - + projects18.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Customized-Dev-Full-1.8.8-${mineTweakerVersion}.jar" + + projects19.collect { ':' + it + ":build" }) { + archiveName="CraftTweaker-Customized-Dev-Full-1.9-${mineTweakerVersion}.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output - for (p in projects18) { + for (p in projects19) { from project(p).sourceSets.main.output } } task assembleAll(dependsOn: [ assembleMC1710, - assembleMC18, + assembleMC19, assembleDevBase1710, - assembleDevBase18, + assembleDevBase19, assembleDevFull1710, - assembleDevFull18]) { + assembleDevFull19]) { } diff --git a/configuration.gradle b/configuration.gradle index cc63637..c99dfd6 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -1,10 +1,12 @@ +//import javax.tools.ToolProvider // ####################### // ### Global settings ### // ####################### -ext.mineTweakerVersion = "3.0.2" +ext.mineTweakerVersion = "3.0.3" ext.mineTweakerDebug = "false" +//ext.javaToolsJar = ((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs() ext.javaToolsJar = new File("C:/Program Files/Java/jdk1.8.0_66/lib/tools.jar") // ####################### @@ -13,11 +15,11 @@ ext.javaToolsJar = new File("C:/Program Files/Java/jdk1.8.0_66/lib/tools.jar") ext.forgeVersion1710 = "1.7.10-10.13.4.1492-1.7.10" ext.projects1710 = [ - 'MineTweaker3-MC1710-Main', - 'MineTweaker3-MC1710-Mod-IC2', - 'MineTweaker3-MC1710-Mod-NEI', - 'MineTweaker3-MC1710-Mod-MFR', - 'MineTweaker3-MC1710-Mod-Buildcraft' + 'MineTweaker3-MC1710-Main' + //'MineTweaker3-MC1710-Mod-IC2', +// 'MineTweaker3-MC1710-Mod-NEI', +// 'MineTweaker3-MC1710-Mod-MFR', +// 'MineTweaker3-MC1710-Mod-Buildcraft' ] // #################### @@ -26,6 +28,16 @@ ext.projects1710 = [ ext.forgeVersion18 = "1.8.9-11.15.1.1763" ext.projects18 = [ - 'MineTweaker3-MC18-Main', - 'MineTweaker3-MC18-Mod-JEI' + //'MineTweaker3-MC18-Main', + //'MineTweaker3-MC18-Mod-JEI' +] + +// #################### +// ### 1.9 settings ### +// #################### + +ext.forgeVersion19 = "1.9-12.16.0.1863-1.9" +ext.projects19 = [ + 'MineTweaker3-MC19-Main', + 'MineTweaker3-MC19-Mod-JEI' ] \ No newline at end of file