From c54b7c40bb806b9b87750dcc0645f59fceae19b3 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 31 Dec 2014 04:22:10 -0800 Subject: [PATCH] Giant Inventory Refactor 2. Slots will only accept valid items Moved logic out of Containers, the old filtered slots were not always the same logic as the IInventory. Moved ISidedInventory logic up to TileForestry and use InventoryAdapters to override only the methods we need to. Tested a ton but there will be some new issues given the scope. --- api/forestry | 2 +- .../apiculture/GuiHandlerApiculture.java | 29 +- .../apiculture/gadgets/BlockBeehives.java | 3 +- .../apiculture/gadgets/TileAlveary.java | 38 ++- .../gadgets/TileAlvearyHygroregulator.java | 132 ++------ .../apiculture/gadgets/TileAlvearyPlain.java | 255 +++------------- .../apiculture/gadgets/TileAlvearySieve.java | 20 +- .../gadgets/TileAlvearySwarmer.java | 147 +-------- .../apiculture/gadgets/TileApiary.java | 38 +-- .../apiculture/gadgets/TileBeehouse.java | 151 +++------- .../apiculture/gadgets/TileSwarm.java | 3 +- .../apiculture/gui/ContainerAlveary.java | 28 +- .../gui/ContainerAlvearyHygroregulator.java | 11 +- .../apiculture/gui/ContainerAlvearySieve.java | 17 +- .../gui/ContainerAlvearySwarmer.java | 23 +- .../apiculture/gui/ContainerApiary.java | 37 ++- .../gui/ContainerHabitatLocator.java | 14 +- .../apiculture/gui/ContainerImprinter.java | 23 +- .../forestry/apiculture/gui/GuiBeealyzer.java | 20 +- .../apiculture/items/ItemBeealyzer.java | 32 +- .../apiculture/items/ItemBiomefinder.java | 16 +- .../apiculture/items/ItemImprinter.java | 75 +---- .../GuiHandlerArboriculture.java | 19 +- .../gui/ContainerTreealyzer.java | 32 -- .../arboriculture/gui/GuiTreealyzer.java | 24 +- .../arboriculture/items/ItemTreealyzer.java | 18 +- src/main/java/forestry/core/GuiHandler.java | 17 +- .../java/forestry/core/GuiHandlerBase.java | 9 +- .../core/circuits/ContainerSolderingIron.java | 42 +-- .../core/circuits/ItemSolderingIron.java | 37 ++- .../java/forestry/core/config/Defaults.java | 2 + .../forestry/core/fluids/FluidHelper.java | 3 +- .../forestry/core/fluids/TankManager.java | 3 + .../core/fluids/tanks/StandardTank.java | 2 +- .../forestry/core/gadgets/TileAnalyzer.java | 140 +++------ .../forestry/core/gadgets/TileEscritoire.java | 135 +++------ .../forestry/core/gadgets/TileForestry.java | 136 ++++++++- .../core/gadgets/TileNaturalistChest.java | 84 ++---- .../forestry/core/gui/ContainerAlyzer.java | 26 +- .../forestry/core/gui/ContainerAnalyzer.java | 24 +- .../core/gui/ContainerEscritoire.java | 27 +- .../forestry/core/gui/ContainerForestry.java | 6 +- .../core/gui/ContainerItemInventory.java | 30 +- .../core/gui/ContainerLiquidTanks.java | 2 +- .../gui/ContainerNaturalistInventory.java | 30 +- .../java/forestry/core/gui/GuiAlyzer.java | 24 +- .../forestry/core/gui/slots/SlotCustom.java | 138 --------- .../forestry/core/gui/slots/SlotFiltered.java | 38 +++ .../forestry/core/gui/slots/SlotForestry.java | 8 +- .../core/gui/slots/SlotItemInventory.java | 36 --- .../core/gui/slots/SlotLiquidContainer.java | 60 ---- .../forestry/core/gui/slots/SlotOutput.java | 60 ++-- .../forestry/core/gui/slots/SlotWatched.java | 66 ++++ .../IFilterSlotDelegate.java} | 52 ++-- .../core/inventory/AlyzerInventory.java | 46 +-- .../core/inventory/FakeInventoryAdapter.java | 134 +++++++++ .../core/inventory/IInventoryAdapter.java | 12 + .../forestry/core/inventory/InvTools.java | 251 ++++++++++++++++ .../core/inventory/InventoryAdapter.java | 282 ++---------------- .../core/inventory/ItemInventory.java | 69 ++--- .../core/inventory/ItemInventoryBackpack.java | 33 ++ .../core/inventory/TileInventoryAdapter.java | 20 +- .../forestry/core/network/PacketHandler.java | 4 - .../utils/GuiUtil.java} | 44 ++- .../java/forestry/core/utils/StackUtils.java | 23 +- src/main/java/forestry/core/utils/Utils.java | 49 ++- .../forestry/energy/gadgets/EngineBronze.java | 123 ++------ .../forestry/energy/gadgets/EngineCopper.java | 108 ++----- .../forestry/energy/gadgets/EngineTin.java | 92 ++---- .../energy/gadgets/MachineGenerator.java | 120 ++------ .../energy/gui/ContainerEngineBronze.java | 12 +- .../energy/gui/ContainerEngineCopper.java | 19 +- .../energy/gui/ContainerEngineTin.java | 9 +- .../energy/gui/ContainerGenerator.java | 12 +- .../factory/gadgets/MachineBottler.java | 164 ++++------ .../factory/gadgets/MachineCarpenter.java | 148 +++------ .../factory/gadgets/MachineCentrifuge.java | 100 ++----- .../factory/gadgets/MachineFabricator.java | 133 +++------ .../factory/gadgets/MachineFermenter.java | 165 ++++------ .../factory/gadgets/MachineMoistener.java | 187 ++++-------- .../factory/gadgets/MachineRaintank.java | 127 ++------ .../factory/gadgets/MachineSqueezer.java | 173 ++++------- .../factory/gadgets/MachineStill.java | 141 +++------ .../factory/gadgets/TileWorktable.java | 11 +- .../factory/gui/ContainerBottler.java | 18 +- .../factory/gui/ContainerCarpenter.java | 41 +-- .../factory/gui/ContainerCentrifuge.java | 12 +- .../factory/gui/ContainerFabricator.java | 7 +- .../factory/gui/ContainerFermenter.java | 21 +- .../factory/gui/ContainerMoistener.java | 21 +- .../factory/gui/ContainerRaintank.java | 15 +- .../factory/gui/ContainerSqueezer.java | 14 +- .../forestry/factory/gui/ContainerStill.java | 11 +- .../forestry/farming/gadgets/TileFarm.java | 7 +- .../farming/gadgets/TileFarmPlain.java | 113 ++++--- .../forestry/farming/gadgets/TileHatch.java | 173 ++--------- .../forestry/farming/gui/ContainerFarm.java | 66 +--- .../java/forestry/food/GuiHandlerFood.java | 11 +- .../forestry/food/gui/ContainerInfuser.java | 24 +- .../java/forestry/food/items/ItemInfuser.java | 81 +---- .../GuiHandlerLepidopterology.java | 19 +- .../gui/ContainerFlutterlyzer.java | 27 -- .../lepidopterology/gui/GuiFlutterlyzer.java | 3 +- .../items/ItemFlutterlyzer.java | 23 +- .../java/forestry/mail/GuiHandlerMail.java | 10 +- src/main/java/forestry/mail/Letter.java | 11 +- src/main/java/forestry/mail/POBox.java | 17 +- src/main/java/forestry/mail/PostRegistry.java | 3 + src/main/java/forestry/mail/TradeStation.java | 179 ++++++----- .../forestry/mail/gadgets/MachineMailbox.java | 6 +- .../mail/gadgets/MachinePhilatelist.java | 77 +---- .../forestry/mail/gadgets/MachineTrader.java | 130 +------- .../forestry/mail/gui/ContainerLetter.java | 43 +-- .../forestry/mail/gui/ContainerMailbox.java | 5 +- .../mail/gui/ContainerPhilatelist.java | 14 +- .../forestry/mail/gui/ContainerTrader.java | 20 +- .../java/forestry/mail/items/ItemLetter.java | 47 +-- .../forestry/storage/BackpackDefinition.java | 10 +- .../forestry/storage/GuiHandlerStorage.java | 40 ++- .../forestry/storage/ResupplyHandler.java | 3 +- .../storage/gui/ContainerBackpack.java | 40 +-- .../gui/ContainerNaturalistBackpack.java | 43 +-- .../forestry/storage/items/ItemBackpack.java | 9 +- .../storage/items/ItemNaturalistBackpack.java | 4 +- 124 files changed, 2414 insertions(+), 4259 deletions(-) delete mode 100755 src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java delete mode 100755 src/main/java/forestry/core/gui/slots/SlotCustom.java create mode 100644 src/main/java/forestry/core/gui/slots/SlotFiltered.java delete mode 100755 src/main/java/forestry/core/gui/slots/SlotItemInventory.java delete mode 100755 src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java create mode 100644 src/main/java/forestry/core/gui/slots/SlotWatched.java rename src/main/java/forestry/core/{gui/slots/SlotClosed.java => interfaces/IFilterSlotDelegate.java} (61%) mode change 100755 => 100644 create mode 100644 src/main/java/forestry/core/inventory/FakeInventoryAdapter.java create mode 100644 src/main/java/forestry/core/inventory/IInventoryAdapter.java create mode 100644 src/main/java/forestry/core/inventory/ItemInventoryBackpack.java rename src/main/java/forestry/{apiculture/gui/ContainerBeealyzer.java => core/utils/GuiUtil.java} (51%) mode change 100755 => 100644 delete mode 100755 src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java diff --git a/api/forestry b/api/forestry index 76ba9ef8a..c87f1fe97 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 76ba9ef8a474db454fdd3d5c1a187822a689d4a0 +Subproject commit c87f1fe97694408d5cfcd021a3e568ec7777ee12 diff --git a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java index fac85dfde..569932e52 100755 --- a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.apiculture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import forestry.apiculture.gadgets.TileAlvearyHygroregulator; import forestry.apiculture.gadgets.TileAlvearyPlain; import forestry.apiculture.gadgets.TileAlvearySieve; @@ -22,7 +26,6 @@ import forestry.apiculture.gui.ContainerAlvearyHygroregulator; import forestry.apiculture.gui.ContainerAlvearySieve; import forestry.apiculture.gui.ContainerAlvearySwarmer; import forestry.apiculture.gui.ContainerApiary; -import forestry.apiculture.gui.ContainerBeealyzer; import forestry.apiculture.gui.ContainerHabitatLocator; import forestry.apiculture.gui.ContainerImprinter; import forestry.apiculture.gui.GuiAlveary; @@ -37,11 +40,9 @@ import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory; import forestry.apiculture.items.ItemBiomefinder.BiomefinderInventory; import forestry.apiculture.items.ItemImprinter.ImprinterInventory; import forestry.core.GuiHandlerBase; +import forestry.core.gui.ContainerAlyzer; import forestry.core.network.GuiId; import forestry.plugins.PluginApiculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class GuiHandlerApiculture extends GuiHandlerBase { @@ -72,7 +73,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase { return new GuiApiary(player.inventory, (TileApiary) getTileForestry(world, x, y, z)); case BeealyzerGUI: - equipped = getEquippedItem(player); + equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; @@ -82,7 +83,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase { return new GuiApiary(player.inventory, (TileBeehouse) getTileForestry(world, x, y, z)); case HabitatLocatorGUI: - equipped = getEquippedItem(player); + equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; @@ -92,7 +93,10 @@ public class GuiHandlerApiculture extends GuiHandlerBase { return new GuiAlvearyHygroregulator(player.inventory, (TileAlvearyHygroregulator) getTileForestry(world, x, y, z)); case ImprinterGUI: - return new GuiImprinter(player.inventory, new ImprinterInventory(player)); + equipped = player.getCurrentEquippedItem(); + if (equipped == null) + return null; + return new GuiImprinter(player.inventory, new ImprinterInventory(player, equipped)); default: return null; @@ -129,19 +133,19 @@ public class GuiHandlerApiculture extends GuiHandlerBase { return new ContainerApiary(player.inventory, (TileApiary) getTileForestry(world, x, y, z), true); case BeealyzerGUI: - equipped = getEquippedItem(player); + equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; synchApiaristTracker(world, player); - return new ContainerBeealyzer(player.inventory, new BeealyzerInventory(player, equipped)); + return new ContainerAlyzer(new BeealyzerInventory(player, equipped), player); case BeehouseGUI: synchApiaristTracker(world, player); return new ContainerApiary(player.inventory, (TileBeehouse) getTileForestry(world, x, y, z), false); case HabitatLocatorGUI: - equipped = getEquippedItem(player); + equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; @@ -152,7 +156,10 @@ public class GuiHandlerApiculture extends GuiHandlerBase { case ImprinterGUI: synchApiaristTracker(world, player); - return new ContainerImprinter(player.inventory, new ImprinterInventory(player)); + equipped = player.getCurrentEquippedItem(); + if (equipped == null) + return null; + return new ContainerImprinter(player.inventory, new ImprinterInventory(player, equipped)); default: return null; diff --git a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java index 4eaccd7c5..c40cd2514 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java @@ -17,6 +17,7 @@ import forestry.api.apiculture.hives.HiveManager; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; import forestry.core.config.Config; +import forestry.core.inventory.InvTools; import forestry.core.render.TextureManager; import forestry.core.utils.StackUtils; import java.util.ArrayList; @@ -63,7 +64,7 @@ public class BlockBeehives extends BlockContainer { if (tile instanceof TileSwarm) { TileSwarm swarm = (TileSwarm) tile; if (swarm.containsBees()) - for (ItemStack beeStack : swarm.contained.getStacks()) + for (ItemStack beeStack : InvTools.getStacks(swarm.contained)) if (beeStack != null) StackUtils.dropItemStackAsEntity(beeStack, world, x, y, z); } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java index 8985493cf..a44705bc8 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java @@ -10,8 +10,16 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import buildcraft.api.statements.ITriggerExternal; +import java.util.Collection; +import java.util.LinkedList; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.common.util.ForgeDirection; + import cpw.mods.fml.common.Optional; + import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -21,15 +29,13 @@ import forestry.apiculture.trigger.ApicultureTriggers; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.gadgets.TileForestry; +import forestry.core.inventory.FakeInventoryAdapter; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; -import java.util.Collection; -import java.util.LinkedList; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.statements.ITriggerExternal; public abstract class TileAlveary extends TileForestry implements IAlvearyComponent { @@ -117,12 +123,16 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon } @Override - public void fromPacketPayload(PacketPayload payload) { + public PacketPayload getPacketPayload() { + PacketPayload payload = new PacketPayload(0, 1); + payload.shortPayload[0] = (short) (isMaster() ? 1 : 0); + return payload; } @Override - public PacketPayload getPacketPayload() { - return null; + public void fromPacketPayload(PacketPayload payload) { + if (payload.shortPayload[0] > 0) + makeMaster(); } /* ITILESTRUCTURE */ @@ -141,7 +151,7 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon setCentralTE(null); isMaster = true; - if (getInternalInventory() == null) + if (getInternalInventory() instanceof FakeInventoryAdapter) createInventory(); } @@ -208,12 +218,12 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon } @Override - public final IInventory getInventory() { + public final IInventoryAdapter getInventory() { return getStructureInventory(); } @Override - public ISidedInventory getStructureInventory() { + public IInventoryAdapter getStructureInventory() { return getInternalInventory(); } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 23e76f592..5a0c8d5bf 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -10,6 +10,18 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ForestryAPI; import forestry.core.config.Defaults; @@ -18,20 +30,9 @@ import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; -import forestry.core.proxy.Proxies; -import forestry.core.utils.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankContainer { @@ -54,6 +55,8 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory } } + public static final short SLOT_INPUT = 0; + private final HygroregulatorRecipe[] recipes; /* MEMBERS */ @@ -66,7 +69,16 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory public TileAlvearyHygroregulator() { super(BLOCK_META); - setInternalInventory(new TileInventoryAdapter(this, 1, "CanInv")); + setInternalInventory(new TileInventoryAdapter(this, 1, "CanInv") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_INPUT) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return liquidTank.accepts(fluid); + } + return false; + } + }); Fluid water = Fluids.WATER.getFluid(); Fluid lava = Fluids.LAVA.getFluid(); @@ -85,11 +97,6 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory player.openGui(ForestryAPI.instance, GuiId.HygroregulatorGUI.ordinal(), worldObj, xCoord, yCoord, zCoord); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - /* UPDATING */ private HygroregulatorRecipe getRecipe(FluidStack liquid) { HygroregulatorRecipe recipe = null; @@ -131,7 +138,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory if (worldObj.getTotalWorldTime() % 20 * 10 != 0) return; - TileInventoryAdapter canInventory = getInternalInventory(); + IInventoryAdapter canInventory = getInternalInventory(); // Check if we have suitable items waiting in the item slot if (canInventory.getStackInSlot(0) != null) @@ -178,93 +185,6 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory return BlockAlveary.ALVEARY_HYGRO; } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - if (getInternalInventory() != null) - return getInternalInventory().getSizeInventory(); - else - return 0; - } - - @Override - public ItemStack getStackInSlot(int slotIndex) { - if (getInternalInventory() != null) - return getInternalInventory().getStackInSlot(slotIndex); - else - return null; - } - - @Override - public ItemStack decrStackSize(int slotIndex, int amount) { - if (getInternalInventory() != null) - return getInternalInventory().decrStackSize(slotIndex, amount); - else - return null; - } - - @Override - public ItemStack getStackInSlotOnClosing(int slotIndex) { - if (getInternalInventory() != null) - return getInternalInventory().getStackInSlotOnClosing(slotIndex); - else - return null; - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { - // Client side handling for container synch - if (getInternalInventory() == null && !Proxies.common.isSimulating(worldObj)) - createInventory(); - - if (getInternalInventory() != null) - getInternalInventory().setInventorySlotContents(slotIndex, itemstack); - } - - @Override - public int getInventoryStackLimit() { - if (getInternalInventory() != null) - return getInternalInventory().getInventoryStackLimit(); - else - return 0; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - IInventory inv = getInternalInventory(); - if (inv != null) - return inv.isUseableByPlayer(player); - return Utils.isUseableByPlayer(player, this); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == 0) { - FluidStack fluid = FluidHelper.getFluidStackInContainer(itemstack); - if (fluid == null || fluid.amount <= 0) - return false; - return liquidTank.accepts(fluid.getFluid()); - } - - return false; - } - /* ILIQUIDTANKCONTAINER */ @Override public TankManager getTankManager() { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 74d256b1b..2069e4ec1 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -10,7 +10,20 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import java.util.LinkedHashSet; +import java.util.Set; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -31,6 +44,8 @@ import forestry.core.config.Defaults; import forestry.core.interfaces.IClimatised; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; @@ -38,16 +53,6 @@ import forestry.core.network.PacketInventoryStack; import forestry.core.proxy.Proxies; import forestry.core.utils.Utils; import forestry.plugins.PluginApiculture; -import java.util.LinkedHashSet; -import java.util.Set; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IBeeHousing, IClimatised, IHintSource { @@ -239,7 +244,21 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB /* STRUCTURE MANAGMENT */ @Override protected void createInventory() { - setInternalInventory(new TileInventoryAdapter(this, 9, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 9, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_QUEEN) { + return PluginApiculture.beeInterface.isMember(itemStack) && !PluginApiculture.beeInterface.isDrone(itemStack); + } else if (slotIndex == SLOT_DRONE) { + return PluginApiculture.beeInterface.isDrone(itemStack); + } + return false; + } + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex != SLOT_QUEEN && slotIndex != SLOT_DRONE; + } + }); } @Override @@ -427,11 +446,11 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB @Override public boolean addProduct(ItemStack product, boolean all) { - TileInventoryAdapter inventory = getStructureInventory(); + IInventoryAdapter inventory = getStructureInventory(); if (inventory == null) return false; - return inventory.tryAddStack(product, SLOT_PRODUCT_1, inventory.getSizeInventory() - SLOT_PRODUCT_1, all); + return InvTools.tryAddStack(inventory, product, SLOT_PRODUCT_1, inventory.getSizeInventory() - SLOT_PRODUCT_1, all); } @Override @@ -527,214 +546,18 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IB /* IINVENTORY */ @Override - public TileInventoryAdapter getStructureInventory() { - TileInventoryAdapter inventory = getInternalInventory(); - if (inventory != null) { - if (isMaster() || !Proxies.common.isSimulating(worldObj)) - return inventory; + public IInventoryAdapter getInternalInventory() { + IInventoryAdapter inventory = super.getInternalInventory(); + if (isMaster()) { + return inventory; } else if (hasMaster()) { ITileStructure central = getCentralTE(); - if (central != null) - return (TileInventoryAdapter) central.getInventory(); + if (central instanceof TileAlveary) + return ((TileAlveary) central).getInternalInventory(); } - return null; + return inventory; } - @Override - public int getSizeInventory() { - IInventory inv = getStructureInventory(); - if (inv == null) - return 0; - - return inv.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slotIndex) { - IInventory inv = getStructureInventory(); - if (inv == null) - return null; - - return inv.getStackInSlot(slotIndex); - } - - @Override - public ItemStack decrStackSize(int slotIndex, int amount) { - IInventory inv = getStructureInventory(); - if (inv == null) - return null; - - return inv.decrStackSize(slotIndex, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slotIndex) { - IInventory inv = getStructureInventory(); - if (inv == null) - return null; - - return inv.getStackInSlotOnClosing(slotIndex); - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { - IInventory inv = getStructureInventory(); - - // Client side handling for container synch - if (inv == null && !Proxies.common.isSimulating(worldObj)) { - createInventory(); - inv = getInternalInventory(); - } - if (inv != null) - inv.setInventorySlotContents(slotIndex, itemstack); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public int getInventoryStackLimit() { - IInventory inv = getStructureInventory(); - if (inv == null) - return 0; - - return inv.getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - IInventory inv = getStructureInventory(); - if (inv != null) - return inv.isUseableByPlayer(player); - return Utils.isUseableByPlayer(player, this); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - ISidedInventory inventory = getStructureInventory(); - if (inventory == null) - return false; - - if (!inventory.isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_QUEEN && PluginApiculture.beeInterface.isMember(itemstack) - && !PluginApiculture.beeInterface.isDrone(itemstack)) - return true; - return slotIndex == SLOT_DRONE && PluginApiculture.beeInterface.isDrone(itemstack); - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - ISidedInventory inventory = getStructureInventory(); - if (inventory == null) - return false; - if (!inventory.canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex != SLOT_QUEEN && slotIndex != SLOT_DRONE; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - ISidedInventory inventory = getStructureInventory(); - if (inventory == null) - return Defaults.FACINGS_NONE; - return inventory.getAccessibleSlotsFromSide(side); - } - - /* ISPECIALINVENTORY */ -// @Override -// public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) { -// -// IInventory inv = getStructureInventory(); -// if (inv == null) -// return 0; -// -// // Princesses && Queens -// if (ForestryItem.beePrincessGE.isItemEqual(stack) || ForestryItem.beeQueenGE.isItemEqual(stack)) -// if (inv.getStackInSlot(SLOT_QUEEN) == null) { -// if (doAdd) { -// inv.setInventorySlotContents(SLOT_QUEEN, stack.copy()); -// inv.getStackInSlot(SLOT_QUEEN).stackSize = 1; -// } -// return 1; -// } -// -// // Drones -// if (ForestryItem.beeDroneGE.isItemEqual(stack)) { -// -// ItemStack droneStack = inv.getStackInSlot(SLOT_DRONE); -// if (droneStack == null) { -// if (doAdd) -// inv.setInventorySlotContents(SLOT_DRONE, stack.copy()); -// return stack.stackSize; -// } else { -// if (!droneStack.isItemEqual(stack)) -// return 0; -// if (!ItemStack.areItemStackTagsEqual(droneStack, stack)) -// return 0; -// int space = droneStack.getMaxStackSize() - droneStack.stackSize; -// if (space <= 0) -// return 0; -// -// int added = space > stack.stackSize ? stack.stackSize : space; -// if (doAdd) -// droneStack.stackSize += added; -// return added; -// } -// } -// -// return 0; -// } -// -// @Override -// public ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount) { -// -// IInventory inv = getStructureInventory(); -// if (inv == null) -// return new ItemStack[0]; -// -// ItemStack product = null; -// -// for (int i = SLOT_PRODUCT_1; i < inv.getSizeInventory(); i++) { -// if (inv.getStackInSlot(i) == null) -// continue; -// -// ItemStack stack = inv.getStackInSlot(i); -// -// if (doRemove) -// product = inv.decrStackSize(i, 1); -// else { -// product = stack.copy(); -// product.stackSize = 1; -// } -// break; -// } -// -// return new ItemStack[]{product}; -// } - /* SMP GUI */ public void getGUINetworkData(int i, int j) { switch (i) { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java index 8987def65..c42a9f247 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java @@ -20,9 +20,12 @@ import forestry.api.arboriculture.EnumGermlingType; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; +import forestry.core.config.ForestryItem; import forestry.core.interfaces.ICrafter; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; +import forestry.core.utils.StackUtils; public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListener { @@ -35,7 +38,12 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe public TileAlvearySieve() { super(BLOCK_META); - setInternalInventory(new TileInventoryAdapter(this, 5, "Items", 1)); + setInternalInventory(new TileInventoryAdapter(this, 5, "Items", 1) { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return StackUtils.isIdenticalItem(ForestryItem.craftingMaterial.getItemStack(1, 3), itemStack); + } + }); } @Override @@ -80,19 +88,19 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe } private void destroySieve() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); inventory.setInventorySlotContents(SLOT_SIEVE, null); } private void destroyPollen() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for(int i = SLOT_POLLEN_1; i < SLOT_POLLEN_1 + SLOTS_POLLEN_COUNT; i++) { inventory.setInventorySlotContents(i, null); } } private boolean canStorePollen() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if(inventory.getStackInSlot(SLOT_SIEVE) == null) return false; @@ -105,7 +113,7 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe } private void storePollenStack(ItemStack itemstack) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for(int i = SLOT_POLLEN_1; i < SLOT_POLLEN_1 + SLOTS_POLLEN_COUNT; i++) { if(inventory.getStackInSlot(i) == null) { inventory.setInventorySlotContents(i, itemstack); @@ -122,7 +130,7 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe @Override public ItemStack takenFromSlot(int slotIndex, boolean consumeRecipe, EntityPlayer player) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if(slotIndex == SLOT_SIEVE) { destroyPollen(); return inventory.getStackInSlot(SLOT_SIEVE); diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index 7e68b4c09..e73518279 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -10,6 +10,15 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import java.util.Map.Entry; +import java.util.Stack; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlvearyComponent; @@ -18,25 +27,13 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.core.ForestryAPI; import forestry.apiculture.worldgen.HiveDecorator; import forestry.apiculture.worldgen.HiveSwarmer; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryItem; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; -import forestry.core.proxy.Proxies; import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; import forestry.plugins.PluginApiculture; -import java.util.Map.Entry; -import java.util.Stack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory { @@ -48,13 +45,12 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory { public TileAlvearySwarmer() { super(BLOCK_META); - } - - @Override - public void initialize() { - super.initialize(); - if (getInternalInventory() == null) - createInventory(); + setInternalInventory(new TileInventoryAdapter(this, 4, "SwarmInv") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return StackUtils.containsItemStack(BeeManager.inducers.keySet(), itemStack); + } + }); } @Override @@ -184,8 +180,6 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory { /* SAVING & LOADING */ @Override public void readFromNBT(NBTTagCompound nbttagcompound) { - if (getInternalInventory() == null) - createInventory(); super.readFromNBT(nbttagcompound); NBTTagList nbttaglist = nbttagcompound.getTagList("PendingSpawns", 10); @@ -213,115 +207,4 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory { nbttagcompound.setTag("PendingSpawns", nbttaglist); } - - @Override - protected void createInventory() { - setInternalInventory(new TileInventoryAdapter(this, 4, "SwarmInv")); - } - - /* IINVENTORY */ - @Override - public int getSizeInventory() { - if (getInternalInventory() != null) - return getInternalInventory().getSizeInventory(); - else - return 0; - } - - @Override - public ItemStack getStackInSlot(int slotIndex) { - if (getInternalInventory() != null) - return getInternalInventory().getStackInSlot(slotIndex); - else - return null; - } - - @Override - public ItemStack decrStackSize(int slotIndex, int amount) { - if (getInternalInventory() != null) - return getInternalInventory().decrStackSize(slotIndex, amount); - else - return null; - } - - @Override - public ItemStack getStackInSlotOnClosing(int slotIndex) { - if (getInternalInventory() != null) - return getInternalInventory().getStackInSlotOnClosing(slotIndex); - else - return null; - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { - // Client side handling for container synch - if (getInternalInventory() == null && !Proxies.common.isSimulating(worldObj)) - createInventory(); - - if (getInternalInventory() != null) - getInternalInventory().setInventorySlotContents(slotIndex, itemstack); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public int getInventoryStackLimit() { - if (getInternalInventory() != null) - return getInternalInventory().getInventoryStackLimit(); - else - return 0; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - IInventory inv = getInternalInventory(); - if (inv != null) - return inv.isUseableByPlayer(player); - return Utils.isUseableByPlayer(player, this); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack stack) { - if (getInternalInventory() != null) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, stack)) - return false; - return StackUtils.isIdenticalItem(stack, ForestryItem.royalJelly.getItemStack()); - } - return false; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - if (getInternalInventory() != null) - return getInternalInventory().getAccessibleSlotsFromSide(side); - return Defaults.FACINGS_NONE; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, int side) { - if (getInternalInventory() != null) - return getInternalInventory().isItemValidForSlot(slot, stack); - return false; - } - - @Override - public boolean canExtractItem(int slot, ItemStack stack, int side) { - return false; - } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index c3cb94abb..7353a46c5 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -10,27 +10,31 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import buildcraft.api.statements.ITriggerExternal; +import java.util.Collection; +import java.util.LinkedList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.common.util.ForgeDirection; + import cpw.mods.fml.common.Optional; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IHiveFrame; import forestry.api.core.ForestryAPI; import forestry.apiculture.trigger.ApicultureTriggers; import forestry.core.gadgets.TileBase; -import forestry.core.inventory.TileInventoryAdapter; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.GuiId; import forestry.plugins.PluginApiculture; -import java.util.Collection; -import java.util.LinkedList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.statements.ITriggerExternal; public class TileApiary extends TileBeehouse { - @Override - public String getInventoryName() { - return getUnlocalizedName(); + public TileApiary() { + setInternalInventory(new BeehouseInventoryAdapter(this, 12, "Items")); } @Override @@ -41,7 +45,7 @@ public class TileApiary extends TileBeehouse { /* IBEEHOUSING */ @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); float mod = 1.0f; for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { if (inventory.getStackInSlot(i) == null) @@ -54,7 +58,7 @@ public class TileApiary extends TileBeehouse { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); float mod = 0.1f; for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { if (inventory.getStackInSlot(i) == null) @@ -67,7 +71,7 @@ public class TileApiary extends TileBeehouse { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); float mod = 1.0f; for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { if (inventory.getStackInSlot(i) == null) @@ -80,7 +84,7 @@ public class TileApiary extends TileBeehouse { @Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); float mod = 1.0f; for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { if (inventory.getStackInSlot(i) == null) @@ -93,7 +97,7 @@ public class TileApiary extends TileBeehouse { @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); float mod = 1f; for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { if (inventory.getStackInSlot(i) == null) @@ -106,7 +110,7 @@ public class TileApiary extends TileBeehouse { @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); float mod = 1f; for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { if (inventory.getStackInSlot(i) == null) @@ -119,7 +123,7 @@ public class TileApiary extends TileBeehouse { @Override public void wearOutEquipment(int amount) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); int wear = Math.round(amount * PluginApiculture.beeInterface.getBeekeepingMode(worldObj).getWearModifier()); for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index 59dc13288..2586566dc 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -10,11 +10,21 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.apiculture.IHiveFrame; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; @@ -23,36 +33,53 @@ import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.gadgets.TileBase; +import forestry.core.gadgets.TileForestry; import forestry.core.interfaces.IClimatised; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketIds; import forestry.core.network.PacketInventoryStack; import forestry.core.network.PacketTileUpdate; import forestry.core.proxy.Proxies; +import forestry.core.utils.GuiUtil; import forestry.core.utils.Utils; import forestry.plugins.PluginApiculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, ISidedInventory { +public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { + + protected static class BeehouseInventoryAdapter extends TileInventoryAdapter { + public BeehouseInventoryAdapter(TileForestry tile, int size, String name) { + super(tile, size, name); + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_QUEEN) { + return PluginApiculture.beeInterface.isMember(itemStack) && !PluginApiculture.beeInterface.isDrone(itemStack); + } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) { + return itemStack.getItem() instanceof IHiveFrame; + } else if (slotIndex == SLOT_DRONE) { + return PluginApiculture.beeInterface.isDrone(itemStack); + } + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return GuiUtil.isIndexInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); + } + } // CONSTANTS public static final int SLOT_QUEEN = 0; public static final int SLOT_DRONE = 1; - public static final int SLOT_INVENTORY_1 = 2; public static final int SLOT_PRODUCT_1 = 2; public static final int SLOT_PRODUCT_COUNT = 7; public static final int SLOT_FRAMES_1 = 9; public static final int SLOT_FRAMES_2 = 10; public static final int SLOT_FRAMES_3 = 11; - public static final int SLOT_INVENTORY_COUNT = 7; public static final int SLOT_FRAMES_COUNT = 3; private final IBeekeepingLogic logic; private BiomeGenBase biome; @@ -62,7 +89,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, public TileBeehouse() { setHints(Config.hints.get("apiary")); logic = PluginApiculture.beeInterface.createBeekeepingLogic(this); - setInternalInventory(new TileInventoryAdapter(this, 12, "Items")); + setInternalInventory(new BeehouseInventoryAdapter(this, 12, "Items").disableAutomation()); } @Override @@ -178,7 +205,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, @Override public boolean addProduct(ItemStack product, boolean all) { - return getInternalInventory().tryAddStack(product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true); + return InvTools.tryAddStack(getInternalInventory(), product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true); } /* NETWORK SYNCH */ @@ -194,7 +221,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, /* STATE INFORMATION */ private int getHealthDisplay() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_QUEEN) == null) return 0; @@ -207,7 +234,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, } private int getMaxHealthDisplay() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_QUEEN) == null) return 0; @@ -272,99 +299,6 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, iCrafting.sendProgressBarUpdate(container, 1, logic.getTotalBreedingTime()); } - /* INVENTORY MANAGMENT */ - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack decrStackSize(int slotIndex, int amount) { - return getInternalInventory().decrStackSize(slotIndex, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slotIndex) { - return getInternalInventory().getStackInSlotOnClosing(slotIndex); - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack stack) { - getInternalInventory().setInventorySlotContents(slotIndex, stack); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_QUEEN && PluginApiculture.beeInterface.isMember(itemstack) - && !PluginApiculture.beeInterface.isDrone(itemstack)) - return true; - - return slotIndex == SLOT_DRONE && PluginApiculture.beeInterface.isDrone(itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(side, itemstack, side)) - return false; - - switch (slotIndex) { - case SLOT_QUEEN: - case SLOT_DRONE: - case SLOT_FRAMES_1: - case SLOT_FRAMES_2: - case SLOT_FRAMES_3: - return false; - default: - return true; - } - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack stack, int side) { - return isItemValidForSlot(slotIndex, stack); - } - // / IBEEHOUSING @Override public int getXCoord() { @@ -508,5 +442,4 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, public GameProfile getOwnerName() { return this.getOwnerProfile(); } - } diff --git a/src/main/java/forestry/apiculture/gadgets/TileSwarm.java b/src/main/java/forestry/apiculture/gadgets/TileSwarm.java index 7218eae58..e0bb93925 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileSwarm.java +++ b/src/main/java/forestry/apiculture/gadgets/TileSwarm.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.gadgets; +import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -26,7 +27,7 @@ public class TileSwarm extends TileEntity { public TileSwarm setContained(ItemStack[] bees) { for (ItemStack itemstack : bees) - contained.addStack(itemstack, false, true); + InvTools.addStack(contained, itemstack, false, true); return this; } diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java index 3b54fba52..55d80f31d 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java @@ -10,15 +10,15 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.apiculture.gadgets.TileAlvearyPlain; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotCustom; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import forestry.apiculture.gadgets.TileAlvearyPlain; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; + public class ContainerAlveary extends ContainerForestry { private final TileAlvearyPlain tile; @@ -30,19 +30,19 @@ public class ContainerAlveary extends ContainerForestry { tile.sendNetworkUpdate(); // Queen/Princess - this.addSlotToContainer(new SlotCustom(tile, TileAlvearyPlain.SLOT_QUEEN, 29, 39, ForestryItem.beePrincessGE, ForestryItem.beeQueenGE)); + this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyPlain.SLOT_QUEEN, 29, 39)); // Drone - this.addSlotToContainer(new SlotCustom(tile, TileAlvearyPlain.SLOT_DRONE, 29, 65, ForestryItem.beeDroneGE)); + this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyPlain.SLOT_DRONE, 29, 65)); // Product Inventory - this.addSlotToContainer(new SlotClosed(tile, 2, 116, 52)); - this.addSlotToContainer(new SlotClosed(tile, 3, 137, 39)); - this.addSlotToContainer(new SlotClosed(tile, 4, 137, 65)); - this.addSlotToContainer(new SlotClosed(tile, 5, 116, 78)); - this.addSlotToContainer(new SlotClosed(tile, 6, 95, 65)); - this.addSlotToContainer(new SlotClosed(tile, 7, 95, 39)); - this.addSlotToContainer(new SlotClosed(tile, 8, 116, 26)); + this.addSlotToContainer(new SlotOutput(tile, 2, 116, 52)); + this.addSlotToContainer(new SlotOutput(tile, 3, 137, 39)); + this.addSlotToContainer(new SlotOutput(tile, 4, 137, 65)); + this.addSlotToContainer(new SlotOutput(tile, 5, 116, 78)); + this.addSlotToContainer(new SlotOutput(tile, 6, 95, 65)); + this.addSlotToContainer(new SlotOutput(tile, 7, 95, 39)); + this.addSlotToContainer(new SlotOutput(tile, 8, 116, 26)); // Player inventory for (int i = 0; i < 3; i++) diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java index 0cf557808..3359f0913 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java @@ -10,18 +10,19 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.apiculture.gadgets.TileAlvearyHygroregulator; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotLiquidContainer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; +import forestry.apiculture.gadgets.TileAlvearyHygroregulator; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; + public class ContainerAlvearyHygroregulator extends ContainerLiquidTanks { public ContainerAlvearyHygroregulator(IInventory playerInventory, TileAlvearyHygroregulator tile) { - super(playerInventory, tile); + super(tile); - this.addSlotToContainer(new SlotLiquidContainer(tile, 0, 56, 38)); + this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyHygroregulator.SLOT_INPUT, 56, 38)); for (int i = 0; i < 3; ++i) for (int var4 = 0; var4 < 9; ++var4) diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java index 9f2432e73..a1f3bd127 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java @@ -11,27 +11,24 @@ package forestry.apiculture.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import forestry.apiculture.gadgets.TileAlvearySieve; -import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; public class ContainerAlvearySieve extends ContainerForestry { public ContainerAlvearySieve(InventoryPlayer player, TileAlvearySieve tile) { super(tile); - IInventory inventory = tile.getInternalInventory(); + addSlotToContainer(new SlotOutput(tile, 0, 94, 52).setCrafter(tile)); + addSlotToContainer(new SlotOutput(tile, 1, 115, 39).setCrafter(tile)); + addSlotToContainer(new SlotOutput(tile, 2, 73, 39).setCrafter(tile)); + addSlotToContainer(new SlotOutput(tile, 3, 94, 26).setCrafter(tile)); - addSlotToContainer(new SlotCustom(inventory, 0, 94, 52).setCrafter(tile)); - addSlotToContainer(new SlotCustom(inventory, 1, 115, 39).setCrafter(tile)); - addSlotToContainer(new SlotCustom(inventory, 2, 73, 39).setCrafter(tile)); - addSlotToContainer(new SlotCustom(inventory, 3, 94, 26).setCrafter(tile)); - - addSlotToContainer(new SlotCustom(inventory, TileAlvearySieve.SLOT_SIEVE, 43, 39, ForestryItem.craftingMaterial.getItemStack(1, 3)).setCrafter(tile)); + addSlotToContainer(new SlotFiltered(tile, TileAlvearySieve.SLOT_SIEVE, 43, 39).setCrafter(tile)); // Player inventory for (int i = 0; i < 3; i++) { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java index fcd304f79..a2093fb6f 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java @@ -10,24 +10,22 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.api.apiculture.BeeManager; -import forestry.apiculture.gadgets.TileAlvearySwarmer; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotCustom; -import java.util.Set; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; + +import forestry.apiculture.gadgets.TileAlvearySwarmer; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; public class ContainerAlvearySwarmer extends ContainerForestry { public ContainerAlvearySwarmer(InventoryPlayer player, TileAlvearySwarmer tile) { super(tile); - this.addSlotToContainer(new SlotCustom(tile, 0, 79, 52, getInducerItems())); - this.addSlotToContainer(new SlotCustom(tile, 1, 100, 39, getInducerItems())); - this.addSlotToContainer(new SlotCustom(tile, 2, 58, 39, getInducerItems())); - this.addSlotToContainer(new SlotCustom(tile, 3, 79, 26, getInducerItems())); + this.addSlotToContainer(new SlotFiltered(tile, 0, 79, 52)); + this.addSlotToContainer(new SlotFiltered(tile, 1, 100, 39)); + this.addSlotToContainer(new SlotFiltered(tile, 2, 58, 39)); + this.addSlotToContainer(new SlotFiltered(tile, 3, 79, 26)); // Player inventory for (int i = 0; i < 3; i++) @@ -38,9 +36,4 @@ public class ContainerAlvearySwarmer extends ContainerForestry { addSlotToContainer(new Slot(player, i, 8 + i * 18, 145)); } - - private Object[] getInducerItems() { - Set inducers = BeeManager.inducers.keySet(); - return inducers.toArray(new Object[inducers.size()]); - } } diff --git a/src/main/java/forestry/apiculture/gui/ContainerApiary.java b/src/main/java/forestry/apiculture/gui/ContainerApiary.java index a35dd2d5f..9506d28a5 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerApiary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerApiary.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.api.apiculture.IHiveFrame; -import forestry.apiculture.gadgets.TileBeehouse; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotCustom; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; +import forestry.apiculture.gadgets.TileBeehouse; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; + public class ContainerApiary extends ContainerForestry { private final TileBeehouse tile; @@ -30,29 +28,28 @@ public class ContainerApiary extends ContainerForestry { this.tile = tile; tile.sendNetworkUpdate(); - IInventory inv = tile.getInternalInventory(); // Queen/Princess - this.addSlotToContainer(new SlotCustom(inv, TileBeehouse.SLOT_QUEEN, 29, 39, ForestryItem.beePrincessGE, ForestryItem.beeQueenGE)); + this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_QUEEN, 29, 39)); // Drone - this.addSlotToContainer(new SlotCustom(inv, TileBeehouse.SLOT_DRONE, 29, 65, ForestryItem.beeDroneGE)); + this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_DRONE, 29, 65)); // Frames if (hasFrames) { - this.addSlotToContainer(new SlotCustom(inv, TileBeehouse.SLOT_FRAMES_1, 66, 23, IHiveFrame.class)); - this.addSlotToContainer(new SlotCustom(inv, TileBeehouse.SLOT_FRAMES_1 + 1, 66, 52, IHiveFrame.class)); - this.addSlotToContainer(new SlotCustom(inv, TileBeehouse.SLOT_FRAMES_1 + 2, 66, 81, IHiveFrame.class)); + this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_FRAMES_1, 66, 23)); + this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_FRAMES_1 + 1, 66, 52)); + this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_FRAMES_1 + 2, 66, 81)); } // Product Inventory - this.addSlotToContainer(new SlotClosed(inv, 2, 116, 52)); - this.addSlotToContainer(new SlotClosed(inv, 3, 137, 39)); - this.addSlotToContainer(new SlotClosed(inv, 4, 137, 65)); - this.addSlotToContainer(new SlotClosed(inv, 5, 116, 78)); - this.addSlotToContainer(new SlotClosed(inv, 6, 95, 65)); - this.addSlotToContainer(new SlotClosed(inv, 7, 95, 39)); - this.addSlotToContainer(new SlotClosed(inv, 8, 116, 26)); + this.addSlotToContainer(new SlotOutput(tile, 2, 116, 52)); + this.addSlotToContainer(new SlotOutput(tile, 3, 137, 39)); + this.addSlotToContainer(new SlotOutput(tile, 4, 137, 65)); + this.addSlotToContainer(new SlotOutput(tile, 5, 116, 78)); + this.addSlotToContainer(new SlotOutput(tile, 6, 95, 65)); + this.addSlotToContainer(new SlotOutput(tile, 7, 95, 39)); + this.addSlotToContainer(new SlotOutput(tile, 8, 116, 26)); // Player inventory for (int i1 = 0; i1 < 3; i1++) { diff --git a/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java index 2123148ad..6772a9fa6 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBiomefinder; import forestry.apiculture.items.ItemBiomefinder.BiomefinderInventory; import forestry.core.config.ForestryItem; import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.proxy.Proxies; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -31,12 +30,12 @@ public class ContainerHabitatLocator extends ContainerItemInventory { this.inventory = inventory; // Energy - this.addSlotToContainer(new SlotCustom(inventory, 2, 152, 8, ForestryItem.honeydew, ForestryItem.honeyDrop)); + this.addSlotToContainer(new SlotFiltered(inventory, 2, 152, 8)); // Bee to analyze - this.addSlotToContainer(new SlotCustom(inventory, 0, 152, 32, ItemBeeGE.class)); + this.addSlotToContainer(new SlotFiltered(inventory, 0, 152, 32)); // Analyzed bee - this.addSlotToContainer(new SlotCustom(inventory, 1, 152, 75, ItemBeeGE.class)); + this.addSlotToContainer(new SlotFiltered(inventory, 1, 152, 75)); // Player inventory for (int i1 = 0; i1 < 3; i1++) @@ -68,9 +67,4 @@ public class ContainerHabitatLocator extends ContainerItemInventory { } - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return false; - } - } diff --git a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java index 44313e457..e7e14ac26 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java +++ b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java @@ -10,21 +10,22 @@ ******************************************************************************/ package forestry.apiculture.gui; -import forestry.apiculture.items.ItemBeeGE; -import forestry.apiculture.items.ItemImprinter.ImprinterInventory; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.IGuiSelectable; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.network.PacketIds; -import forestry.core.network.PacketPayload; -import forestry.core.network.PacketUpdate; -import forestry.core.proxy.Proxies; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.apiculture.items.ItemImprinter.ImprinterInventory; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.IGuiSelectable; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.core.network.PacketIds; +import forestry.core.network.PacketPayload; +import forestry.core.network.PacketUpdate; +import forestry.core.proxy.Proxies; + public class ContainerImprinter extends ContainerForestry implements IGuiSelectable { public final ImprinterInventory inventory; @@ -35,9 +36,9 @@ public class ContainerImprinter extends ContainerForestry implements IGuiSelecta this.inventory = inventory; // Input - this.addSlotToContainer(new SlotCustom(inventory, 0, 152, 12, ItemBeeGE.class)); + this.addSlotToContainer(new SlotFiltered(inventory, 0, 152, 12)); // Output - this.addSlotToContainer(new SlotCustom(inventory, 1, 152, 72, ItemBeeGE.class)); + this.addSlotToContainer(new SlotOutput(inventory, 1, 152, 72)); // Player inventory for (int i1 = 0; i1 < 3; i1++) diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 8f2babe5c..35efd1f78 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -10,36 +10,33 @@ ******************************************************************************/ package forestry.apiculture.gui; +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleArea; -import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IChromosome; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory; import forestry.core.config.ForestryItem; -import forestry.core.genetics.AlleleArea; import forestry.core.genetics.AlleleBoolean; -import forestry.core.genetics.Chromosome; -import forestry.core.genetics.Genome; +import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.utils.StringUtil; import forestry.core.vect.Vect; import forestry.plugins.PluginApiculture; -import java.util.ArrayList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class GuiBeealyzer extends GuiAlyzer { public GuiBeealyzer(EntityPlayer player, BeealyzerInventory inventory) { - super("rootBees", player, new ContainerBeealyzer(player.inventory, inventory), inventory, "gui.beealyzer"); + super("rootBees", player, new ContainerAlyzer(inventory, player), inventory, "gui.beealyzer"); ArrayList beeList = new ArrayList(); ((ItemBeeGE) ForestryItem.beeDroneGE.item()).addCreativeItems(beeList, false); @@ -54,7 +51,8 @@ public class GuiBeealyzer extends GuiAlyzer { int page = 0; IBee bee = null; EnumBeeType beeType = EnumBeeType.DRONE; - for (int k = 1; k < BeealyzerInventory.SLOT_ANALYZE_5 + 1; k++) { + + for (int k = BeealyzerInventory.SLOT_SPECIMEN; k <= BeealyzerInventory.SLOT_ANALYZE_5; k++) { if (k == BeealyzerInventory.SLOT_ENERGY) continue; diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index bbd2df988..544cc093e 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -10,12 +10,16 @@ ******************************************************************************/ package forestry.apiculture.items; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; import forestry.core.inventory.AlyzerInventory; @@ -23,39 +27,22 @@ import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginApiculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class ItemBeealyzer extends ItemInventoried { public static class BeealyzerInventory extends AlyzerInventory implements IErrorSource, IHintSource { - public BeealyzerInventory(EntityPlayer player) { - super(ItemBeealyzer.class, 7); - this.player = player; - } - public BeealyzerInventory(EntityPlayer player, ItemStack itemStack) { super(ItemBeealyzer.class, 7, itemStack); this.player = player; } - private boolean isEnergy(ItemStack itemstack) { - if (itemstack == null || itemstack.stackSize <= 0) - return false; - - return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + @Override + protected boolean isSpecimen(ItemStack itemStack) { + return PluginApiculture.beeInterface.isMember(itemStack); } private void tryAnalyze() { - - // Analyzed slot occupied, abort - if (inventoryStacks[SLOT_ANALYZE_1] != null || inventoryStacks[SLOT_ANALYZE_2] != null || inventoryStacks[SLOT_ANALYZE_3] != null - || inventoryStacks[SLOT_ANALYZE_4] != null || inventoryStacks[SLOT_ANALYZE_5] != null) - return; - // Source slot to analyze empty if (getStackInSlot(SLOT_SPECIMEN) == null) return; @@ -132,8 +119,7 @@ public class ItemBeealyzer extends ItemInventoried { @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { if (Proxies.common.isSimulating(world)) - entityplayer.openGui(ForestryAPI.instance, GuiId.BeealyzerGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, - (int) entityplayer.posZ); + entityplayer.openGui(ForestryAPI.instance, GuiId.BeealyzerGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, (int) entityplayer.posZ); return itemstack; } diff --git a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java index a8ac828fd..d665c9c5e 100755 --- a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java +++ b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java @@ -32,6 +32,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -49,10 +50,6 @@ public class ItemBiomefinder extends ItemInventoried { private final short specimenSlot = 0; private final short analyzeSlot = 1; - public BiomefinderInventory() { - super(ItemBiomefinder.class, 3); - } - public BiomefinderInventory(ItemStack itemstack) { super(ItemBiomefinder.class, 3, itemstack); } @@ -137,6 +134,17 @@ public class ItemBiomefinder extends ItemInventoried { return EnumErrorCode.OK; } + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == energySlot) { + Item item = itemStack.getItem(); + return item == ForestryItem.honeydew.item() || item == ForestryItem.honeyDrop.item(); + } else if (slotIndex == specimenSlot || slotIndex == analyzeSlot) { + return PluginApiculture.beeInterface.isMember(itemStack); + } + return false; + } + } public ItemBiomefinder() { diff --git a/src/main/java/forestry/apiculture/items/ItemImprinter.java b/src/main/java/forestry/apiculture/items/ItemImprinter.java index 8cb647ba5..0f970e572 100755 --- a/src/main/java/forestry/apiculture/items/ItemImprinter.java +++ b/src/main/java/forestry/apiculture/items/ItemImprinter.java @@ -30,7 +30,6 @@ public class ItemImprinter extends ItemForestry { public static class ImprinterInventory extends ItemInventory { - private final ItemStack[] inventoryStacks = new ItemStack[2]; private final short specimenSlot = 0; private final short imprintedSlot = 1; @@ -39,8 +38,8 @@ public class ItemImprinter extends ItemForestry { private final EntityPlayer player; - public ImprinterInventory(EntityPlayer player) { - super(ItemImprinter.class); + public ImprinterInventory(EntityPlayer player, ItemStack itemStack) { + super(ItemImprinter.class, 2, itemStack); this.player = player; } @@ -127,25 +126,6 @@ public class ItemImprinter extends ItemForestry { inventoryStacks[specimenSlot] = null; } - @Override - public ItemStack decrStackSize(int i, int j) { - if (inventoryStacks[i] == null) - return null; - - ItemStack product; - if (inventoryStacks[i].stackSize <= j) { - product = inventoryStacks[i]; - inventoryStacks[i] = null; - return product; - } else { - product = inventoryStacks[i].splitStack(j); - if (inventoryStacks[i].stackSize == 0) - inventoryStacks[i] = null; - - return product; - } - } - @Override public void markDirty() { if (!Proxies.common.isSimulating(player.worldObj)) @@ -153,61 +133,14 @@ public class ItemImprinter extends ItemForestry { tryImprint(); } - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - inventoryStacks[i] = itemstack; - } - - @Override - public ItemStack getStackInSlot(int i) { - return inventoryStacks[i]; - } - - @Override - public int getSizeInventory() { - return inventoryStacks.length; - } - @Override public String getInventoryName() { return "Imprinter"; } @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - if (inventoryStacks[slot] == null) - return null; - ItemStack toReturn = inventoryStacks[slot]; - inventoryStacks[slot] = null; - return toReturn; - } - - @Override - public boolean hasCustomInventoryName() { - return true; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return PluginApiculture.beeInterface.isMember(itemStack); } } diff --git a/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java index 481604189..416038e0c 100755 --- a/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java @@ -10,16 +10,17 @@ ******************************************************************************/ package forestry.arboriculture; -import forestry.arboriculture.genetics.TreeHelper; -import forestry.arboriculture.gui.ContainerTreealyzer; -import forestry.arboriculture.gui.GuiTreealyzer; -import forestry.arboriculture.items.ItemTreealyzer.TreealyzerInventory; -import forestry.core.GuiHandlerBase; -import forestry.core.network.GuiId; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.arboriculture.genetics.TreeHelper; +import forestry.arboriculture.gui.GuiTreealyzer; +import forestry.arboriculture.items.ItemTreealyzer.TreealyzerInventory; +import forestry.core.GuiHandlerBase; +import forestry.core.gui.ContainerAlyzer; +import forestry.core.network.GuiId; + public class GuiHandlerArboriculture extends GuiHandlerBase { @Override @@ -35,11 +36,11 @@ public class GuiHandlerArboriculture extends GuiHandlerBase { return this.getNaturalistChestContainer(TreeHelper.UID, player, world, x, y, z, decodeGuiData(id)); case TreealyzerGUI: - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; - return new ContainerTreealyzer(player.inventory, new TreealyzerInventory(player, equipped)); + return new ContainerAlyzer(new TreealyzerInventory(player, equipped), player); default: return null; @@ -61,7 +62,7 @@ public class GuiHandlerArboriculture extends GuiHandlerBase { return this.getNaturalistChestGui(TreeHelper.UID, player, world, x, y, z, decodeGuiData(id)); case TreealyzerGUI: - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; diff --git a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java deleted file mode 100755 index da83ef01b..000000000 --- a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import org.apache.commons.lang3.ArrayUtils; - -import forestry.api.genetics.AlleleManager; -import forestry.arboriculture.items.ItemGermlingGE; -import forestry.arboriculture.items.ItemTreealyzer.TreealyzerInventory; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerAlyzer; - -public class ContainerTreealyzer extends ContainerAlyzer { - - private static final Object[] acceptedEnergy = new Object[] {ForestryItem.honeydew, ForestryItem.honeyDrop}; - private static final Object[] acceptedSpecimens = ArrayUtils.addAll(AlleleManager.ersatzSaplings.keySet().toArray(), ItemGermlingGE.class); - - public ContainerTreealyzer(InventoryPlayer inventoryplayer, TreealyzerInventory inventory) { - super(inventoryplayer, inventory, acceptedEnergy, acceptedSpecimens); - } - -} diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 30463833a..3a4bd1058 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -10,13 +10,23 @@ ******************************************************************************/ package forestry.arboriculture.gui; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import net.minecraftforge.common.EnumPlantType; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.ITree; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.genetics.TreeGenome; @@ -26,23 +36,15 @@ import forestry.core.config.ForestryItem; import forestry.core.genetics.Allele; import forestry.core.genetics.AlleleBoolean; import forestry.core.genetics.AllelePlantType; +import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import net.minecraftforge.common.EnumPlantType; public class GuiTreealyzer extends GuiAlyzer { public GuiTreealyzer(EntityPlayer player, TreealyzerInventory inventory) { - super("rootTrees", player, new ContainerTreealyzer(player.inventory, inventory), inventory, "gui.treealyzer"); + super("rootTrees", player, new ContainerAlyzer(inventory, player), inventory, "gui.treealyzer"); ArrayList treeList = new ArrayList(); ((ItemGermlingGE) ForestryItem.sapling.item()).addCreativeItems(treeList, false); diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index a0fdfbc40..5b60e8604 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -18,37 +18,31 @@ import net.minecraft.world.World; import forestry.api.arboriculture.ITree; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; -import forestry.core.utils.GeneticsUtil; +import forestry.api.genetics.AlleleManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; import forestry.core.inventory.AlyzerInventory; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; +import forestry.core.utils.GeneticsUtil; +import forestry.core.utils.StackUtils; import forestry.plugins.PluginArboriculture; public class ItemTreealyzer extends ItemInventoried { public static class TreealyzerInventory extends AlyzerInventory implements IErrorSource, IHintSource { - public TreealyzerInventory(EntityPlayer player) { - super(ItemTreealyzer.class, 7); - this.player = player; - } - public TreealyzerInventory(EntityPlayer player, ItemStack itemStack) { super(ItemTreealyzer.class, 7, itemStack); this.player = player; } - private boolean isEnergy(ItemStack itemstack) { - if (itemstack == null || itemstack.stackSize <= 0) - return false; - - return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + @Override + protected boolean isSpecimen(ItemStack itemStack) { + return StackUtils.containsItemStack(AlleleManager.ersatzSaplings.keySet(), itemStack) || PluginArboriculture.treeInterface.isMember(itemStack); } private void tryAnalyze() { diff --git a/src/main/java/forestry/core/GuiHandler.java b/src/main/java/forestry/core/GuiHandler.java index d130c6a76..1b0d0d015 100755 --- a/src/main/java/forestry/core/GuiHandler.java +++ b/src/main/java/forestry/core/GuiHandler.java @@ -10,7 +10,12 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import cpw.mods.fml.common.network.IGuiHandler; + import forestry.core.circuits.ContainerSolderingIron; import forestry.core.circuits.GuiSolderingIron; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; @@ -22,8 +27,6 @@ import forestry.core.gui.GuiAnalyzer; import forestry.core.gui.GuiEscritoire; import forestry.core.network.GuiId; import forestry.plugins.PluginManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; public class GuiHandler extends GuiHandlerBase { @@ -41,7 +44,10 @@ public class GuiHandler extends GuiHandlerBase { return new GuiEscritoire(player, (TileEscritoire) getTileForestry(world, x, y, z)); case SolderingIronGUI: - return new GuiSolderingIron(player.inventory, new SolderingInventory()); + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) + return null; + return new GuiSolderingIron(player.inventory, new SolderingInventory(equipped)); default: for (IGuiHandler handler : PluginManager.guiHandlers) { @@ -70,7 +76,10 @@ public class GuiHandler extends GuiHandlerBase { return new ContainerEscritoire(player, (TileEscritoire) getTileForestry(world, x, y, z)); case SolderingIronGUI: - return new ContainerSolderingIron(player.inventory, new SolderingInventory()); + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) + return null; + return new ContainerSolderingIron(player.inventory, new SolderingInventory(equipped)); default: for (IGuiHandler handler : PluginManager.guiHandlers) { diff --git a/src/main/java/forestry/core/GuiHandlerBase.java b/src/main/java/forestry/core/GuiHandlerBase.java index 8b0af8053..620f52c2b 100755 --- a/src/main/java/forestry/core/GuiHandlerBase.java +++ b/src/main/java/forestry/core/GuiHandlerBase.java @@ -37,18 +37,13 @@ public abstract class GuiHandlerBase implements IGuiHandler { public GuiNaturalistInventory getNaturalistChestGui(String rootUID, EntityPlayer player, World world, int x, int y, int z, int page) { TileNaturalistChest tile = (TileNaturalistChest) getTileForestry(world, x, y, z); ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(rootUID); - return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistInventory(speciesRoot, player.inventory, tile, page, 25), tile, page, 5); + return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistInventory(player.inventory, tile, page, 25), tile, page, 5); } public ContainerNaturalistInventory getNaturalistChestContainer(String rootUID, EntityPlayer player, World world, int x, int y, int z, int page) { ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(rootUID); speciesRoot.getBreedingTracker(world, player.getGameProfile()).synchToPlayer(player); - return new ContainerNaturalistInventory(speciesRoot, - player.inventory, (TileNaturalistChest) getTileForestry(world, x, y, z), page, 25); - } - - public ItemStack getEquippedItem(EntityPlayer player) { - return player.getCurrentEquippedItem(); + return new ContainerNaturalistInventory(player.inventory, (TileNaturalistChest) getTileForestry(world, x, y, z), page, 25); } public static int encodeGuiData(int guiId, int data) { diff --git a/src/main/java/forestry/core/circuits/ContainerSolderingIron.java b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java index 8b723d63b..be414af19 100755 --- a/src/main/java/forestry/core/circuits/ContainerSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java @@ -10,20 +10,20 @@ ******************************************************************************/ package forestry.core.circuits; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.world.World; + import forestry.api.circuits.ICircuitLayout; import forestry.core.circuits.ItemSolderingIron.SolderingInventory; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.IGuiSelectable; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ContainerSolderingIron extends ContainerItemInventory implements IGuiSelectable { @@ -34,16 +34,16 @@ public class ContainerSolderingIron extends ContainerItemInventory implements IG this.inventory = inventory; // Input - this.addSlotToContainer(new SlotCustom(inventory, 0, 152, 12, ItemCircuitBoard.class)); + this.addSlotToContainer(new SlotFiltered(inventory, 0, 152, 12)); // Output - this.addSlotToContainer(new SlotCustom(inventory, 1, 152, 92, ItemCircuitBoard.class)); + this.addSlotToContainer(new SlotOutput(inventory, 1, 152, 92)); // Ingredients - this.addSlotToContainer(new Slot(inventory, 2, 12, 32)); - this.addSlotToContainer(new Slot(inventory, 3, 12, 52)); - this.addSlotToContainer(new Slot(inventory, 4, 12, 72)); - this.addSlotToContainer(new Slot(inventory, 5, 12, 92)); + this.addSlotToContainer(new SlotFiltered(inventory, 2, 12, 32)); + this.addSlotToContainer(new SlotFiltered(inventory, 3, 12, 52)); + this.addSlotToContainer(new SlotFiltered(inventory, 4, 12, 72)); + this.addSlotToContainer(new SlotFiltered(inventory, 5, 12, 92)); // Player inventory for (int i1 = 0; i1 < 3; i1++) @@ -55,24 +55,6 @@ public class ContainerSolderingIron extends ContainerItemInventory implements IG } - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return false; - } - - /* - * @Override public void onCraftGuiClosed(EntityPlayer entityplayer) { - * - * if (!Proxies.common.isSimulating(entityplayer.worldObj)) return; - * - * // Drop everything still in there. for (int i = 0; i < inventory.getSizeInventory(); i++) { ItemStack stack = inventory.getStackInSlot(i); if (stack == - * null) { continue; } - * - * Proxies.common.dropItemPlayer(entityplayer, stack); inventory.setInventorySlotContents(i, null); } - * - * } - */ - public ICircuitLayout getLayout() { return inventory.getLayout(); } diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index 5fb8c6f61..0034fb1d2 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -23,9 +23,12 @@ import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.RevolvingList; +import forestry.plugins.PluginApiculture; + import java.util.ArrayList; import java.util.Collection; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -89,15 +92,16 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { private final short blankSlot = 0; private final short finishedSlot = 1; private final short ingredientSlot1 = 2; + private final short ingredientSlotCount = 4; - public SolderingInventory() { - super(ItemSolderingIron.class, 6); + public SolderingInventory(ItemStack itemStack) { + super(ItemSolderingIron.class, 6, itemStack); init(); } - public SolderingInventory(ItemStack itemstack) { - super(ItemSolderingIron.class, 6, itemstack); - init(); + @Override + public int getInventoryStackLimit() { + return 1; } private void init() { @@ -190,14 +194,6 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { return count; } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - } - @Override public void markDirty() { errorState = EnumErrorCode.OK; @@ -222,6 +218,21 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { return EnumErrorCode.OK; } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (itemStack == null) + return false; + + Item item = itemStack.getItem(); + if (slotIndex == blankSlot) { + return item instanceof ItemCircuitBoard; + } else if (slotIndex >= ingredientSlot1 && slotIndex < ingredientSlot1 + ingredientSlotCount) { + CircuitRecipe recipe = SolderManager.getMatchingRecipe(layouts.getCurrent(), itemStack); + return recipe != null; + } + return false; + } } public ItemSolderingIron() { diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java index 2cfad766a..6de0dd57b 100755 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Defaults.java @@ -43,6 +43,8 @@ public class Defaults { public static final int[] FACING_WESTEAST = { FACING_WEST, FACING_EAST }; public static final int[] FACINGS_NONE = new int[0]; + public static final int[] SLOTS_NONE = new int[0]; + // Textures public static final String TEXTURE_PATH_GUI = "textures/gui"; public static final String TEXTURE_PATH_BLOCKS = "textures/blocks"; diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 663a3e7bd..bca36b95c 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -212,7 +212,8 @@ public final class FluidHelper { return false; } - public static boolean isFillableContainer(ItemStack empty, FluidStack liquid) { + public static boolean isFillableContainer(ItemStack stack, FluidStack liquid) { + ItemStack empty = StackUtils.createSplitStack(stack, 1); Item item = empty.getItem(); if (item instanceof IFluidContainerItem) { IFluidContainerItem containerItem = (IFluidContainerItem) item; diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 9510e8508..b035dff35 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -351,6 +351,9 @@ public class TankManager extends ForwardingList implements IFluidH } public boolean accepts(Fluid fluid) { + if (fluid == null) + return false; + for (StandardTank tank : tanks) { if (tank.accepts(fluid)) return true; diff --git a/src/main/java/forestry/core/fluids/tanks/StandardTank.java b/src/main/java/forestry/core/fluids/tanks/StandardTank.java index d2dae22b1..bfcbc5675 100644 --- a/src/main/java/forestry/core/fluids/tanks/StandardTank.java +++ b/src/main/java/forestry/core/fluids/tanks/StandardTank.java @@ -104,7 +104,7 @@ public class StandardTank extends FluidTank { } public boolean accepts(Fluid fluid) { - return true; + return fluid != null; } public boolean canBeFilledExternally() { diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 985cc7eda..cfe7ca335 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -10,6 +10,22 @@ ******************************************************************************/ package forestry.core.gadgets; +import java.util.Stack; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; @@ -27,19 +43,7 @@ import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.GuiId; -import java.util.Stack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; +import forestry.core.utils.GuiUtil; public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -50,7 +54,9 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui public static final short SLOT_ANALYZE = 0; public static final short SLOT_CAN = 1; public static final short SLOT_INPUT_1 = 2; + public static final short SLOT_INPUT_COUNT = 6; public static final short SLOT_OUTPUT_1 = 8; + public static final short SLOT_OUTPUT_COUNT = 4; /* MEMBER */ private int analyzeTime; @@ -66,17 +72,29 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui /* CONSTRUCTOR */ public TileAnalyzer() { super(800, 40, Defaults.MACHINE_MAX_ENERGY); - setInternalInventory(new TileInventoryAdapter(this, 12, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 12, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (GuiUtil.isIndexInRange(slotIndex, SLOT_INPUT_1, SLOT_INPUT_COUNT)) { + return AlleleManager.alleleRegistry.isIndividual(itemStack); + } else if (slotIndex == SLOT_CAN) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return resourceTank.accepts(fluid); + } + + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { + return GuiUtil.isIndexInRange(slotIndex, SLOT_OUTPUT_1, SLOT_OUTPUT_COUNT); + } + }); resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, Fluids.HONEY.getFluid()); tankManager = new TankManager(resourceTank); invInput = new InventoryMapper(getInternalInventory(), SLOT_INPUT_1, 6); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - /* GUI */ @Override public void openGui(EntityPlayer player, TileBase tile) { @@ -239,7 +257,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui return false; ItemStack next = pendingProducts.peek(); - if (getInternalInventory().tryAddStack(next, SLOT_OUTPUT_1, getInternalInventory().getSizeInventory() - SLOT_OUTPUT_1, true)) { + if (InvTools.tryAddStack(getInternalInventory(), next, SLOT_OUTPUT_1, getInternalInventory().getSizeInventory() - SLOT_OUTPUT_1, true)) { pendingProducts.pop(); return true; } @@ -293,87 +311,6 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui } - /* ISIDEDINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - if (!getInternalInventory().isItemValidForSlot(slot, stack)) - return false; - - if (slot >= SLOT_INPUT_1 && slot < SLOT_INPUT_1 + 6) - return AlleleManager.alleleRegistry.isIndividual(stack); - - if (slot == SLOT_CAN) - return Fluids.HONEY.isContained(stack); - - return false; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, int side) { - return isItemValidForSlot(slot, stack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, stack, side)) - return false; - - return slotIndex >= SLOT_OUTPUT_1 && slotIndex < SLOT_OUTPUT_1 + 4; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILIQUIDCONTAINER */ @Override public TankManager getTankManager() { @@ -409,5 +346,4 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui public FluidTankInfo[] getTankInfo(ForgeDirection from) { return tankManager.getTankInfo(from); } - } diff --git a/src/main/java/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/gadgets/TileEscritoire.java index 813d1a9be..78e79e28d 100755 --- a/src/main/java/forestry/core/gadgets/TileEscritoire.java +++ b/src/main/java/forestry/core/gadgets/TileEscritoire.java @@ -20,9 +20,9 @@ import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import forestry.core.utils.GeneticsUtil; import forestry.core.interfaces.ICrafter; import forestry.core.interfaces.IRenderableMachine; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.ForestryPacket; import forestry.core.network.GuiId; @@ -31,6 +31,8 @@ import forestry.core.network.PacketTileNBT; import forestry.core.network.PacketTileUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; +import forestry.core.utils.GeneticsUtil; +import forestry.core.utils.GuiUtil; public class TileEscritoire extends TileBase implements ISidedInventory, IRenderableMachine, ICrafter { @@ -43,13 +45,43 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender /* MEMBER */ private final NaturalistGame game = new NaturalistGame(); - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - public TileEscritoire() { - setInternalInventory(new TileInventoryAdapter(this, 12, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 12, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex >= SLOT_INPUT_1 && slotIndex < SLOT_INPUT_1 + Math.min(game.getSampleSize(), SLOTS_INPUT_COUNT)) { + ItemStack specimen = getStackInSlot(SLOT_ANALYZE); + if (specimen == null) + return false; + IIndividual individual = AlleleManager.alleleRegistry.getIndividual(specimen); + return individual != null && individual.getGenome().getPrimary().getResearchSuitability(itemStack) > 0; + } + + if (slotIndex == SLOT_ANALYZE) { + return AlleleManager.alleleRegistry.isIndividual(itemStack); + } + + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return GuiUtil.isIndexInRange(slotIndex, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT); + } + + @Override + public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { + super.setInventorySlotContents(slotIndex, itemstack); + if (slotIndex == SLOT_ANALYZE && Proxies.common.isSimulating(worldObj)) { + if (!AlleleManager.alleleRegistry.isIndividual(getStackInSlot(SLOT_ANALYZE)) && getStackInSlot(SLOT_ANALYZE) != null) { + ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(getStackInSlot(SLOT_ANALYZE)); + if (ersatz != null) + setInventorySlotContents(SLOT_ANALYZE, ersatz); + } + game.initialize(getStackInSlot(SLOT_ANALYZE)); + } + } + }); } /* GUI */ @@ -87,7 +119,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender return; for (ItemStack itemstack : individual.getGenome().getPrimary().getResearchBounty(worldObj, gameProfile, individual, game.getBountyLevel())) { - getInternalInventory().addStack(itemstack, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT, false, true); + InvTools.addStack(getInternalInventory(), itemstack, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT, false, true); } } @@ -123,92 +155,6 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender Proxies.net.sendToPlayer(new PacketTileNBT(PacketIds.TILE_NBT, this), player); } - /* ISIDEDINVENTORY */ - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - if (slotIndex >= SLOT_INPUT_1 && slotIndex < SLOT_INPUT_1 + SLOTS_INPUT_COUNT) - return slotIndex < SLOT_INPUT_1 + Math.min(game.getSampleSize(), SLOTS_INPUT_COUNT); - - return true; - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex >= SLOT_RESULTS_1 && slotIndex < SLOT_RESULTS_1 + SLOTS_RESULTS_COUNT; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { - TileInventoryAdapter inventory = getInternalInventory(); - inventory.setInventorySlotContents(slotIndex, itemstack); - if (slotIndex == SLOT_ANALYZE && Proxies.common.isSimulating(worldObj)) { - if (!AlleleManager.alleleRegistry.isIndividual(inventory.getStackInSlot(SLOT_ANALYZE)) - && inventory.getStackInSlot(SLOT_ANALYZE) != null) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(inventory.getStackInSlot(SLOT_ANALYZE)); - if (ersatz != null) - inventory.setInventorySlotContents(SLOT_ANALYZE, ersatz); - } - game.initialize(inventory.getStackInSlot(SLOT_ANALYZE)); - } - } - - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - @Override public EnumTankLevel getPrimaryLevel() { return EnumTankLevel.EMPTY; @@ -235,5 +181,4 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender public boolean canTakeStack(int slotIndex) { return true; } - } diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 98a2710d0..3888caae3 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -15,6 +15,7 @@ import java.util.Collection; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; @@ -32,9 +33,12 @@ import cpw.mods.fml.common.Optional; import forestry.api.core.IErrorState; import forestry.core.EnumErrorCode; import forestry.core.config.Config; +import forestry.core.config.Defaults; import forestry.core.interfaces.IErrorSource; +import forestry.core.interfaces.IFilterSlotDelegate; import forestry.core.interfaces.IRestrictedAccess; -import forestry.core.inventory.TileInventoryAdapter; +import forestry.core.inventory.FakeInventoryAdapter; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.ForestryPacket; import forestry.core.network.INetworkedEntity; import forestry.core.network.PacketPayload; @@ -43,6 +47,7 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.AdjacentTileCache; import forestry.core.utils.EnumAccess; import forestry.core.utils.PlayerUtil; +import forestry.core.utils.Utils; import forestry.core.vect.Vect; import buildcraft.api.statements.IStatementContainer; @@ -51,11 +56,11 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") -public abstract class TileForestry extends TileEntity implements INetworkedEntity, IRestrictedAccess, IErrorSource, ITriggerProvider { +public abstract class TileForestry extends TileEntity implements INetworkedEntity, IRestrictedAccess, IErrorSource, ITriggerProvider, ISidedInventory, IFilterSlotDelegate { protected final AdjacentTileCache tileCache = new AdjacentTileCache(this); protected boolean isInited = false; - private TileInventoryAdapter inventory; + private IInventoryAdapter inventory = FakeInventoryAdapter.instance(); public AdjacentTileCache getTileCache() { return tileCache; @@ -81,10 +86,6 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit return new Vect(xCoord, yCoord, zCoord); } - public World getWorld() { - return this.getWorldObj(); - } - public void openGui(EntityPlayer player) { } @@ -118,8 +119,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit public void readFromNBT(NBTTagCompound data) { super.readFromNBT(data); - if (inventory != null) - inventory.readFromNBT(data); + inventory.readFromNBT(data); if (data.hasKey("Access")) access = EnumAccess.values()[data.getInteger("Access")]; @@ -138,8 +138,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit @Override public void writeToNBT(NBTTagCompound data) { super.writeToNBT(data); - if (inventory != null) - inventory.writeToNBT(data); + inventory.writeToNBT(data); data.setInteger("Access", access.ordinal()); if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); @@ -254,6 +253,10 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit return allowsAlteration(player) || getAccess() == EnumAccess.VIEWABLE; } + private boolean allowsPipeConnections() { + return access == EnumAccess.SHARED; + } + @Override public EnumAccess getAccess() { return access; @@ -291,11 +294,20 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit if (!isOwner(player)) return false; + boolean couldPipesConnect = allowsPipeConnections(); + int ordinal = (access.ordinal() + 1) % EnumAccess.values().length; access = EnumAccess.values()[ordinal]; if (!this.worldObj.isRemote) sendNetworkUpdate(); + boolean canPipesConnect = allowsPipeConnections(); + if (couldPipesConnect != canPipesConnect) { + // pipes connected to this need to update + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType); + markDirty(); + } + return true; } @@ -309,11 +321,109 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit } /* INVENTORY BASICS */ - public final TileInventoryAdapter getInternalInventory() { + public IInventoryAdapter getInternalInventory() { return inventory; } - public final void setInternalInventory(TileInventoryAdapter inv) { + public final void setInternalInventory(IInventoryAdapter inv) { + if (inv == null) { + throw new NullPointerException("Inventory cannot be null"); + } this.inventory = inv; } + + /* ISidedInventory */ + @Override + public final int getSizeInventory() { + return getInternalInventory().getSizeInventory(); + } + + @Override + public final ItemStack getStackInSlot(int slotIndex) { + return getInternalInventory().getStackInSlot(slotIndex); + } + + @Override + public final ItemStack decrStackSize(int slotIndex, int amount) { + return getInternalInventory().decrStackSize(slotIndex, amount); + } + + @Override + public final ItemStack getStackInSlotOnClosing(int slotIndex) { + return getInternalInventory().getStackInSlotOnClosing(slotIndex); + } + + @Override + public final void setInventorySlotContents(int slotIndex, ItemStack itemstack) { + getInternalInventory().setInventorySlotContents(slotIndex, itemstack); + } + + @Override + public final int getInventoryStackLimit() { + return getInternalInventory().getInventoryStackLimit(); + } + + @Override + public final void openInventory() { + getInternalInventory().openInventory(); + } + + @Override + public final void closeInventory() { + getInternalInventory().closeInventory(); + } + + @Override + public final String getInventoryName() { + return getUnlocalizedName(); + } + + @Override + public final boolean isUseableByPlayer(EntityPlayer player) { + if (!Utils.isUseableByPlayer(player, this) || !allowsViewing(player)) + return false; + return getInternalInventory().isUseableByPlayer(player); + } + + @Override + public final boolean hasCustomInventoryName() { + return getInternalInventory().hasCustomInventoryName(); + } + + @Override + public final boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + if (itemStack == null || !allowsPipeConnections()) + return false; + + if (!canSlotAccept(slotIndex, itemStack)) + return false; + + return getInternalInventory().isItemValidForSlot(slotIndex, itemStack); + } + + @Override + public final boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return getInternalInventory().canSlotAccept(slotIndex, itemStack); + } + + @Override + public final int[] getAccessibleSlotsFromSide(int side) { + if (!allowsPipeConnections()) + return Defaults.SLOTS_NONE; + return getInternalInventory().getAccessibleSlotsFromSide(side); + } + + @Override + public final boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { + if (itemStack == null || !allowsPipeConnections()) + return false; + return isItemValidForSlot(slotIndex, itemStack); + } + + @Override + public final boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { + if (itemStack == null || !allowsPipeConnections()) + return false; + return getInternalInventory().canExtractItem(slotIndex, itemStack, side); + } } diff --git a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java index 1b9d5eba2..2450070b8 100755 --- a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java +++ b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java @@ -10,33 +10,39 @@ ******************************************************************************/ package forestry.core.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.core.ForestryAPI; import forestry.api.genetics.ISpeciesRoot; import forestry.core.GuiHandler; import forestry.core.config.Config; import forestry.core.gui.IPagedInventory; import forestry.core.inventory.TileInventoryAdapter; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -public abstract class TileNaturalistChest extends TileBase implements IInventory, IPagedInventory { +public abstract class TileNaturalistChest extends TileBase implements IPagedInventory { + + private static class NaturalistInventoryAdapter extends TileInventoryAdapter { + private final ISpeciesRoot speciesRoot; + public NaturalistInventoryAdapter(TileNaturalistChest tile, int size, String name, ISpeciesRoot speciesRoot) { + super(tile, size, name); + this.speciesRoot = speciesRoot; + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemstack) { + return speciesRoot.isMember(itemstack); + } + } - private final ISpeciesRoot speciesRoot; private final int guiID; public TileNaturalistChest(ISpeciesRoot speciesRoot, int guiId) { - setInternalInventory(new TileInventoryAdapter(this, 125, "Items")); + setInternalInventory(new NaturalistInventoryAdapter(this, 125, "Items", speciesRoot)); setHints(Config.hints.get("apiarist.chest")); - this.speciesRoot = speciesRoot; this.guiID = guiId; } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, guiID, player.worldObj, xCoord, yCoord, zCoord); @@ -57,58 +63,4 @@ public abstract class TileNaturalistChest extends TileBase implements IInventory public boolean throwsErrors() { return false; } - - /* IINVENTORY */ - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return itemstack == null || speciesRoot.isMember(itemstack); - } - - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slotIndex) { - return getInternalInventory().getStackInSlot(slotIndex); - } - - @Override - public ItemStack decrStackSize(int slotIndex, int count) { - return getInternalInventory().decrStackSize(slotIndex, count); - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(slotIndex, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } } diff --git a/src/main/java/forestry/core/gui/ContainerAlyzer.java b/src/main/java/forestry/core/gui/ContainerAlyzer.java index e9a7dc8ac..403423d62 100644 --- a/src/main/java/forestry/core/gui/ContainerAlyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAlyzer.java @@ -1,6 +1,6 @@ package forestry.core.gui; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.inventory.AlyzerInventory; import forestry.core.proxy.Proxies; import net.minecraft.entity.player.EntityPlayer; @@ -11,25 +11,26 @@ public class ContainerAlyzer extends ContainerItemInventory { private final AlyzerInventory inventory; - protected ContainerAlyzer(InventoryPlayer inventoryplayer, AlyzerInventory inventory, Object[] acceptedEnergy, Object... acceptedSpecimens) { - super(inventory, inventoryplayer.player); + public ContainerAlyzer(AlyzerInventory inventory, EntityPlayer player) { + super(inventory, player); + InventoryPlayer inventoryplayer = player.inventory; this.inventory = inventory; final int xPosLeftSlots = 223; // Energy - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_ENERGY, xPosLeftSlots, 8, acceptedEnergy)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ENERGY, xPosLeftSlots, 8)); // Bee to analyze - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_SPECIMEN, xPosLeftSlots, 26, acceptedSpecimens)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_SPECIMEN, xPosLeftSlots, 26)); // Analyzed bee - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_ANALYZE_1, xPosLeftSlots, 57, acceptedSpecimens)); - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_ANALYZE_2, xPosLeftSlots, 75, acceptedSpecimens)); - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_ANALYZE_3, xPosLeftSlots, 93, acceptedSpecimens)); - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_ANALYZE_4, xPosLeftSlots, 111, acceptedSpecimens)); - this.addSlotToContainer(new SlotCustom(inventory, AlyzerInventory.SLOT_ANALYZE_5, xPosLeftSlots, 129, acceptedSpecimens)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_1, xPosLeftSlots, 57)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_2, xPosLeftSlots, 75)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_3, xPosLeftSlots, 93)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_4, xPosLeftSlots, 111)); + this.addSlotToContainer(new SlotFiltered(inventory, AlyzerInventory.SLOT_ANALYZE_5, xPosLeftSlots, 129)); final int xPosPlayerInv = 43; final int xSpacePlayerInv = 18; @@ -74,9 +75,4 @@ public class ContainerAlyzer extends ContainerItemInventory { inventory.onGuiSaved(entityplayer); } - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return true; - } - } diff --git a/src/main/java/forestry/core/gui/ContainerAnalyzer.java b/src/main/java/forestry/core/gui/ContainerAnalyzer.java index 3b9434171..f53f955dd 100755 --- a/src/main/java/forestry/core/gui/ContainerAnalyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAnalyzer.java @@ -12,40 +12,26 @@ package forestry.core.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import forestry.core.config.ForestryItem; -import forestry.core.fluids.Fluids; import forestry.core.gadgets.TileAnalyzer; -import forestry.core.genetics.ItemGE; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.gui.slots.SlotLiquidContainer; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; public class ContainerAnalyzer extends ContainerLiquidTanks { public ContainerAnalyzer(InventoryPlayer player, TileAnalyzer tile) { - super(tile, tile); + super(tile); // Input buffer for (int i = 0; i < 3; i++) for (int k = 0; k < 2; k++) - addSlotToContainer(new SlotCustom(tile, TileAnalyzer.SLOT_INPUT_1 + i * 2 + k, 8 + k * 18, 28 + i * 18, ItemGE.class)); + addSlotToContainer(new SlotFiltered(tile, TileAnalyzer.SLOT_INPUT_1 + i * 2 + k, 8 + k * 18, 28 + i * 18)); // Analyze slot - addSlotToContainer(new SlotCustom(tile, TileAnalyzer.SLOT_ANALYZE, 73, 59)); + addSlotToContainer(new SlotFiltered(tile, TileAnalyzer.SLOT_ANALYZE, 73, 59)); // Can slot - addSlotToContainer(new SlotLiquidContainer(tile, TileAnalyzer.SLOT_CAN, 143, 24, false, Fluids.HONEY.getFluid()) { - - @Override - public boolean isItemValid(ItemStack stack) { - if (ForestryItem.honeyDrop.isItemEqual(stack)) - return true; - return super.isItemValid(stack); - } - - }); + addSlotToContainer(new SlotFiltered(tile, TileAnalyzer.SLOT_CAN, 143, 24)); // Output buffer for (int i = 0; i < 2; i++) diff --git a/src/main/java/forestry/core/gui/ContainerEscritoire.java b/src/main/java/forestry/core/gui/ContainerEscritoire.java index 8a56349db..a1e7d9db4 100755 --- a/src/main/java/forestry/core/gui/ContainerEscritoire.java +++ b/src/main/java/forestry/core/gui/ContainerEscritoire.java @@ -10,19 +10,16 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.api.genetics.AlleleManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; + import forestry.core.gadgets.TileEscritoire; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; -import java.util.ArrayList; -import java.util.Collection; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.Slot; public class ContainerEscritoire extends ContainerForestry implements IGuiSelectable { @@ -37,20 +34,18 @@ public class ContainerEscritoire extends ContainerForestry implements IGuiSelect this.player = player; this.tile = t; - Collection filters = new ArrayList(); - filters.add(Blocks.sapling); - filters.addAll(AlleleManager.alleleRegistry.getSpeciesRoot().values()); // Analyze slot - addSlotToContainer(new SlotCustom(tile, TileEscritoire.SLOT_ANALYZE, 97, 67, filters.toArray()).setCrafter(tile)); + addSlotToContainer(new SlotFiltered(tile, TileEscritoire.SLOT_ANALYZE, 97, 67).setCrafter(tile)); for (int i = 0; i < TileEscritoire.SLOTS_INPUT_COUNT; i++) { - addSlotToContainer(new SlotCustom(tile, TileEscritoire.SLOT_INPUT_1 + i, 17, 49 + i * 18).setExclusion(true).setBlockedTexture("slots/blocked_2")); + addSlotToContainer(new SlotFiltered(tile, TileEscritoire.SLOT_INPUT_1 + i, 17, 49 + i * 18).setBlockedTexture("slots/blocked_2")); } - for(int i = 0; i < 3; i++) - for(int j = 0; j < 2; j++) { - addSlotToContainer(new SlotClosed(tile, TileEscritoire.SLOT_RESULTS_1 + (i * 2) + j, 177 + j * 18, 85 + i * 18)); + for(int i = 0; i < 3; i++) { + for (int j = 0; j < 2; j++) { + addSlotToContainer(new SlotOutput(tile, TileEscritoire.SLOT_RESULTS_1 + (i * 2) + j, 177 + j * 18, 85 + i * 18)); } + } // Player inventory for (int i = 0; i < 3; i++) diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index 0fe0c6a61..7f63c8eb3 100755 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -29,11 +29,7 @@ public class ContainerForestry extends Container { protected final IRestrictedAccess restrictedAccess; public ContainerForestry(TileForestry tileForestry) { - if (tileForestry instanceof IInventory) - this.inventoryAccess = (IInventory) tileForestry; - else - this.inventoryAccess = tileForestry.getInternalInventory(); - + this.inventoryAccess = tileForestry; this.restrictedAccess = tileForestry; } diff --git a/src/main/java/forestry/core/gui/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java index 4c043a8b6..6f4f6c8d2 100755 --- a/src/main/java/forestry/core/gui/ContainerItemInventory.java +++ b/src/main/java/forestry/core/gui/ContainerItemInventory.java @@ -10,13 +10,15 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.gui.slots.SlotItemInventory; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import forestry.core.gui.slots.SlotLocked; import forestry.core.inventory.ItemInventory; import forestry.core.proxy.Proxies; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; +import forestry.core.utils.StackUtils; public abstract class ContainerItemInventory extends ContainerForestry { @@ -29,26 +31,20 @@ public abstract class ContainerItemInventory extends ContainerForestry { this.player = player; } - public ItemInventory getItemInventory() { - return inventory; - } - protected void addSecuredSlot(IInventory other, int slot, int x, int y) { - if (other.getStackInSlot(slot) != null && inventory.itemClass.isAssignableFrom(other.getStackInSlot(slot).getItem().getClass())) + ItemStack stackInSlot = other.getStackInSlot(slot); + if (StackUtils.isIdenticalItem(inventory.parent, stackInSlot)) addSlotToContainer(new SlotLocked(other, slot, x, y)); else - addSlotToContainer(new SlotItemInventory(this, other, player, slot, x, y)); + addSlotToContainer(new Slot(other, slot, x, y)); } - protected abstract boolean isAcceptedItem(EntityPlayer player, ItemStack stack); - public void purgeBag(EntityPlayer player) { - for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack == null) - continue; + for (int i = 0; i < inventorySlots.size() - 9 * 4; i++) { + Slot slot = (Slot) inventorySlots.get(i); + ItemStack stack = slot.getStack(); - if (isAcceptedItem(player, stack)) + if (stack == null || slot.isItemValid(stack)) continue; Proxies.common.dropItemPlayer(player, stack); diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 5ce1d2784..435097c51 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -29,7 +29,7 @@ public class ContainerLiquidTanks extends ContainerForestry { private final ILiquidTankContainer tile; - public ContainerLiquidTanks(IInventory playerInventory, T tile) { + public ContainerLiquidTanks(T tile) { super(tile); this.tile = tile; } diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index 318bac49d..0bbf2f84d 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -13,28 +13,23 @@ package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import forestry.api.genetics.ISpeciesRoot; import forestry.core.gadgets.TileNaturalistChest; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.network.PacketUpdate; -import forestry.core.proxy.Proxies; public class ContainerNaturalistInventory extends ContainerForestry implements IGuiSelectable { private final IPagedInventory inv; - private final ISpeciesRoot speciesRoot; - public ContainerNaturalistInventory(ISpeciesRoot speciesRoot, InventoryPlayer player, TileNaturalistChest inventory, int page, int pageSize) { - super(inventory); - this.inv = inventory; - this.speciesRoot = speciesRoot; + public ContainerNaturalistInventory(InventoryPlayer player, TileNaturalistChest tile, int page, int pageSize) { + super(tile); + this.inv = tile; // Inventory for (int x = 0; x < 5; x++) { for (int y = 0; y < 5; y++) { - addSlotToContainer(new SlotCustom(inventory, y + page * pageSize + x * 5, 100 + y * 18, 21 + x * 18, speciesRoot)); + addSlotToContainer(new SlotFiltered(tile, y + page * pageSize + x * 5, 100 + y * 18, 21 + x * 18)); } } @@ -50,21 +45,6 @@ public class ContainerNaturalistInventory extends ContainerForestry implements I } } - public void purgeBag(EntityPlayer player) { - - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if (stack == null) - continue; - - if (speciesRoot.isMember(stack)) - continue; - - Proxies.common.dropItemPlayer(player, stack); - inv.setInventorySlotContents(i, null); - } - } - @Override public void handleSelectionChange(EntityPlayer player, PacketUpdate packet) { inv.flipPage(player, packet.payload.intPayload[0]); diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 5cc02a966..a3e250c55 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -10,6 +10,19 @@ ******************************************************************************/ package forestry.core.gui; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Stack; + +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +import org.apache.commons.lang3.StringUtils; +import org.lwjgl.opengl.GL11; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; @@ -26,19 +39,8 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.core.config.Defaults; import forestry.core.gadgets.TileForestry; import forestry.core.genetics.EnumMutateChance; -import forestry.core.genetics.Genome; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Stack; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.StringUtils; -import org.lwjgl.opengl.GL11; public abstract class GuiAlyzer extends GuiForestry { diff --git a/src/main/java/forestry/core/gui/slots/SlotCustom.java b/src/main/java/forestry/core/gui/slots/SlotCustom.java deleted file mode 100755 index 24fc06233..000000000 --- a/src/main/java/forestry/core/gui/slots/SlotCustom.java +++ /dev/null @@ -1,138 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.gui.slots; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; -import forestry.core.interfaces.ICrafter; -import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -/** - * Slot which only specific items. (With permission by RichardG.) - * - * @author Richard - */ -public class SlotCustom extends SlotForestry { - - protected final Object[] items; - private boolean exclusion; - private ICrafter crafter; - private String blockedTexture = "slots/blocked"; - - public SlotCustom(IInventory iinventory, int slotIndex, int xPos, int yPos, Object... items) { - super(iinventory, slotIndex, xPos, yPos); - this.items = items; - } - - public SlotCustom setCrafter(ICrafter crafter) { - this.crafter = crafter; - return this; - } - - public SlotCustom setExclusion(boolean exclusion) { - this.exclusion = exclusion; - return this; - } - - @Override - public boolean isItemValid(ItemStack itemstack) { - if (itemstack == null) - return false; - if (!inventory.isItemValidForSlot(getSlotIndex(), itemstack)) - return false; - - if (exclusion) - return !determineValidity(itemstack); - else - return determineValidity(itemstack); - } - - @Override - public boolean getHasStack() { - if (crafter != null && !crafter.canTakeStack(getSlotIndex())) - return false; - else - return super.getHasStack(); - } - - @Override - public ItemStack decrStackSize(int i) { - if (crafter != null && !crafter.canTakeStack(getSlotIndex())) - return null; - else - return super.decrStackSize(i); - } - - @Override - public void onPickupFromSlot(EntityPlayer player, ItemStack itemStack) { - if (crafter != null) - crafter.takenFromSlot(getSlotIndex(), true, player); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private boolean determineValidity(ItemStack itemstack) { - for (Object filter : items) { - if (filter == null) - continue; - if (filter instanceof Class) { - Block block = StackUtils.getBlock(itemstack); - - if (block != null && ((Class) filter).isAssignableFrom(block.getClass())) return true; - if (((Class) filter).isAssignableFrom(itemstack.getItem().getClass())) return true; - } else if (filter instanceof ItemStack) { - if (((ItemStack) filter).getItemDamage() == Defaults.WILDCARD && itemstack.getItem() == ((ItemStack) filter).getItem()) - return true; - else if (itemstack.isItemEqual((ItemStack) filter)) - return true; - } else if (filter instanceof Block) { - if (StackUtils.equals((Block) filter, itemstack)) return true; - } else if (filter instanceof Item) { - if (itemstack.getItem() == filter) return true; - } else if (filter instanceof ForestryItem) { - if (((ForestryItem) filter).isItemEqual(itemstack)) return true; - } else if (filter instanceof ForestryBlock) { - if (((ForestryBlock) filter).isItemEqual(itemstack)) return true; - } else if (filter instanceof ISpeciesRoot) { - if (((ISpeciesRoot) filter).isMember(itemstack)) return true; - } else { - throw new RuntimeException("invalid filter item specified: "+filter+" ("+filter.getClass()+")"); - } - } - - return false; - } - - public SlotCustom setBlockedTexture(String ident) { - blockedTexture = ident; - return this; - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getBackgroundIconIndex() { - ItemStack stack = getStack(); - if (stack != null && !inventory.isItemValidForSlot(getSlotIndex(), stack)) - return TextureManager.getInstance().getDefault(blockedTexture); - else - return null; - } -} diff --git a/src/main/java/forestry/core/gui/slots/SlotFiltered.java b/src/main/java/forestry/core/gui/slots/SlotFiltered.java new file mode 100644 index 000000000..752cd39fd --- /dev/null +++ b/src/main/java/forestry/core/gui/slots/SlotFiltered.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui.slots; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +import forestry.core.interfaces.IFilterSlotDelegate; + +/** + * Slot which only takes specific items, specified by the ICustomSlotInventory. + */ +public class SlotFiltered extends SlotWatched { + + protected final IFilterSlotDelegate filterSlotDelegate; + + public SlotFiltered(T filterSlotDelegateInventory, int slotIndex, int xPos, int yPos) { + this(filterSlotDelegateInventory, filterSlotDelegateInventory, slotIndex, xPos, yPos); + } + + public SlotFiltered(IFilterSlotDelegate filterSlotDelegate, IInventory inventory, int slotIndex, int xPos, int yPos) { + super(inventory, slotIndex, xPos, yPos); + this.filterSlotDelegate = filterSlotDelegate; + } + + @Override + public boolean isItemValid(ItemStack itemstack) { + return itemstack != null && filterSlotDelegate.canSlotAccept(getSlotIndex(), itemstack); + } +} diff --git a/src/main/java/forestry/core/gui/slots/SlotForestry.java b/src/main/java/forestry/core/gui/slots/SlotForestry.java index 2c6807e46..306c731c2 100755 --- a/src/main/java/forestry/core/gui/slots/SlotForestry.java +++ b/src/main/java/forestry/core/gui/slots/SlotForestry.java @@ -27,12 +27,10 @@ public class SlotForestry extends Slot implements IToolTipProvider{ private ToolTip toolTips; public SlotForestry(IInventory inventory, int slotIndex, int xPos, int yPos) { - this(inventory, slotIndex, xPos, yPos, -1); - } - - public SlotForestry(IInventory inventory, int slotIndex, int xPos, int yPos, int stackLimit) { super(inventory, slotIndex, xPos, yPos); - this.stackLimit = stackLimit; + if (inventory == null) + throw new IllegalArgumentException("Inventory must not be null"); + this.stackLimit = -1; } public SlotForestry setInfinite() { diff --git a/src/main/java/forestry/core/gui/slots/SlotItemInventory.java b/src/main/java/forestry/core/gui/slots/SlotItemInventory.java deleted file mode 100755 index d4a6e05f1..000000000 --- a/src/main/java/forestry/core/gui/slots/SlotItemInventory.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.gui.slots; - -import forestry.core.gui.ContainerItemInventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class SlotItemInventory extends Slot { - - private final EntityPlayer player; - private final ContainerItemInventory container; - - public SlotItemInventory(ContainerItemInventory container, IInventory inventory, EntityPlayer player, int par2, int par3, int par4) { - super(inventory, par2, par3, par4); - this.container = container; - this.player = player; - } - - @Override - public void onSlotChange(ItemStack par1ItemStack, ItemStack par2ItemStack) { - super.onSlotChange(par1ItemStack, par2ItemStack); - container.saveInventory(player); - } - -} diff --git a/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java b/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java deleted file mode 100755 index 0637d577e..000000000 --- a/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.gui.slots; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.core.fluids.FluidHelper; -import forestry.core.render.TextureManager; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.Fluid; - -public class SlotLiquidContainer extends SlotForestry { - - private final boolean allowEmpty; - private final Fluid[] fluids; - - public SlotLiquidContainer(IInventory iinventory, int slotIndex, int xPos, int yPos) { - this(iinventory, slotIndex, xPos, yPos, false); - } - - public SlotLiquidContainer(IInventory iinventory, int slotIndex, int xPos, int yPos, boolean allowEmpty, Fluid... fluids) { - super(iinventory, slotIndex, xPos, yPos); - - this.allowEmpty = allowEmpty; - this.fluids = fluids; - } - - @Override - public boolean isItemValid(ItemStack stack) { - if (allowEmpty) - return FluidHelper.isEmptyContainer(stack); - if (fluids.length > 0) { - for (Fluid fluid : fluids) - if (FluidHelper.containsFluid(stack, fluid)) - return true; - return false; - } - return FluidHelper.isFilledContainer(stack); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getBackgroundIconIndex() { - if (allowEmpty) - return TextureManager.getInstance().getDefault("slots/container"); - else - return TextureManager.getInstance().getDefault("slots/liquid"); - } - -} diff --git a/src/main/java/forestry/core/gui/slots/SlotOutput.java b/src/main/java/forestry/core/gui/slots/SlotOutput.java index 3f7760d1a..76965a800 100755 --- a/src/main/java/forestry/core/gui/slots/SlotOutput.java +++ b/src/main/java/forestry/core/gui/slots/SlotOutput.java @@ -1,30 +1,30 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.gui.slots; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -/** - * - * @author CovertJaguar - */ -public class SlotOutput extends SlotForestry { - - public SlotOutput(IInventory iinventory, int slotIndex, int posX, int posY) { - super(iinventory, slotIndex, posX, posY); - } - - @Override - public boolean isItemValid(ItemStack itemstack) { - return false; - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui.slots; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +/** + * + * @author CovertJaguar + */ +public class SlotOutput extends SlotWatched { + + public SlotOutput(IInventory iinventory, int slotIndex, int posX, int posY) { + super(iinventory, slotIndex, posX, posY); + } + + @Override + public boolean isItemValid(ItemStack itemstack) { + return false; + } +} diff --git a/src/main/java/forestry/core/gui/slots/SlotWatched.java b/src/main/java/forestry/core/gui/slots/SlotWatched.java new file mode 100644 index 000000000..dcbc23b0a --- /dev/null +++ b/src/main/java/forestry/core/gui/slots/SlotWatched.java @@ -0,0 +1,66 @@ +package forestry.core.gui.slots; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import forestry.core.interfaces.ICrafter; +import forestry.core.render.TextureManager; + +/** + * Slot with an ICrafter callback. + */ +public abstract class SlotWatched extends SlotForestry { + private ICrafter crafter; + private String blockedTexture = "slots/blocked"; + + public SlotWatched(IInventory inventory, int slotIndex, int xPos, int yPos) { + super(inventory, slotIndex, xPos, yPos); + } + + public SlotWatched setCrafter(ICrafter crafter) { + this.crafter = crafter; + return this; + } + + @Override + public boolean getHasStack() { + if (crafter != null && !crafter.canTakeStack(getSlotIndex())) + return false; + else + return super.getHasStack(); + } + + @Override + public ItemStack decrStackSize(int i) { + if (crafter != null && !crafter.canTakeStack(getSlotIndex())) + return null; + else + return super.decrStackSize(i); + } + + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack itemStack) { + if (crafter != null) + crafter.takenFromSlot(getSlotIndex(), true, player); + } + + public SlotWatched setBlockedTexture(String ident) { + blockedTexture = ident; + return this; + } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getBackgroundIconIndex() { + ItemStack stack = getStack(); + if (stack != null && !inventory.isItemValidForSlot(getSlotIndex(), stack)) + return TextureManager.getInstance().getDefault(blockedTexture); + else + return null; + } +} diff --git a/src/main/java/forestry/core/gui/slots/SlotClosed.java b/src/main/java/forestry/core/interfaces/IFilterSlotDelegate.java old mode 100755 new mode 100644 similarity index 61% rename from src/main/java/forestry/core/gui/slots/SlotClosed.java rename to src/main/java/forestry/core/interfaces/IFilterSlotDelegate.java index 98b907272..e410aa810 --- a/src/main/java/forestry/core/gui/slots/SlotClosed.java +++ b/src/main/java/forestry/core/interfaces/IFilterSlotDelegate.java @@ -1,27 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.gui.slots; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -public class SlotClosed extends SlotForestry { - - public SlotClosed(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); - } - - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.interfaces; + +import net.minecraft.item.ItemStack; + +public interface IFilterSlotDelegate { + + /** + * Non-automation version of IInventory's isItemValidForSlot. + * Used to determine if a player can place a stack in a slot. + * + * Combine this with Forestry's access permissions to implement isItemValidForSlot. + */ + boolean canSlotAccept(int slotIndex, ItemStack itemStack); + +} diff --git a/src/main/java/forestry/core/inventory/AlyzerInventory.java b/src/main/java/forestry/core/inventory/AlyzerInventory.java index 3423427c1..20a9ffe51 100644 --- a/src/main/java/forestry/core/inventory/AlyzerInventory.java +++ b/src/main/java/forestry/core/inventory/AlyzerInventory.java @@ -3,10 +3,10 @@ package forestry.core.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -public class AlyzerInventory extends ItemInventory { +import forestry.core.config.ForestryItem; + +public abstract class AlyzerInventory extends ItemInventory { public static final int SLOT_SPECIMEN = 0; public static final int SLOT_ANALYZE_1 = 1; @@ -18,28 +18,38 @@ public class AlyzerInventory extends ItemInventory { protected EntityPlayer player; - public AlyzerInventory(Class itemClass, int slots) { - super(itemClass, slots); - } - public AlyzerInventory(Class itemClass, int size, ItemStack itemstack) { super(itemClass, size, itemstack); } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + protected boolean isEnergy(ItemStack itemstack) { + if (itemstack == null || itemstack.stackSize <= 0) + return false; - NBTTagList nbttaglist = new NBTTagList(); - for (int i = SLOT_ENERGY; i < SLOT_ENERGY + 1; i++) { - if (inventoryStacks[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - inventoryStacks[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } + return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + } + + protected boolean hasSpecimen() { + for (int i = SLOT_SPECIMEN; i <= SLOT_ANALYZE_5; i++) { + if (i == SLOT_ENERGY) + continue; + + ItemStack itemStack = getStackInSlot(i); + if (itemStack != null) + return true; } - nbttagcompound.setTag("Items", nbttaglist); + return false; + } + protected abstract boolean isSpecimen(ItemStack itemStack); + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_ENERGY) { + return isEnergy(itemStack); + } else { + return !hasSpecimen() && isSpecimen(itemStack); + } } } diff --git a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java new file mode 100644 index 000000000..30cd570d3 --- /dev/null +++ b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java @@ -0,0 +1,134 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import forestry.core.config.Defaults; +import forestry.core.utils.StackUtils; + +public class FakeInventoryAdapter implements IInventoryAdapter { + + private static FakeInventoryAdapter instance; + + public static FakeInventoryAdapter instance() { + if (instance == null) { + instance = new FakeInventoryAdapter(); + } + return instance; + } + + private FakeInventoryAdapter() { + + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return false; + } + + @Override + public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + return Defaults.SLOTS_NONE; + } + + @Override + public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { + return false; + } + + @Override + public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + return false; + } + + @Override + public int getSizeInventory() { + return 0; + } + + @Override + public ItemStack getStackInSlot(int p_70301_1_) { + return null; + } + + @Override + public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + return null; + } + + @Override + public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { + + } + + @Override + public String getInventoryName() { + return null; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 0; + } + + @Override + public void markDirty() { + + } + + @Override + public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + return false; + } + + @Override + public void openInventory() { + + } + + @Override + public void closeInventory() { + + } + + @Override + public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { + return false; + } + + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + + } + + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + + } + + @Override + public IInventoryAdapter configureSided(int[] sides, int[] slots) { + return this; + } +} diff --git a/src/main/java/forestry/core/inventory/IInventoryAdapter.java b/src/main/java/forestry/core/inventory/IInventoryAdapter.java new file mode 100644 index 000000000..218257b03 --- /dev/null +++ b/src/main/java/forestry/core/inventory/IInventoryAdapter.java @@ -0,0 +1,12 @@ +package forestry.core.inventory; + +import net.minecraft.inventory.ISidedInventory; + +import forestry.api.core.INBTTagable; +import forestry.core.interfaces.IFilterSlotDelegate; + +public interface IInventoryAdapter extends ISidedInventory, IFilterSlotDelegate, INBTTagable { + + /* Sided */ + public IInventoryAdapter configureSided(int[] sides, int[] slots); +} diff --git a/src/main/java/forestry/core/inventory/InvTools.java b/src/main/java/forestry/core/inventory/InvTools.java index 5cdad4e87..bedc8b679 100755 --- a/src/main/java/forestry/core/inventory/InvTools.java +++ b/src/main/java/forestry/core/inventory/InvTools.java @@ -20,6 +20,7 @@ import java.util.TreeMap; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -35,6 +36,7 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.Optional; +import forestry.core.config.Defaults; import forestry.core.inventory.filters.ArrayStackFilter; import forestry.core.inventory.filters.IStackFilter; import forestry.core.inventory.filters.InvertedStackFilter; @@ -48,6 +50,7 @@ import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.inventory.wrappers.SidedInventoryMapper; import forestry.core.utils.AdjacentTileCache; import forestry.core.utils.PlainInventory; +import forestry.core.utils.StackUtils; import forestry.plugins.PluginManager; import buildcraft.api.transport.IPipeTile; @@ -830,4 +833,252 @@ public abstract class InvTools { stack.stackSize = 127; stack.writeToNBT(data); } + + public static IInventoryAdapter configureSidedUp(IInventoryAdapter inventory, int startSlot, int count) { + return configureSided(inventory, Defaults.FACING_UP, startSlot, count); + } + + public static IInventoryAdapter configureSidedDown(IInventoryAdapter inventory, int startSlot, int count) { + return configureSided(inventory, Defaults.FACING_DOWN, startSlot, count); + } + + public static IInventoryAdapter configureSidedNorthSouth(IInventoryAdapter inventory, int startSlot, int count) { + return configureSided(inventory, Defaults.FACING_NORTHSOUTH, startSlot, count); + } + + public static IInventoryAdapter configureSidedWestEast(IInventoryAdapter inventory, int startSlot, int count) { + return configureSided(inventory, Defaults.FACING_WESTEAST, startSlot, count); + } + + public static IInventoryAdapter configureSidedSides(IInventoryAdapter inventory, int startSlot, int count) { + return configureSided(inventory, Defaults.FACING_SIDES, startSlot, count); + } + + public static IInventoryAdapter configureSided(IInventoryAdapter inventory, int side, int startSlot, int count) { + return configureSided(inventory, new int[]{side}, startSlot, count); + } + + public static IInventoryAdapter configureSided(IInventoryAdapter inventory, int[] sides, int startSlot, int count) { + int[] slots = new int[count]; + for (int i = 0; i < count; i++) { + slots[i] = startSlot + i; + } + + return inventory.configureSided(sides, slots); + } + + /* REMOVAL */ + /** + * Removes a set of items from an inventory. + * Removes the exact items first if they exist, and then removes crafting equivalents. + * If the inventory doesn't have all the required items, returns false without removing anything. + * If stowContainer is true, items with containers will have their container stowed. + */ + public static boolean removeSets(IInventory inventory, int count, ItemStack[] set, int firstSlotIndex, int slotCount, EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { + + ItemStack[] condensedSet = StackUtils.condenseStacks(set, -1, false); + + ItemStack[] stock = getStacks(inventory, firstSlotIndex, slotCount); + if (StackUtils.containsSets(condensedSet, stock, oreDictionary, craftingTools) < count) + return false; + + for (ItemStack stackToRemove : condensedSet) { + stackToRemove.stackSize *= count; + + // try to remove the exact stack first + removeStack(inventory, stackToRemove, firstSlotIndex, slotCount, player, stowContainer, false, false); + + // remove crafting equivalents next + if (stackToRemove.stackSize > 0) + removeStack(inventory, stackToRemove, firstSlotIndex, slotCount, player, stowContainer, oreDictionary, craftingTools); + } + return true; + } + + /** + * Private Helper for removeSetsFromInventory. Assumes removal is possible. + */ + private static void removeStack(IInventory inventory, ItemStack stackToRemove, int firstSlotIndex, int slotCount, EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { + for (int j = firstSlotIndex; j < firstSlotIndex + slotCount; j++) { + ItemStack stackInSlot = inventory.getStackInSlot(j); + if (stackInSlot == null) + continue; + + if (!StackUtils.isCraftingEquivalent(stackToRemove, stackInSlot, oreDictionary, craftingTools)) + continue; + + ItemStack removed = inventory.decrStackSize(j, stackToRemove.stackSize); + stackToRemove.stackSize -= removed.stackSize; + + if (stowContainer && stackToRemove.getItem().hasContainerItem(stackToRemove)) + StackUtils.stowContainerItem(removed, inventory, j, player); + + if (stackToRemove.stackSize == 0) + return; + } + } + + /* CONTAINS */ + public static boolean contains(IInventory inventory, ItemStack query, int startSlot, int slots) { + ItemStack[] queryArray = new ItemStack[]{query}; + return contains(inventory, queryArray, startSlot, slots); + } + + public static boolean contains(IInventory inventory, ItemStack[] query, int startSlot, int slots) { + ItemStack[] stock = getStacks(inventory, startSlot, slots); + return StackUtils.containsSets(query, stock) > 0; + } + + public static boolean containsPercent(IInventory inventory, float percent, int slot1, int length) { + int amount = 0; + int stackMax = 0; + for (ItemStack itemStack : getStacks(inventory, slot1, length)) { + if (itemStack == null) { + stackMax += 64; + continue; + } + + amount += itemStack.stackSize; + stackMax += itemStack.getMaxStackSize(); + } + if (stackMax == 0) + return false; + return ((float) amount / (float) stackMax) >= percent; + } + + public static boolean containsAmount(IInventory inventory, int amount, int slot1, int length) { + int total = 0; + for (ItemStack itemStack : getStacks(inventory, slot1, length)) { + if (itemStack == null) + continue; + + total += itemStack.stackSize; + if (total >= amount) + return true; + } + return false; + } + + public static ItemStack[] getStacks(IInventory inventory) { + ItemStack[] stacks = new ItemStack[inventory.getSizeInventory()]; + for (int i = 0; i < inventory.getSizeInventory(); i++) { + stacks[i] = inventory.getStackInSlot(i); + } + return stacks; + } + + public static ItemStack[] getStacks(IInventory inventory, int slot1, int length) { + ItemStack[] result = new ItemStack[length]; + for (int i = slot1; i < slot1 + length; i++) { + result[i - slot1] = inventory.getStackInSlot(i); + } + return result; + } + + public static boolean tryAddStacksCopy(IInventory inventory, ItemStack[] stacks, boolean all) { + return tryAddStacksCopy(inventory, stacks, 0, inventory.getSizeInventory(), all); + } + + public static boolean tryAddStacksCopy(IInventory inventory, ItemStack[] stacks, int startSlot, int slots, boolean all) { + + for (ItemStack stack : stacks) { + if (stack == null) + continue; + + if (!tryAddStack(inventory, stack.copy(), startSlot, slots, all)) + return false; + } + + return true; + } + + public static boolean tryAddStacks(IInventory inventory, ItemStack[] stacks, boolean all) { + + boolean addedAll = true; + for (ItemStack stack : stacks) { + if (stack == null) + continue; + + if (!tryAddStack(inventory, stack, all)) + addedAll = false; + } + + return addedAll; + } + + public static boolean tryAddStack(IInventory inventory, ItemStack stack, boolean all) { + return tryAddStack(inventory, stack, 0, inventory.getSizeInventory(), all); + } + + /** + * Tries to add a stack to the specified slot range. + */ + public static boolean tryAddStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all) { + return tryAddStack(inventory, stack, startSlot, slots, all, true); + } + + public static boolean tryAddStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) { + int added = addStack(inventory, stack, startSlot, slots, all, doAdd); + if (all) + return added == stack.stackSize; + else + return added > 0; + } + + public static int addStack(IInventory inventory, ItemStack stack, boolean all, boolean doAdd) { + return addStack(inventory, stack, 0, inventory.getSizeInventory(), all, doAdd); + } + + public static int addStack(IInventory inventory, ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) { + + int added = 0; + // Add to existing stacks first + for (int i = startSlot; i < startSlot + slots; i++) { + + // Empty slot. Add + if (inventory.getStackInSlot(i) == null) + continue; + + // Already occupied by different item, skip this slot. + if (!inventory.getStackInSlot(i).isItemEqual(stack)) + continue; + if (!ItemStack.areItemStackTagsEqual(inventory.getStackInSlot(i), stack)) + continue; + + int remain = stack.stackSize - added; + int space = inventory.getStackInSlot(i).getMaxStackSize() - inventory.getStackInSlot(i).stackSize; + // No space left, skip this slot. + if (space <= 0) + continue; + // Enough space + if (space >= remain) { + if (doAdd) + inventory.getStackInSlot(i).stackSize += remain; + return stack.stackSize; + } + + // Not enough space + if (doAdd) + inventory.getStackInSlot(i).stackSize = inventory.getStackInSlot(i).getMaxStackSize(); + + added += space; + } + + if (added >= stack.stackSize) + return added; + + for (int i = startSlot; i < startSlot + slots; i++) { + if (inventory.getStackInSlot(i) != null) + continue; + + if (doAdd) { + inventory.setInventorySlotContents(i, stack.copy()); + inventory.getStackInSlot(i).stackSize = stack.stackSize - added; + } + return stack.stackSize; + + } + + return added; + } } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index 1cdbf5359..7ff63cc36 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -10,23 +10,24 @@ ******************************************************************************/ package forestry.core.inventory; -import forestry.api.core.INBTTagable; -import forestry.core.config.Defaults; -import forestry.core.utils.PlainInventory; -import forestry.core.utils.StackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import forestry.core.config.Defaults; +import forestry.core.utils.PlainInventory; +import forestry.core.utils.StackUtils; + /** * With permission from Krapht. */ -public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagable { +public class InventoryAdapter implements IInventoryAdapter { + + protected final IInventory inventory; + private boolean allowAutomation = true; - private final IInventory inventory; //private boolean debug = false; public InventoryAdapter(int size, String name) { @@ -42,6 +43,11 @@ public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagabl configureSided(); } + public InventoryAdapter disableAutomation() { + this.allowAutomation = false; + return this; + } + // public InventoryAdapter enableDebug() { // this.debug = true; // return this; @@ -60,221 +66,7 @@ public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagabl return copy; } - public ItemStack[] getStacks() { - ItemStack[] stacks = new ItemStack[inventory.getSizeInventory()]; - for (int i = 0; i < inventory.getSizeInventory(); i++) { - stacks[i] = inventory.getStackInSlot(i); - } - return stacks; - } - public ItemStack[] getStacks(int slot1, int length) { - ItemStack[] result = new ItemStack[length]; - for (int i = slot1; i < slot1 + length; i++) { - result[i - slot1] = inventory.getStackInSlot(i); - } - return result; - } - - public boolean tryAddStacksCopy(ItemStack[] stacks, boolean all) { - return tryAddStacksCopy(stacks, 0, this.getSizeInventory(), all); - } - - public boolean tryAddStacksCopy(ItemStack[] stacks, int startSlot, int slots, boolean all) { - - for (ItemStack stack : stacks) { - if (stack == null) - continue; - - if (!tryAddStack(stack.copy(), startSlot, slots, all)) - return false; - } - - return true; - } - - public boolean tryAddStacks(ItemStack[] stacks, boolean all) { - - boolean addedAll = true; - for (ItemStack stack : stacks) { - if (stack == null) - continue; - - if (!tryAddStack(stack, all)) - addedAll = false; - } - - return addedAll; - } - - public boolean tryAddStack(ItemStack stack, boolean all) { - return tryAddStack(stack, 0, this.getSizeInventory(), all); - } - - /** - * Tries to add a stack to the specified slot range. - */ - public boolean tryAddStack(ItemStack stack, int startSlot, int slots, boolean all) { - return tryAddStack(stack, startSlot, slots, all, true); - } - - public boolean tryAddStack(ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) { - int added = addStack(stack, startSlot, slots, all, doAdd); - if (all) - return added == stack.stackSize; - else - return added > 0; - } - - public int addStack(ItemStack stack, boolean all, boolean doAdd) { - return addStack(stack, 0, this.getSizeInventory(), all, doAdd); - } - - public int addStack(ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) { - - int added = 0; - // Add to existing stacks first - for (int i = startSlot; i < startSlot + slots; i++) { - - // Empty slot. Add - if (inventory.getStackInSlot(i) == null) - continue; - - // Already occupied by different item, skip this slot. - if (!inventory.getStackInSlot(i).isItemEqual(stack)) - continue; - if (!ItemStack.areItemStackTagsEqual(inventory.getStackInSlot(i), stack)) - continue; - - int remain = stack.stackSize - added; - int space = inventory.getStackInSlot(i).getMaxStackSize() - inventory.getStackInSlot(i).stackSize; - // No space left, skip this slot. - if (space <= 0) - continue; - // Enough space - if (space >= remain) { - if (doAdd) - inventory.getStackInSlot(i).stackSize += remain; - return stack.stackSize; - } - - // Not enough space - if (doAdd) - inventory.getStackInSlot(i).stackSize = inventory.getStackInSlot(i).getMaxStackSize(); - - added += space; - } - - if (added >= stack.stackSize) - return added; - - for (int i = startSlot; i < startSlot + slots; i++) { - if (inventory.getStackInSlot(i) != null) - continue; - - if (doAdd) { - setInventorySlotContents(i, stack.copy()); - inventory.getStackInSlot(i).stackSize = stack.stackSize - added; - } - return stack.stackSize; - - } - - return added; - - } - - /* CONTAINS */ - public boolean contains(ItemStack query, int startSlot, int slots) { - ItemStack[] queryArray = new ItemStack[]{query}; - return contains(queryArray, startSlot, slots); - } - - public boolean contains(ItemStack[] query, int startSlot, int slots) { - ItemStack[] stock = getStacks(startSlot, slots); - return StackUtils.containsSets(query, stock) > 0; - } - - public boolean containsPercent(float percent, int slot1, int length) { - int amount = 0; - int stackMax = 0; - for (ItemStack itemStack : getStacks(slot1, length)) { - if (itemStack == null) { - stackMax += 64; - continue; - } - - amount += itemStack.stackSize; - stackMax += itemStack.getMaxStackSize(); - } - if (stackMax == 0) - return false; - return ((float) amount / (float) stackMax) >= percent; - } - - public boolean containsAmount(int amount, int slot1, int length) { - int total = 0; - for (ItemStack itemStack : getStacks(slot1, length)) { - if (itemStack == null) - continue; - - total += itemStack.stackSize; - if (total >= amount) - return true; - } - return false; - } - - /* REMOVAL */ - /** - * Removes a set of items from an inventory. - * Removes the exact items first if they exist, and then removes crafting equivalents. - * If the inventory doesn't have all the required items, returns false without removing anything. - * If stowContainer is true, items with containers will have their container stowed. - */ - public boolean removeSets(int count, ItemStack[] set, int firstSlotIndex, int slotCount, EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { - - ItemStack[] condensedSet = StackUtils.condenseStacks(set, -1, false); - - ItemStack[] stock = getStacks(firstSlotIndex, slotCount); - if (StackUtils.containsSets(condensedSet, stock, oreDictionary, craftingTools) < count) - return false; - - for (ItemStack stackToRemove : condensedSet) { - stackToRemove.stackSize *= count; - - // try to remove the exact stack first - removeStack(stackToRemove, firstSlotIndex, slotCount, player, stowContainer, false, false); - - // remove crafting equivalents next - if (stackToRemove.stackSize > 0) - removeStack(stackToRemove, firstSlotIndex, slotCount, player, stowContainer, oreDictionary, craftingTools); - } - return true; - } - - /** - * Private Helper for removeSetsFromInventory. Assumes removal is possible. - */ - private void removeStack(ItemStack stackToRemove, int firstSlotIndex, int slotCount, EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { - for (int j = firstSlotIndex; j < firstSlotIndex + slotCount; j++) { - ItemStack stackInSlot = getStackInSlot(j); - if (stackInSlot == null) - continue; - - if (!StackUtils.isCraftingEquivalent(stackToRemove, stackInSlot, oreDictionary, craftingTools)) - continue; - - ItemStack removed = decrStackSize(j, stackToRemove.stackSize); - stackToRemove.stackSize -= removed.stackSize; - - if (stowContainer && stackToRemove.getItem().hasContainerItem(stackToRemove)) - StackUtils.stowContainerItem(removed, this, j, player); - - if (stackToRemove.stackSize == 0) - return; - } - } /* IINVENTORY */ @Override @@ -332,6 +124,11 @@ public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagabl return true; } + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return true; + } + @Override public void openInventory() { } @@ -345,47 +142,17 @@ public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagabl @Override public int[] getAccessibleSlotsFromSide(int side) { - return slotMap[side]; + if (allowAutomation) + return slotMap[side]; + return Defaults.SLOTS_NONE; } private void configureSided() { slotMap = new int[6][0]; - configureSided(Defaults.FACINGS, 0, getSizeInventory()); - } - - public InventoryAdapter configureSidedUp(int startSlot, int count) { - return configureSided(Defaults.FACING_UP, startSlot, count); - } - - public InventoryAdapter configureSidedDown(int startSlot, int count) { - return configureSided(Defaults.FACING_DOWN, startSlot, count); - } - - public InventoryAdapter configureSidedNorthSouth(int startSlot, int count) { - return configureSided(Defaults.FACING_NORTHSOUTH, startSlot, count); - } - - public InventoryAdapter configureSidedWestEast(int startSlot, int count) { - return configureSided(Defaults.FACING_WESTEAST, startSlot, count); - } - - public InventoryAdapter configureSidedSides(int startSlot, int count) { - return configureSided(Defaults.FACING_SIDES, startSlot, count); - } - - public InventoryAdapter configureSided(int side, int startSlot, int count) { - return configureSided(new int[]{side}, startSlot, count); - } - - public InventoryAdapter configureSided(int[] sides, int startSlot, int count) { - int[] slots = new int[count]; - for (int i = 0; i < count; i++) { - slots[i] = startSlot + i; - } - - return configureSided(sides, slots); + InvTools.configureSided(this, Defaults.FACINGS, 0, getSizeInventory()); } + @Override public InventoryAdapter configureSided(int[] sides, int[] slots) { for (int side : sides) { slotMap[side] = slots; @@ -401,7 +168,7 @@ public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagabl @Override public boolean canExtractItem(int slot, ItemStack stack, int side) { - return true; + return false; } /* SAVING & LOADING */ @@ -432,5 +199,4 @@ public class InventoryAdapter implements IInventory, ISidedInventory, INBTTagabl } nbttagcompound.setTag(inventory.getInventoryName(), nbttaglist); } - } diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 267d099da..fac014e21 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.inventory; -import forestry.api.core.INBTTagable; -import forestry.core.utils.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -19,24 +17,22 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class ItemInventory implements IInventory, INBTTagable { +import forestry.api.core.INBTTagable; +import forestry.core.interfaces.IFilterSlotDelegate; +import forestry.core.utils.StackUtils; +import forestry.core.utils.Utils; + +public class ItemInventory implements IInventory, IFilterSlotDelegate, INBTTagable { public final Class itemClass; - public boolean isItemInventory = false; + public final boolean isItemInventory; public ItemStack parent; protected ItemStack[] inventoryStacks; - protected ItemInventory(Class itemClass) { - this.itemClass = itemClass; - } - - public ItemInventory(Class itemClass, int slots) { - this(itemClass); - inventoryStacks = new ItemStack[slots]; - } - public ItemInventory(Class itemClass, int size, ItemStack itemstack) { - this(itemClass, size); + this.itemClass = itemClass; + + inventoryStacks = new ItemStack[size]; parent = itemstack; isItemInventory = true; @@ -77,46 +73,18 @@ public class ItemInventory implements IInventory, INBTTagable { } public void onGuiSaved(EntityPlayer player) { - parent = findParent(player); + parent = findParentInInventory(player); if (parent != null) save(); } - public ItemStack findParent(EntityPlayer player) { - if (parent == null) - return null; - - NBTTagCompound parentNBT = parent.getTagCompound(); - if (parentNBT == null) - return null; - - int uid = parentNBT.getInteger("UID"); - + public ItemStack findParentInInventory(EntityPlayer player) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stack = player.inventory.getStackInSlot(i); - if (stack == null) - continue; - if(stack.getItem() != parent.getItem()) - continue; - NBTTagCompound slotNBT = stack.getTagCompound(); - if (slotNBT == null) - continue; - if (uid == slotNBT.getInteger("UID")) - return player.inventory.getStackInSlot(i); + if (StackUtils.isIdenticalItem(stack, parent)) + return stack; } - return null; - } - - public boolean matchesUID(int otherId) { - if (parent == null) - return false; - - NBTTagCompound nbt = parent.getTagCompound(); - if (nbt == null) - return false; - - int uid = nbt.getInteger("UID"); - return uid == otherId; + return parent; } public void save() { @@ -220,7 +188,12 @@ public class ItemInventory implements IInventory, INBTTagable { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + return canSlotAccept(slotIndex, itemStack); + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { return true; } diff --git a/src/main/java/forestry/core/inventory/ItemInventoryBackpack.java b/src/main/java/forestry/core/inventory/ItemInventoryBackpack.java new file mode 100644 index 000000000..fc38a1149 --- /dev/null +++ b/src/main/java/forestry/core/inventory/ItemInventoryBackpack.java @@ -0,0 +1,33 @@ +package forestry.core.inventory; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import forestry.api.storage.IBackpackDefinition; +import forestry.storage.items.ItemBackpack; + +public class ItemInventoryBackpack extends ItemInventory { + + private final IBackpackDefinition backpackDefinition; + + public ItemInventoryBackpack(Class itemClass, int size, ItemStack itemstack) { + super(itemClass, size, itemstack); + + if (parent == null) + throw new IllegalArgumentException("Parent cannot be null."); + + Item item = parent.getItem(); + if (!(item instanceof ItemBackpack)) + throw new IllegalArgumentException("Parent must be a backpack."); + + this.backpackDefinition = ((ItemBackpack) item).getDefinition(); + + if (this.backpackDefinition == null) + throw new IllegalArgumentException("Backpack must have a backpack definition."); + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return backpackDefinition.isValidItem(null, itemStack); + } +} diff --git a/src/main/java/forestry/core/inventory/TileInventoryAdapter.java b/src/main/java/forestry/core/inventory/TileInventoryAdapter.java index 3a2d6ca95..6708a738f 100755 --- a/src/main/java/forestry/core/inventory/TileInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/TileInventoryAdapter.java @@ -10,12 +10,10 @@ ******************************************************************************/ package forestry.core.inventory; -import forestry.core.gadgets.TileForestry; -import forestry.core.utils.EnumAccess; -import forestry.core.utils.Utils; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import forestry.core.gadgets.TileForestry; + public class TileInventoryAdapter extends InventoryAdapter { private final TileForestry tile; @@ -29,26 +27,14 @@ public class TileInventoryAdapter extends InventoryAdapter { this.tile = tile; } - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if (!Utils.isUseableByPlayer(player, tile)) - return false; - return tile.allowsViewing(player); - } - @Override public void markDirty() { super.markDirty(); tile.markDirty(); } - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return true; - } - @Override public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { - return true; + return false; } } diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index fb7014aa5..b25c6fb4c 100755 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -227,10 +227,6 @@ public class PacketHandler { if (tile instanceof IInventory) { ((IInventory) tile).setInventorySlotContents(packet.slotIndex, packet.itemstack); - } else if (tile instanceof TileForestry) { - IInventory inventory = ((TileForestry) tile).getInternalInventory(); - - if (inventory != null) inventory.setInventorySlotContents(packet.slotIndex, packet.itemstack); } } diff --git a/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java b/src/main/java/forestry/core/utils/GuiUtil.java old mode 100755 new mode 100644 similarity index 51% rename from src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java rename to src/main/java/forestry/core/utils/GuiUtil.java index cec92c298..e5234b8a1 --- a/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java +++ b/src/main/java/forestry/core/utils/GuiUtil.java @@ -1,25 +1,19 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.gui; - -import forestry.apiculture.items.ItemBeeGE; -import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerAlyzer; -import net.minecraft.entity.player.InventoryPlayer; - -public class ContainerBeealyzer extends ContainerAlyzer { - - public ContainerBeealyzer(InventoryPlayer inventoryplayer, BeealyzerInventory inventory) { - super(inventoryplayer, inventory, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop }, ItemBeeGE.class); - } - -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.utils; + +public class GuiUtil { + + public static boolean isIndexInRange(int index, int start, int count) { + return (index >= start) && (index < start + count); + } + +} diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index 93a5d0215..144977116 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.core.utils; -import forestry.core.config.Defaults; -import forestry.core.inventory.InventoryAdapter; import java.util.ArrayList; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -23,10 +22,14 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.oredict.OreDictionary; +import forestry.core.config.Defaults; +import forestry.core.inventory.InvTools; + public class StackUtils { public static final ItemStack[] EMPTY_STACK_ARRAY = new ItemStack[0]; @@ -225,6 +228,14 @@ public class StackUtils { return condensed.toArray(new ItemStack[condensed.size()]); } + public static boolean containsItemStack(Iterable list, ItemStack itemStack) { + for (ItemStack listStack : list) { + if (isIdenticalItem(listStack, itemStack)) + return true; + } + return false; + } + /** * Counts how many full sets are contained in the passed stock */ @@ -323,7 +334,7 @@ public class StackUtils { return isCraftingTool(phantom) && phantom.getItem() == actual.getItem(); } - public static void stowContainerItem(ItemStack itemstack, InventoryAdapter stowing, int slotIndex, EntityPlayer player) { + public static void stowContainerItem(ItemStack itemstack, IInventory stowing, int slotIndex, EntityPlayer player) { if (!itemstack.getItem().hasContainerItem(itemstack)) return; @@ -337,12 +348,12 @@ public class StackUtils { if (container != null) { if (itemstack.getItem().doesContainerItemLeaveCraftingGrid(itemstack)) { - if (!stowing.tryAddStack(container, true)) + if (!InvTools.tryAddStack(stowing, container, true)) if (!player.inventory.addItemStackToInventory(container)) player.dropPlayerItemWithRandomChoice(container, true); } else { - if (!stowing.tryAddStack(container, slotIndex, 1, true)) - if (!stowing.tryAddStack(container, true)) + if (!InvTools.tryAddStack(stowing, container, slotIndex, 1, true)) + if (!InvTools.tryAddStack(stowing, container, true)) player.dropPlayerItemWithRandomChoice(container, true); } } diff --git a/src/main/java/forestry/core/utils/Utils.java b/src/main/java/forestry/core/utils/Utils.java index 9869e0cd5..4d7bf0567 100755 --- a/src/main/java/forestry/core/utils/Utils.java +++ b/src/main/java/forestry/core/utils/Utils.java @@ -71,41 +71,34 @@ public class Utils { } } else { - IInventory inventory; - if (tile instanceof IInventory) - inventory = (IInventory) tile; - else - inventory = tile.getInternalInventory(); + for (int slot = 0; slot < tile.getSizeInventory(); slot++) { - if (inventory != null) { - for (int slot = 0; slot < inventory.getSizeInventory(); slot++) { + ItemStack itemstack = tile.getStackInSlot(slot); - ItemStack itemstack = inventory.getStackInSlot(slot); + if (itemstack == null) + continue; - if (itemstack == null) - continue; + float f = world.rand.nextFloat() * 0.8F + 0.1F; + float f1 = world.rand.nextFloat() * 0.8F + 0.1F; + float f2 = world.rand.nextFloat() * 0.8F + 0.1F; - float f = world.rand.nextFloat() * 0.8F + 0.1F; - float f1 = world.rand.nextFloat() * 0.8F + 0.1F; - float f2 = world.rand.nextFloat() * 0.8F + 0.1F; + while (itemstack.stackSize > 0) { - while (itemstack.stackSize > 0) { + int stackPartial = world.rand.nextInt(21) + 10; + if (stackPartial > itemstack.stackSize) + stackPartial = itemstack.stackSize; + ItemStack drop = itemstack.splitStack(stackPartial); + EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, drop); + float accel = 0.05F; + entityitem.motionX = (float) world.rand.nextGaussian() * accel; + entityitem.motionY = (float) world.rand.nextGaussian() * accel + 0.2F; + entityitem.motionZ = (float) world.rand.nextGaussian() * accel; + world.spawnEntityInWorld(entityitem); - int stackPartial = world.rand.nextInt(21) + 10; - if (stackPartial > itemstack.stackSize) - stackPartial = itemstack.stackSize; - ItemStack drop = itemstack.splitStack(stackPartial); - EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, drop); - float accel = 0.05F; - entityitem.motionX = (float) world.rand.nextGaussian() * accel; - entityitem.motionY = (float) world.rand.nextGaussian() * accel + 0.2F; - entityitem.motionZ = (float) world.rand.nextGaussian() * accel; - world.spawnEntityInWorld(entityitem); - - } - - inventory.setInventorySlotContents(slot, null); } + + tile.setInventorySlotContents(slot, null); + } } diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 7af2eb3b0..0f969f272 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -10,6 +10,20 @@ ******************************************************************************/ package forestry.energy.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; @@ -24,21 +38,10 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class EngineBronze extends Engine implements ISidedInventory, ILiquidTankContainer { @@ -79,7 +82,17 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank super(Defaults.ENGINE_BRONZE_HEAT_MAX, 300000, 5000); setHints(Config.hints.get("engine.bronze")); - setInternalInventory(new TileInventoryAdapter(this, 1, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 1, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_CAN) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return tankManager.accepts(fluid); + } + + return false; + } + }); fuelTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FuelManager.bronzeEngineFuel.keySet()); fuelTank.tankMode = StandardTank.TankMode.INPUT; @@ -104,7 +117,7 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank if (worldObj.getTotalWorldTime() % 20 * 10 != 0) return; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Check if we have suitable items waiting in the item slot if (inventory.getStackInSlot(SLOT_CAN) != null) FluidHelper.drainContainers(tankManager, inventory, SLOT_CAN); @@ -340,88 +353,6 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank iCrafting.sendProgressBarUpdate(containerEngine, i + 5, currentFluidId); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (slotIndex == SLOT_CAN) { - FluidStack fluid = FluidHelper.getFluidStackInContainer(itemstack); - if (fluid == null || fluid.amount <= 0) - return false; - return fuelTank.accepts(fluid.getFluid()) || heatingTank.accepts(fluid.getFluid()); - } - - return getInternalInventory().isItemValidForSlot(slotIndex, itemstack); - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { - return false; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack stack, int side) { - return isItemValidForSlot(slotIndex, stack); - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - // IFluidHandler @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 2afdfc453..febd882a9 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -38,10 +38,12 @@ import forestry.core.config.ForestryItem; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; import forestry.core.inventory.AdjacentInventoryCache; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.GuiId; +import forestry.core.utils.GuiUtil; import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; @@ -67,7 +69,17 @@ public class EngineCopper extends Engine implements ISidedInventory { setHints(Config.hints.get("engine.copper")); ashForItem = Defaults.ENGINE_COPPER_ASH_FOR_ITEM; - setInternalInventory(new TileInventoryAdapter(this, 5, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 5, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return slotIndex == SLOT_FUEL && FuelManager.copperEngineFuel.containsKey(itemStack); + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return GuiUtil.isIndexInRange(slotIndex, SLOT_WASTE_1, SLOT_WASTE_COUNT); + } + }); } @Override @@ -76,7 +88,7 @@ public class EngineCopper extends Engine implements ISidedInventory { } private int getFuelSlot() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_FUEL) == null) return -1; @@ -87,7 +99,7 @@ public class EngineCopper extends Engine implements ISidedInventory { } private int getFreeWasteSlot() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for (int i = SLOT_WASTE_1; i <= SLOT_WASTE_COUNT; i++) { if (inventory.getStackInSlot(i) == null) return i; @@ -143,7 +155,7 @@ public class EngineCopper extends Engine implements ISidedInventory { int wasteslot = getFreeWasteSlot(); if (fuelslot >= 0 && wasteslot >= 0) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); burnTime = totalBurnTime = determineBurnDuration(inventory.getStackInSlot(fuelslot)); if (burnTime > 0) { fuelItem = inventory.getStackInSlot(fuelslot).getItem(); @@ -195,7 +207,7 @@ public class EngineCopper extends Engine implements ISidedInventory { // If we have reached the necessary amount, we need to add ash int wasteslot = getFreeWasteSlot(); if (wasteslot >= 0) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(wasteslot) == null) inventory.setInventorySlotContents(wasteslot, ForestryItem.ash.getItemStack()); else @@ -229,7 +241,7 @@ public class EngineCopper extends Engine implements ISidedInventory { /* AUTO-EJECTING */ private IInventory getWasteInventory() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory == null) return null; @@ -265,7 +277,7 @@ public class EngineCopper extends Engine implements ISidedInventory { if (fuelSlot < 0) return false; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); return ((float) inventory.getStackInSlot(fuelSlot).stackSize / (float) inventory.getStackInSlot(fuelSlot).getMaxStackSize()) > percentage; } @@ -331,88 +343,6 @@ public class EngineCopper extends Engine implements ISidedInventory { iCrafting.sendProgressBarUpdate(containerEngine, 4, heat); } - // / IINVENTORY - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - return slotIndex == SLOT_FUEL && FuelManager.copperEngineFuel.containsKey(itemstack); - } - - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex >= SLOT_WASTE_1 && slotIndex < SLOT_WASTE_1 + SLOT_WASTE_COUNT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index 47e9d0c57..ba782cca4 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -10,6 +10,13 @@ ******************************************************************************/ package forestry.energy.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.ForestryAPI; @@ -26,13 +33,9 @@ import forestry.core.network.GuiId; import forestry.core.utils.DelayTimer; import forestry.core.utils.EnumTankLevel; import forestry.plugins.PluginIC2; + import ic2.api.energy.prefab.BasicSink; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import ic2.api.item.ElectricItem; public class EngineTin extends Engine implements ISocketable, IInventory { @@ -50,7 +53,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { } } - private static final short batterySlot = 0; + public static final short SLOT_BATTERY = 0; private final InventoryAdapter sockets = new InventoryAdapter(1, "sockets"); private final EuConfig euConfig = new EuConfig(Defaults.ENGINE_TIN_EU_FOR_CYCLE, Defaults.ENGINE_TIN_ENERGY_PER_CYCLE, Defaults.ENGINE_TIN_MAX_EU_STORED); @@ -62,7 +65,15 @@ public class EngineTin extends Engine implements ISocketable, IInventory { super(Defaults.ENGINE_TIN_HEAT_MAX, 100000, 4000); setHints(Config.hints.get("engine.tin")); - setInternalInventory(new TileInventoryAdapter(this, 1, "electrical")); + setInternalInventory(new TileInventoryAdapter(this, 1, "electrical") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_BATTERY) { + return ElectricItem.manager.getCharge(itemStack) > 0; + } + return false; + } + }); if (PluginIC2.instance.isAvailable()) ic2EnergySink = new BasicSink(this, euConfig.euStorage, 3); @@ -166,8 +177,8 @@ public class EngineTin extends Engine implements ISocketable, IInventory { return; } - if (getInternalInventory().getStackInSlot(batterySlot) != null) - replenishFromBattery(batterySlot); + if (getInternalInventory().getStackInSlot(SLOT_BATTERY) != null) + replenishFromBattery(SLOT_BATTERY); // Updating of gui delayed to prevent it from going crazy if (!delayUpdateTimer.delayPassed(worldObj, 80)) @@ -270,67 +281,6 @@ public class EngineTin extends Engine implements ISocketable, IInventory { ic2EnergySink.setCapacity(euConfig.euStorage); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return getInternalInventory().isItemValidForSlot(slotIndex, itemstack); - } - - //TODO: Add ISideInventory and clarify allowed items - /* ISOCKETABLE */ @Override public int getSocketCount() { diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 4c6e7146b..faf2f23f6 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -10,6 +10,18 @@ ******************************************************************************/ package forestry.energy.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; @@ -22,22 +34,14 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; import forestry.plugins.PluginIC2; + import ic2.api.energy.prefab.BasicSource; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class MachineGenerator extends TileBase implements ISidedInventory, ILiquidTankContainer, IRenderableMachine { @@ -54,7 +58,17 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu public MachineGenerator() { setHints(Config.hints.get("generator")); - setInternalInventory(new TileInventoryAdapter(this, 1, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 1, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_CAN) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return tankManager.accepts(fluid); + } + + return false; + } + }); resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FuelManager.generatorFuel.keySet()); tankManager = new TankManager(resourceTank); @@ -63,11 +77,6 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu ic2EnergySource = new BasicSource(this, maxEnergy, 1); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.GeneratorGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -114,7 +123,7 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu // Check inventory slots for fuel // Check if we have suitable items waiting in the item slot - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_CAN) != null) FluidHelper.drainContainers(tankManager, inventory, SLOT_CAN); @@ -189,83 +198,6 @@ public class MachineGenerator extends TileBase implements ISidedInventory, ILiqu iCrafting.sendProgressBarUpdate(container, firstMessageId, (short) ic2EnergySource.getEnergyStored()); } - /* IINVENTORY */ - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack stack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, stack)) - return false; - - if (slotIndex == SLOT_CAN) { - Fluid fluid = FluidHelper.getFluidInContainer(stack); - return fluid != null && FuelManager.generatorFuel.containsKey(fluid); - } - return false; - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { - return false; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack stack, int side) { - return isItemValidForSlot(slotIndex, stack); - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/forestry/energy/gui/ContainerEngineBronze.java b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java index dc964ac24..32876b6c8 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineBronze.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java @@ -10,21 +10,23 @@ ******************************************************************************/ package forestry.energy.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotLiquidContainer; -import forestry.energy.gadgets.EngineBronze; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; +import forestry.energy.gadgets.EngineBronze; + public class ContainerEngineBronze extends ContainerLiquidTanks { protected final EngineBronze engine; public ContainerEngineBronze(InventoryPlayer player, EngineBronze engine) { - super(engine, engine); + super(engine); this.engine = engine; - this.addSlotToContainer(new SlotLiquidContainer(engine, EngineBronze.SLOT_CAN, 143, 40)); + + this.addSlotToContainer(new SlotFiltered(engine, EngineBronze.SLOT_CAN, 143, 40)); int i; for (i = 0; i < 3; ++i) { diff --git a/src/main/java/forestry/energy/gui/ContainerEngineCopper.java b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java index 0d75f1d80..ef6e5e31c 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineCopper.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java @@ -10,13 +10,15 @@ ******************************************************************************/ package forestry.energy.gui; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; -import forestry.energy.gadgets.EngineCopper; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.energy.gadgets.EngineCopper; + public class ContainerEngineCopper extends ContainerForestry { protected final EngineCopper engine; @@ -25,12 +27,13 @@ public class ContainerEngineCopper extends ContainerForestry { super(tile); this.engine = tile; - this.addSlotToContainer(new Slot(tile, 0, 44, 46)); - this.addSlotToContainer(new SlotClosed(tile, 1, 98, 35)); - this.addSlotToContainer(new SlotClosed(tile, 2, 98, 53)); - this.addSlotToContainer(new SlotClosed(tile, 3, 116, 35)); - this.addSlotToContainer(new SlotClosed(tile, 4, 116, 53)); + this.addSlotToContainer(new SlotFiltered(tile, 0, 44, 46)); + + this.addSlotToContainer(new SlotOutput(tile, 1, 98, 35)); + this.addSlotToContainer(new SlotOutput(tile, 2, 98, 53)); + this.addSlotToContainer(new SlotOutput(tile, 3, 116, 35)); + this.addSlotToContainer(new SlotOutput(tile, 4, 116, 53)); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 9; ++j) { diff --git a/src/main/java/forestry/energy/gui/ContainerEngineTin.java b/src/main/java/forestry/energy/gui/ContainerEngineTin.java index 4ffdcc26c..1ba9796ad 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineTin.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineTin.java @@ -10,12 +10,14 @@ ******************************************************************************/ package forestry.energy.gui; -import forestry.core.gui.ContainerSocketed; -import forestry.energy.gadgets.EngineTin; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerSocketed; +import forestry.core.gui.slots.SlotFiltered; +import forestry.energy.gadgets.EngineTin; + public class ContainerEngineTin extends ContainerSocketed { protected final EngineTin tile; @@ -24,7 +26,8 @@ public class ContainerEngineTin extends ContainerSocketed { super(tile, tile); this.tile = tile; - this.addSlotToContainer(new Slot(tile, 0, 84, 53)); + + this.addSlotToContainer(new SlotFiltered(tile, EngineTin.SLOT_BATTERY, 84, 53)); int i; for (i = 0; i < 3; ++i) diff --git a/src/main/java/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java index 7b5cd5b19..e78b0f858 100755 --- a/src/main/java/forestry/energy/gui/ContainerGenerator.java +++ b/src/main/java/forestry/energy/gui/ContainerGenerator.java @@ -10,21 +10,23 @@ ******************************************************************************/ package forestry.energy.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotLiquidContainer; -import forestry.energy.gadgets.MachineGenerator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; +import forestry.energy.gadgets.MachineGenerator; + public class ContainerGenerator extends ContainerLiquidTanks { protected final MachineGenerator tile; public ContainerGenerator(InventoryPlayer player, MachineGenerator tile) { - super(tile, tile); + super(tile); this.tile = tile; - this.addSlotToContainer(new SlotLiquidContainer(tile, MachineGenerator.SLOT_CAN, 22, 38)); + + this.addSlotToContainer(new SlotFiltered(tile, MachineGenerator.SLOT_CAN, 22, 38)); for (int i = 0; i < 3; ++i) { for (int var4 = 0; var4 < 9; ++var4) { diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 221f58457..76799a2ac 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -10,8 +10,31 @@ ******************************************************************************/ package forestry.factory.gadgets; -import buildcraft.api.statements.ITriggerExternal; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Stack; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import cpw.mods.fml.common.Optional; + import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICraftingProvider; import forestry.core.EnumErrorCode; @@ -23,31 +46,15 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; import forestry.factory.triggers.FactoryTriggers; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Stack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; + +import buildcraft.api.statements.ITriggerExternal; public class MachineBottler extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -146,18 +153,29 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq public MachineBottler() { super(1100, 50, 4000); - setInternalInventory(new TileInventoryAdapter(this, 3, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 3, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_RESOURCE) { + return FluidContainerRegistry.isEmptyContainer(itemStack); + } else if (slotIndex == SLOT_CAN) { + FluidStack fluidStack = FluidHelper.getFluidStackInContainer(itemStack); + return RecipeManager.isInput(fluidStack); + } + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex == SLOT_PRODUCT; + } + }); setHints(Config.hints.get("bottler")); resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); tankManager = new TankManager(resourceTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.BottlerGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -211,7 +229,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq if (worldObj.getTotalWorldTime() % 20 * 10 != 0) return; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Check if we have suitable items waiting in the item slot if (inventory.getStackInSlot(SLOT_CAN) != null) @@ -257,7 +275,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq // We are done, add products to queue and remove resources pendingProducts.push(currentRecipe.bottled.copy()); - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); inventory.decrStackSize(SLOT_RESOURCE, 1); resourceTank.drain(currentRecipe.input.amount, true); checkRecipe(); @@ -269,7 +287,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } public void checkRecipe() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); Recipe sameRec = RecipeManager.findMatchingRecipe(resourceTank.getFluid(), inventory.getStackInSlot(SLOT_RESOURCE)); if (sameRec == null) @@ -307,7 +325,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } private boolean addProduct(ItemStack product, boolean all) { - return getInternalInventory().tryAddStack(product, SLOT_PRODUCT, 1, all); + return InvTools.tryAddStack(getInternalInventory(), product, SLOT_PRODUCT, 1, all); } // / STATE INFORMATION @@ -318,7 +336,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq @Override public boolean hasResourcesMin(float percentage) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_RESOURCE) == null) return false; @@ -368,88 +386,6 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq iCrafting.sendProgressBarUpdate(container, i + 1, fillingTotalTime); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_RESOURCE) - return FluidContainerRegistry.isEmptyContainer(itemstack); - - if (slotIndex == SLOT_CAN) { - FluidStack fluidStack = FluidHelper.getFluidStackInContainer(itemstack); - return RecipeManager.isInput(fluidStack); - } - - return false; - } - - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - return getInternalInventory().canExtractItem(side, itemstack, side) && slotIndex == SLOT_PRODUCT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILIQUIDCONTAINER */ @Override public TankManager getTankManager() { diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 4e344902b..f20c3a415 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -27,7 +27,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.oredict.OreDictionary; @@ -45,11 +44,14 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; +import forestry.core.utils.GuiUtil; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; @@ -59,6 +61,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL /* CONSTANTS */ public final static int SLOT_CRAFTING_1 = 0; + public final static int SLOT_CRAFTING_COUNT = 9; public final static int SLOT_BOX = 9; public final static int SLOT_PRODUCT = 10; public final static int SLOT_CAN_INPUT = 11; @@ -216,17 +219,38 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL setHints(Config.hints.get("carpenter")); resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems"); - setInternalInventory(new TileInventoryAdapter(this, 30, "Items")); - getInternalInventory().configureSided(Defaults.FACINGS, SLOT_BOX, 20); + setInternalInventory(new TileInventoryAdapter(this, 30, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_CAN_INPUT) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return tankManager.accepts(fluid); + } else if (slotIndex == SLOT_BOX) { + return MachineCarpenter.RecipeManager.isBox(itemStack); + } + + return true; + } + + @Override + public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { + if (GuiUtil.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT)) { + if (lastRecipe != null) + return lastRecipe.isIngredient(itemStack); + } + return true; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex == SLOT_PRODUCT; + } + }); + InvTools.configureSided(getInternalInventory(), Defaults.FACINGS, SLOT_BOX, 20); tankManager = new TankManager(resourceTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.CarpenterGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -296,7 +320,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL if (worldObj.getTotalWorldTime() % 20 != 0) return; - TileInventoryAdapter accessibleInventory = getInternalInventory(); + IInventoryAdapter accessibleInventory = getInternalInventory(); // Check if we have suitable items waiting in the item slot if (accessibleInventory.getStackInSlot(SLOT_CAN_INPUT) != null) { FluidHelper.drainContainers(tankManager, accessibleInventory, SLOT_CAN_INPUT); @@ -381,15 +405,15 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL if (resourceTank.getFluidAmount() < currentRecipe.liquid.amount) return false; - TileInventoryAdapter accessibleInventory = getInternalInventory(); + IInventoryAdapter accessibleInventory = getInternalInventory(); // Check whether boxes are available if (currentRecipe.box != null) if (accessibleInventory.getStackInSlot(SLOT_BOX) == null) return false; // Need at least one matched set - ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); - ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + ItemStack[] set = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] stock = InvTools.getStacks(accessibleInventory, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT);; return StackUtils.containsSets(set, stock, true, false) > 0; } @@ -409,17 +433,16 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL if (removed == null || removed.stackSize == 0) return false; } - - return removeSets(1, craftingInventory.getStacks(SLOT_CRAFTING_1, 9)); + return removeSets(1, InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT)); } private boolean removeSets(int count, ItemStack[] set) { EntityPlayer player = Proxies.common.getPlayer(worldObj, getOwnerProfile()); - return getInternalInventory().removeSets(count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); + return InvTools.removeSets(getInternalInventory(), count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); } private boolean tryAddPending() { - TileInventoryAdapter accessibleInventory = getInternalInventory(); + IInventoryAdapter accessibleInventory = getInternalInventory(); if (accessibleInventory.getStackInSlot(SLOT_PRODUCT) == null) { accessibleInventory.setInventorySlotContents(SLOT_PRODUCT, pendingProduct.copy()); pendingProduct = null; @@ -448,7 +471,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL if (currentRecipe == null) return false; - TileInventoryAdapter accessibleInventory = getInternalInventory(); + IInventoryAdapter accessibleInventory = getInternalInventory(); // Stop working if the output slot cannot take more if (accessibleInventory.getStackInSlot(SLOT_PRODUCT) != null && accessibleInventory.getStackInSlot(SLOT_PRODUCT).getMaxStackSize() - accessibleInventory.getStackInSlot(SLOT_PRODUCT).stackSize < currentRecipe @@ -475,97 +498,6 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return Utils.rateTankLevel(getResourceScaled(100)); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_PRODUCT) - return false; - - if (slotIndex == SLOT_BOX) - return RecipeManager.isBox(itemstack); - - if (slotIndex == SLOT_CAN_INPUT) - return FluidContainerRegistry.isContainer(itemstack); - - if (slotIndex >= SLOT_INVENTORY_1 && slotIndex < SLOT_INVENTORY_1 + SLOT_INVENTORY_COUNT) { - if (lastRecipe == null) - return true; - return lastRecipe.isIngredient(itemstack); - } - - return false; - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex == SLOT_PRODUCT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* SMP GUI */ @Override public void getGUINetworkData(int i, int j) { diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index c02a9734c..2e57edc2c 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -38,8 +38,11 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; +import forestry.core.utils.GuiUtil; import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; @@ -49,6 +52,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory { /* CONSTANTS */ public static final int SLOT_RESOURCE = 0; public static final int SLOT_PRODUCT_1 = 1; + public static final int SLOT_PRODUCT_COUNT = 9; /* RECIPE MANAGMENT */ public static class Recipe { @@ -146,13 +150,18 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory { public MachineCentrifuge() { super(800, 40, Defaults.MACHINE_MAX_ENERGY); - setInternalInventory(new TileInventoryAdapter(this, 10, "Items")); - setHints(Config.hints.get("centrifuge")); - } + setInternalInventory(new TileInventoryAdapter(this, 10, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return slotIndex == SLOT_RESOURCE && RecipeManager.findMatchingRecipe(itemStack) != null; + } - @Override - public String getInventoryName() { - return getUnlocalizedName(); + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return GuiUtil.isIndexInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); + } + }); + setHints(Config.hints.get("centrifuge")); } @Override @@ -293,7 +302,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory { } private boolean addProduct(ItemStack product, boolean all) { - return getInternalInventory().tryAddStack(product, 1, getSizeInventory() - 1, all); + return InvTools.tryAddStack(getInternalInventory(), product, 1, getSizeInventory() - 1, all); } @Override @@ -303,7 +312,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory { @Override public boolean hasResourcesMin(float percentage) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_RESOURCE) == null) return false; @@ -339,81 +348,6 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory { iCrafting.sendProgressBarUpdate(container, 1, timePerItem); } - /* IINVENTORY */ - - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - return slotIndex == SLOT_RESOURCE && RecipeManager.findMatchingRecipe(itemstack) != null; - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - return slotIndex >= SLOT_PRODUCT_1 && slotIndex < SLOT_PRODUCT_1 + 9; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 0dc646413..aba79452b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -41,11 +41,14 @@ import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ICrafter; import forestry.core.interfaces.ICraftingPlan; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.GuiId; +import forestry.core.utils.GuiUtil; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.StackUtils; @@ -161,6 +164,15 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT return null; } + public static boolean isPlan(ItemStack plan) { + for (Recipe recipe : recipes) { + if (StackUtils.isIdenticalItem(recipe.getPlan(), plan)) + return true; + } + + return false; + } + public static boolean isResourceLiquid(FluidStack liquid) { for (Recipe recipe : recipes) { if (recipe.hasLiquid(liquid)) @@ -228,18 +240,28 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT public MachineFabricator() { super(1100, 50, 3300); - setInternalInventory(new TileInventoryAdapter(this, 30, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 30, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_METAL) { + return RecipeManager.findMatchingSmelting(itemStack) != null; + } else if (slotIndex == SLOT_PLAN) { + return RecipeManager.isPlan(itemStack); + } + return GuiUtil.isIndexInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { + return slotIndex == SLOT_RESULT; + } + }); invCrafting = new InventoryMapper(getInternalInventory(), SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, Fluids.GLASS.getFluid()); moltenTank.tankMode = StandardTank.TankMode.INTERNAL; tankManager = new TankManager(moltenTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.FabricatorGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -283,7 +305,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT /* UPDATING */ @Override public void updateServerSide() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Add pending smelt if (pendingSmelt != null) { @@ -339,9 +361,9 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT } private Recipe getRecipe() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); ItemStack plan = inventory.getStackInSlot(SLOT_PLAN); - ItemStack[] crafting = inventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] crafting = InvTools.getStacks(inventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); return RecipeManager.findMatchingRecipe(plan, moltenTank.getFluid(), crafting); } @@ -372,10 +394,11 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT FluidStack liquid = myRecipe.molten; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Remove resources - if (removeFromInventory(1, inventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT), player, false)) { - removeFromInventory(1, inventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT), player, true); + ItemStack[] crafting = InvTools.getStacks(inventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + if (removeFromInventory(1, crafting, player, false)) { + removeFromInventory(1, crafting, player, true); moltenTank.drain(liquid.amount, true); } else if (consumeRecipe) { removeFromCraftMatrix(myRecipe); @@ -405,11 +428,11 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT } private boolean removeFromInventory(int count, ItemStack[] set, EntityPlayer player, boolean doRemove) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (doRemove) - return inventory.removeSets(count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); + return InvTools.removeSets(inventory, count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); else { - ItemStack[] stock = inventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + ItemStack[] stock = InvTools.getStacks(inventory, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); return StackUtils.containsSets(set, stock) >= count; } } @@ -421,14 +444,14 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT @Override public boolean hasWork() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); ItemStack itemToMelt = inventory.getStackInSlot(SLOT_METAL); Smelting smelting = RecipeManager.findMatchingSmelting(itemToMelt); if (smelting != null && moltenTank.fill(smelting.getProduct(), false) > 0) return true; ItemStack plan = inventory.getStackInSlot(SLOT_PLAN); - ItemStack[] resources = inventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] resources = InvTools.getStacks(inventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); return RecipeManager.findMatchingRecipe(plan, moltenTank.getFluid(), resources) != null; } @@ -482,82 +505,6 @@ public class MachineFabricator extends TilePowered implements ICrafter, ILiquidT iCrafting.sendProgressBarUpdate(container, messageId + 1, getMeltingPoint()); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack stack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, stack)) - return false; - if (slotIndex == SLOT_METAL && RecipeManager.findMatchingSmelting(stack) == null) - return false; - return slotIndex >= SLOT_INVENTORY_1 && slotIndex < SLOT_INVENTORY_1 + SLOT_INVENTORY_COUNT; - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack stack, int side) { - return isItemValidForSlot(slotIndex, stack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, stack, side)) - return false; - return slotIndex == SLOT_RESULT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILIQUIDCONTAINER */ @Override public TankManager getTankManager() { diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index fa1ae1989..160fb366f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -10,8 +10,28 @@ ******************************************************************************/ package forestry.factory.gadgets; -import buildcraft.api.statements.ITriggerExternal; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import cpw.mods.fml.common.Optional; + import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; @@ -27,29 +47,15 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.factory.triggers.FactoryTriggers; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; + +import buildcraft.api.statements.ITriggerExternal; public class MachineFermenter extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -191,7 +197,27 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL public MachineFermenter() { super(2000, 150, 8000); - setInternalInventory(new TileInventoryAdapter(this, 5, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 5, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_RESOURCE) { + return RecipeManager.isResource(itemStack); + } else if (slotIndex == SLOT_INPUT) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return resourceTank.accepts(fluid); + } else if (slotIndex == SLOT_CAN_INPUT) { + return FluidHelper.isEmptyContainer(itemStack); + } else if (slotIndex == SLOT_FUEL) { + return FuelManager.fermenterFuel.containsKey(itemStack); + } + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex == SLOT_CAN_OUTPUT; + } + }); setHints(Config.hints.get("fermenter")); resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); resourceTank.tankMode = StandardTank.TankMode.INPUT; @@ -200,11 +226,6 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL tankManager = new TankManager(resourceTank, productTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.FermenterGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -243,7 +264,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL if (worldObj.getTotalWorldTime() % 20 != 0) return; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Check if we have suitable items waiting in the item slot if (inventory.getStackInSlot(SLOT_INPUT) != null) FluidHelper.drainContainers(tankManager, inventory, SLOT_INPUT); @@ -275,7 +296,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL checkRecipe(); resetRecipe(); - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (currentRecipe != null) { currentResourceModifier = determineResourceMod(inventory.getStackInSlot(SLOT_RESOURCE)); decrStackSize(SLOT_RESOURCE, 1); @@ -337,7 +358,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } private void checkRecipe() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); Recipe sameRec = RecipeManager.findMatchingRecipe(inventory.getStackInSlot(SLOT_RESOURCE), resourceTank.getFluid()); if (currentRecipe != sameRec) @@ -387,7 +408,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public boolean isWorking() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (currentRecipe == null && RecipeManager.findMatchingRecipe(inventory.getStackInSlot(SLOT_RESOURCE), resourceTank.getFluid()) == null) return false; @@ -415,7 +436,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public boolean hasWork() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (this.getFuelStack() == null && fuelBurnTime <= 0) return false; else if (fuelBurnTime <= 0) @@ -502,92 +523,6 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL iCrafting.sendProgressBarUpdate(container, firstMessageId + 3, fermentationTotalTime); } - /* INVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_RESOURCE && RecipeManager.isResource(itemstack)) - return true; - - if (slotIndex == SLOT_INPUT) { - FluidStack fluidStack = FluidHelper.getFluidStackInContainer(itemstack); - return RecipeManager.isLiquidResource(fluidStack); - } - - if (slotIndex == SLOT_CAN_INPUT && FluidHelper.isEmptyContainer(itemstack)) - return true; - return slotIndex == SLOT_FUEL && FuelManager.fermenterFuel.containsKey(itemstack); - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex == SLOT_CAN_OUTPUT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 47cc42913..a3a809a57 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -10,6 +10,23 @@ ******************************************************************************/ package forestry.factory.gadgets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; @@ -23,36 +40,25 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; +import forestry.core.utils.GuiUtil; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class MachineMoistener extends TileBase implements ISidedInventory, ILiquidTankContainer, IRenderableMachine { /* CONSTANTS */ private static final short SLOT_STASH_1 = 0; + private static final short SLOT_STASH_COUNT = 6; private static final short SLOT_RESERVOIR_1 = 6; + private static final short SLOT_RESERVOIR_COUNT = 3; private static final short SLOT_WORKING = 9; private static final short SLOT_PRODUCT = 10; private static final short SLOT_RESOURCE = 11; - private static final short SLOTS_COUNT_RESERVOIR = 3; - private static final short SLOTS_COUNT_STASH = 6; /* RECIPE MANAGMENT */ public static class Recipe { @@ -120,7 +126,6 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu public final FilteredTank resourceTank; private final TankManager tankManager; - //private ItemStack[] inventoryStacks = new ItemStack[12]; public MachineMoistener.Recipe currentRecipe; public int burnTime = 0; @@ -131,17 +136,39 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu private ItemStack pendingProduct; public MachineMoistener() { - setInternalInventory(new TileInventoryAdapter(this, 12, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 12, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_RESOURCE) + return RecipeManager.isResource(itemStack); + + if (GuiUtil.isIndexInRange(slotIndex, SLOT_STASH_1, SLOT_STASH_COUNT)) + return FuelManager.moistenerResource.containsKey(itemStack); + + if (slotIndex == SLOT_PRODUCT) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return resourceTank.accepts(fluid); + } + + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + if (slotIndex == SLOT_PRODUCT) + return true; + + if (GuiUtil.isIndexInRange(slotIndex, SLOT_STASH_1, SLOT_STASH_COUNT)) + return !FuelManager.moistenerResource.containsKey(itemstack); + + return false; + } + }); setHints(Config.hints.get("moistener")); resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); tankManager = new TankManager(resourceTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.MoistenerGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -197,7 +224,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu @Override public void updateServerSide() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Check if we have suitable water container waiting in the item slot if (inventory.getStackInSlot(SLOT_PRODUCT) != null) FluidHelper.drainContainers(tankManager, inventory, SLOT_PRODUCT); @@ -272,8 +299,8 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu if (pendingProduct == null) return false; - TileInventoryAdapter inventory = getInternalInventory(); - if (inventory.tryAddStack(pendingProduct, SLOT_PRODUCT, 1, true)) { + IInventoryAdapter inventory = getInternalInventory(); + if (InvTools.tryAddStack(inventory, pendingProduct, SLOT_PRODUCT, 1, true)) { pendingProduct = null; return true; } @@ -306,7 +333,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu private int getFreeSlot(ItemStack deposit, int startSlot, int endSlot, boolean emptyOnly) { int slot = -1; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for (int i = startSlot; i < endSlot; i++) { ItemStack slotStack = inventory.getStackInSlot(i); // Empty slots are okay. @@ -334,7 +361,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu } private int getFreeReservoirSlot(ItemStack deposit) { - return getFreeSlot(deposit, SLOT_RESERVOIR_1, SLOT_RESERVOIR_1 + SLOTS_COUNT_RESERVOIR, false); + return getFreeSlot(deposit, SLOT_RESERVOIR_1, SLOT_RESERVOIR_1 + SLOT_RESERVOIR_COUNT, false); } @@ -343,7 +370,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu int stage = -1; int resourceSlot = -1; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for (int i = startSlot; i < endSlot; i++) { ItemStack slotStack = inventory.getStackInSlot(i); if (slotStack == null) @@ -363,7 +390,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu } private boolean rotateWorkingSlot() { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Put working slot contents into inventory if space is available if (inventory.getStackInSlot(SLOT_WORKING) != null) { // Get the result of the consumed item in the working slot @@ -391,7 +418,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu return true; // Let's look for a new resource to put into the working slot. - int resourceSlot = getNextResourceSlot(SLOT_RESERVOIR_1, SLOT_RESERVOIR_1 + SLOTS_COUNT_RESERVOIR); + int resourceSlot = getNextResourceSlot(SLOT_RESERVOIR_1, SLOT_RESERVOIR_1 + SLOT_RESERVOIR_COUNT); // Nothing found, stop. if (resourceSlot < 0) return false; @@ -403,9 +430,9 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu private void rotateReservoir() { ArrayList slotsToShift = new ArrayList(); - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); - for (int i = SLOT_RESERVOIR_1; i < SLOT_RESERVOIR_1 + SLOTS_COUNT_RESERVOIR; i++) { + for (int i = SLOT_RESERVOIR_1; i < SLOT_RESERVOIR_1 + SLOT_RESERVOIR_COUNT; i++) { if (inventory.getStackInSlot(i) == null) continue; @@ -455,7 +482,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu public boolean hasFuelMin(float percentage) { int max = 0; int avail = 0; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for (int i = SLOT_STASH_1; i < SLOT_RESERVOIR_1; i++) { if (inventory.getStackInSlot(i) == null) { @@ -475,7 +502,7 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu } public boolean hasResourcesMin(float percentage) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_RESOURCE) == null) return false; @@ -517,96 +544,6 @@ public class MachineMoistener extends TileBase implements ISidedInventory, ILiqu return EnumTankLevel.EMPTY; } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_RESOURCE) - return RecipeManager.isResource(itemstack); - - if (slotIndex >= SLOT_STASH_1 && slotIndex < SLOT_STASH_1 + SLOTS_COUNT_STASH - 2) - return FuelManager.moistenerResource.containsKey(itemstack); - - return false; - } - - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - if (slotIndex == SLOT_PRODUCT) - return true; - - if (slotIndex >= SLOT_STASH_1 && slotIndex < SLOT_STASH_1 + SLOTS_COUNT_STASH) - return !FuelManager.moistenerResource.containsKey(itemstack); - - return false; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index 14fd000f9..de3c2ceab 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -10,6 +10,20 @@ ******************************************************************************/ package forestry.factory.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.biome.BiomeGenBase; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.BiomeHelper; import forestry.api.core.ForestryAPI; import forestry.core.EnumErrorCode; @@ -21,22 +35,11 @@ import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class MachineRaintank extends TileBase implements ISidedInventory, ILiquidTankContainer { @@ -53,7 +56,19 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui private ItemStack usedEmpty; public MachineRaintank() { - setInternalInventory(new TileInventoryAdapter(this, 3, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 3, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_RESOURCE) { + return FluidHelper.isFillableContainer(itemStack, Fluids.WATER.getFluid(1000)); + } + return false; + } + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex == SLOT_PRODUCT; + } + }); setHints(Config.hints.get("raintank")); resourceTank = new FilteredTank(Defaults.RAINTANK_TANK_CAPACITY, FluidRegistry.WATER); @@ -74,11 +89,6 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui super.validate(); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.RaintankGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -118,7 +128,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui if (worldObj.getTotalWorldTime() % 16 != 0) return; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (!StackUtils.isIdenticalItem(usedEmpty, inventory.getStackInSlot(SLOT_RESOURCE))) { fillingTime = 0; usedEmpty = null; @@ -152,85 +162,6 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui return (fillingTime * i) / Defaults.RAINTANK_FILLING_TIME; } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex != SLOT_RESOURCE) - return false; - - return FluidHelper.isFillableContainer(itemstack, STACK_WATER); - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex == SLOT_PRODUCT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* SMP GUI */ @Override public void getGUINetworkData(int i, int j) { diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 600edd4c6..bda1cdf88 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -10,6 +10,26 @@ ******************************************************************************/ package forestry.factory.gadgets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Stack; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.ForestryAPI; import forestry.api.recipes.ISqueezerManager; import forestry.core.EnumErrorCode; @@ -22,38 +42,23 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Stack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class MachineSqueezer extends TilePowered implements ISidedInventory, ILiquidTankContainer { /* CONSTANTS */ - private static final short SLOT_RESOURCE_1 = 0; - private static final short SLOTS_RESOURCE_COUNT = 9; - private static final short SLOT_REMNANT = 9; - private static final short SLOT_CAN_INPUT = 10; - private static final short SLOT_CAN_OUTPUT = 11; + public static final short SLOT_RESOURCE_1 = 0; + public static final short SLOTS_RESOURCE_COUNT = 9; + public static final short SLOT_REMNANT = 9; + public static final short SLOT_CAN_INPUT = 10; + public static final short SLOT_CAN_OUTPUT = 11; /* RECIPE MANAGMENT */ public static class Recipe { @@ -141,18 +146,34 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi public MachineSqueezer() { super(1100, 50, 4000); - setInternalInventory(new TileInventoryAdapter(this, 12, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 12, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_CAN_INPUT) + return FluidHelper.isEmptyContainer(itemStack); + + if (slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { + if (FluidHelper.isEmptyContainer(itemStack)) + return false; + + if (RecipeManager.canUse(itemStack)) + return true; + } + + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex == SLOT_REMNANT || slotIndex == SLOT_CAN_OUTPUT; + } + }); setHints(Config.hints.get("squeezer")); productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); productTank.tankMode = StandardTank.TankMode.OUTPUT; tankManager = new TankManager(productTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.SqueezerGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -228,7 +249,7 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi if (worldObj.getTotalWorldTime() % 20 != 0) return; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Can/capsule input/output needs to be handled here. if (inventory.getStackInSlot(SLOT_CAN_INPUT) != null) { FluidStack fluidStack = productTank.getFluid(); @@ -288,7 +309,8 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi } private void checkRecipe() { - Recipe sameRec = RecipeManager.findMatchingRecipe(getInternalInventory().getStacks(SLOT_RESOURCE_1, 9)); + ItemStack[] resources = InvTools.getStacks(getInternalInventory(), SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT); + Recipe sameRec = RecipeManager.findMatchingRecipe(resources); if (sameRec == null) setErrorState(EnumErrorCode.NORECIPE); @@ -340,12 +362,12 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi } private boolean addRemnant(ItemStack stack) { - return getInternalInventory().tryAddStack(stack, SLOT_REMNANT, 1, true); + return InvTools.tryAddStack(getInternalInventory(), stack, SLOT_REMNANT, 1, true); } private boolean removeResources(ItemStack[] stacks) { EntityPlayer player = Proxies.common.getPlayer(worldObj, getOwnerProfile()); - return getInternalInventory().removeSets(1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true, true); + return InvTools.removeSets(getInternalInventory(), 1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true, true); } @Override @@ -395,93 +417,6 @@ public class MachineSqueezer extends TilePowered implements ISidedInventory, ILi iCrafting.sendProgressBarUpdate(container, i + 1, timePerItem); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_CAN_INPUT) - return FluidHelper.isEmptyContainer(itemstack); - - if (slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { - if (FluidHelper.isEmptyContainer(itemstack)) - return false; - - if (RecipeManager.canUse(itemstack)) - return true; - } - - return false; - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex == SLOT_REMNANT || slotIndex == SLOT_CAN_OUTPUT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* ILIQUIDCONTAINER IMPLEMENTATION */ @Override public TankManager getTankManager() { diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 92fff756a..7f8554312 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -10,6 +10,23 @@ ******************************************************************************/ package forestry.factory.gadgets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.ForestryAPI; import forestry.api.recipes.IStillManager; import forestry.core.EnumErrorCode; @@ -22,24 +39,11 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.Utils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class MachineStill extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -123,7 +127,23 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui public MachineStill() { super(1100, 50, 8000); - setInternalInventory(new TileInventoryAdapter(this, 3, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 3, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == SLOT_RESOURCE) { + return FluidHelper.isEmptyContainer(itemStack); + } else if (slotIndex == SLOT_CAN) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return resourceTank.accepts(fluid); + } + return false; + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + return slotIndex == SLOT_PRODUCT; + } + }); setHints(Config.hints.get("still")); resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); resourceTank.tankMode = StandardTank.TankMode.INPUT; @@ -132,11 +152,6 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui tankManager = new TankManager(resourceTank, productTank); } - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.StillGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); @@ -170,7 +185,7 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui if (worldObj.getTotalWorldTime() % 20 * 10 != 0) return; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); // Check if we have suitable items waiting in the item slot if (inventory.getStackInSlot(SLOT_CAN) != null) FluidHelper.drainContainers(tankManager, inventory, SLOT_CAN); @@ -310,90 +325,6 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui iCrafting.sendProgressBarUpdate(container, i + 1, distillationTotalTime); } - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return getInternalInventory().getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int value) { - return getInternalInventory().decrStackSize(slot, value); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(slot, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!getInternalInventory().isItemValidForSlot(slotIndex, itemstack)) - return false; - - if (slotIndex == SLOT_RESOURCE) - return FluidHelper.isEmptyContainer(itemstack); - - if (slotIndex == SLOT_CAN) { - Fluid fluid = FluidHelper.getFluidInContainer(itemstack); - return fluid != null && resourceTank.accepts(fluid); - } - - return false; - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - if (!getInternalInventory().canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex == SLOT_PRODUCT; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); - } - /* IFluidHandler */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index cbe34cfa1..1e06ee8b2 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -13,6 +13,7 @@ package forestry.factory.gadgets; import forestry.api.core.ForestryAPI; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ICrafter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.ForestryPacket; @@ -48,7 +49,7 @@ public class TileWorktable extends TileBase implements ICrafter { public TileWorktable() { craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems"); - setInternalInventory(new TileInventoryAdapter(this, 18, "Items")); + setInternalInventory(new TileInventoryAdapter(this, 18, "Items").disableAutomation()); memorized = new RecipeMemory(); } @@ -151,16 +152,16 @@ public class TileWorktable extends TileBase implements ICrafter { if (currentRecipe == null) return false; - ItemStack[] recipeItems = craftingInventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); - ItemStack[] inventory = getInternalInventory().getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + ItemStack[] recipeItems = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + ItemStack[] inventory = InvTools.getStacks(getInternalInventory(), SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); ItemStack recipeOutput = currentRecipe.getRecipeOutput(worldObj); return RecipeUtil.canCraftRecipe(worldObj, recipeItems, recipeOutput, inventory); } private boolean removeResources(EntityPlayer player) { - ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); - return getInternalInventory().removeSets(1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); + ItemStack[] set = InvTools.getStacks(craftingInventory, SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); + return InvTools.removeSets(getInternalInventory(), 1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); } @Override diff --git a/src/main/java/forestry/factory/gui/ContainerBottler.java b/src/main/java/forestry/factory/gui/ContainerBottler.java index 8a2026287..8a31d4d38 100755 --- a/src/main/java/forestry/factory/gui/ContainerBottler.java +++ b/src/main/java/forestry/factory/gui/ContainerBottler.java @@ -10,24 +10,26 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotLiquidContainer; -import forestry.factory.gadgets.MachineBottler; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.factory.gadgets.MachineBottler; + public class ContainerBottler extends ContainerLiquidTanks { protected final MachineBottler tile; public ContainerBottler(InventoryPlayer player, MachineBottler tile) { - super(tile, tile); + super(tile); this.tile = tile; - this.addSlotToContainer(new SlotLiquidContainer(tile, MachineBottler.SLOT_RESOURCE, 116, 19, true)); - this.addSlotToContainer(new SlotClosed(tile, MachineBottler.SLOT_PRODUCT, 116, 55)); - this.addSlotToContainer(new SlotLiquidContainer(tile, MachineBottler.SLOT_CAN, 26, 38)); + + this.addSlotToContainer(new SlotFiltered(tile, MachineBottler.SLOT_RESOURCE, 116, 19)); + this.addSlotToContainer(new SlotOutput(tile, MachineBottler.SLOT_PRODUCT, 116, 55)); + this.addSlotToContainer(new SlotFiltered(tile, MachineBottler.SLOT_CAN, 26, 38)); int var3; for (var3 = 0; var3 < 3; ++var3) { diff --git a/src/main/java/forestry/factory/gui/ContainerCarpenter.java b/src/main/java/forestry/factory/gui/ContainerCarpenter.java index a036ba011..43434d124 100755 --- a/src/main/java/forestry/factory/gui/ContainerCarpenter.java +++ b/src/main/java/forestry/factory/gui/ContainerCarpenter.java @@ -10,46 +10,33 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotCraftAuto; -import forestry.core.gui.slots.SlotLiquidContainer; -import forestry.core.gui.slots.SlotLocked; -import forestry.core.gui.slots.SlotOutput; -import forestry.core.interfaces.IContainerCrafting; -import forestry.core.proxy.Proxies; -import forestry.factory.gadgets.MachineCarpenter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; + +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotLocked; +import forestry.core.gui.slots.SlotOutput; +import forestry.core.interfaces.IContainerCrafting; +import forestry.core.proxy.Proxies; +import forestry.factory.gadgets.MachineCarpenter; public class ContainerCarpenter extends ContainerLiquidTanks implements IContainerCrafting { - private class SlotCrate extends SlotCraftAuto { - - public SlotCrate(IContainerCrafting container, IInventory iinventory, int slotNumber, int x, int y) { - super(container, iinventory, slotNumber, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return MachineCarpenter.RecipeManager.isBox(stack); - } - } private MachineCarpenter machine; private final IInventory craftingInventory; public final InventoryCraftingAuto craftMatrix; public final InventoryCraftResult craftResult; public ContainerCarpenter(InventoryPlayer inventoryplayer, MachineCarpenter tile) { - super(tile.getInternalInventory(), tile); + super(tile); machine = tile; machine.activeContainer = this; craftingInventory = machine.getCraftingInventory(); - IInventory internalInventory = machine.getInternalInventory(); craftMatrix = new InventoryCraftingAuto(this, 3, 3); craftResult = new InventoryCraftResult(); @@ -57,16 +44,16 @@ public class ContainerCarpenter extends ContainerLiquidTanks implements IContain // Internal inventory for (int i = 0; i < 2; i++) { for (int k = 0; k < 9; k++) { - addSlotToContainer(new Slot(internalInventory, MachineCarpenter.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 90 + i * 18)); + addSlotToContainer(new Slot(machine, MachineCarpenter.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 90 + i * 18)); } } // Liquid Input - this.addSlotToContainer(new SlotLiquidContainer(internalInventory, MachineCarpenter.SLOT_CAN_INPUT, 120, 20)); + this.addSlotToContainer(new SlotFiltered(machine, MachineCarpenter.SLOT_CAN_INPUT, 120, 20)); // Boxes - this.addSlotToContainer(new SlotCrate(this, internalInventory, MachineCarpenter.SLOT_BOX, 83, 20)); + this.addSlotToContainer(new SlotFiltered(machine, MachineCarpenter.SLOT_BOX, 83, 20)); // Product - this.addSlotToContainer(new SlotOutput(internalInventory, MachineCarpenter.SLOT_PRODUCT, 120, 56)); + this.addSlotToContainer(new SlotOutput(machine, MachineCarpenter.SLOT_PRODUCT, 120, 56)); // CraftResult display addSlotToContainer(new SlotLocked(craftResult, 0, 80, 51)); @@ -96,7 +83,7 @@ public class ContainerCarpenter extends ContainerLiquidTanks implements IContain } public ContainerCarpenter(MachineCarpenter tile) { - super(tile.getInternalInventory(), tile); + super(tile); craftMatrix = new InventoryCraftingAuto(this, 3, 3); craftResult = new InventoryCraftResult(); craftingInventory = tile.getCraftingInventory(); diff --git a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java index c522a0c9f..d567731d4 100755 --- a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java +++ b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java @@ -10,13 +10,15 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; -import forestry.factory.gadgets.MachineCentrifuge; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.factory.gadgets.MachineCentrifuge; + public class ContainerCentrifuge extends ContainerForestry { protected final MachineCentrifuge tile; @@ -27,12 +29,12 @@ public class ContainerCentrifuge extends ContainerForestry { this.tile = tile; // Resource - this.addSlotToContainer(new Slot(tile, 0, 34, 37)); + this.addSlotToContainer(new SlotFiltered(tile, 0, 34, 37)); // Product Inventory for (int l = 0; l < 3; l++) for (int k = 0; k < 3; k++) - addSlotToContainer(new SlotClosed(tile, 1 + k + l * 3, 98 + k * 18, 19 + l * 18)); + addSlotToContainer(new SlotOutput(tile, 1 + k + l * 3, 98 + k * 18, 19 + l * 18)); // Player inventory for (int i1 = 0; i1 < 3; i1++) diff --git a/src/main/java/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java index 12eb4c7eb..a59e8133f 100755 --- a/src/main/java/forestry/factory/gui/ContainerFabricator.java +++ b/src/main/java/forestry/factory/gui/ContainerFabricator.java @@ -15,12 +15,13 @@ import net.minecraft.inventory.Slot; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotCrafter; +import forestry.core.gui.slots.SlotFiltered; import forestry.factory.gadgets.MachineFabricator; public class ContainerFabricator extends ContainerLiquidTanks { public ContainerFabricator(InventoryPlayer playerInventory, MachineFabricator tile) { - super(tile, tile); + super(tile); // Internal inventory for (int i = 0; i < 2; i++) @@ -28,10 +29,10 @@ public class ContainerFabricator extends ContainerLiquidTanks { addSlotToContainer(new Slot(tile, MachineFabricator.SLOT_INVENTORY_1 + k + i * 9, 8 + k * 18, 84 + i * 18)); // Molten resource - this.addSlotToContainer(new Slot(tile, MachineFabricator.SLOT_METAL, 26, 21)); + this.addSlotToContainer(new SlotFiltered(tile, MachineFabricator.SLOT_METAL, 26, 21)); // Plan - this.addSlotToContainer(new Slot(tile, MachineFabricator.SLOT_PLAN, 139, 17)); + this.addSlotToContainer(new SlotFiltered(tile, MachineFabricator.SLOT_PLAN, 139, 17)); // Result this.addSlotToContainer(new SlotCrafter(playerInventory.player, tile, tile, MachineFabricator.SLOT_RESULT, 139, 53)); diff --git a/src/main/java/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java index a31643f90..7f09a2758 100755 --- a/src/main/java/forestry/factory/gui/ContainerFermenter.java +++ b/src/main/java/forestry/factory/gui/ContainerFermenter.java @@ -10,27 +10,28 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.gui.slots.SlotLiquidContainer; -import forestry.core.gui.slots.SlotOutput; -import forestry.factory.gadgets.MachineFermenter; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.factory.gadgets.MachineFermenter; + public class ContainerFermenter extends ContainerLiquidTanks { protected final MachineFermenter fermenter; public ContainerFermenter(InventoryPlayer player, MachineFermenter fermenter) { - super(fermenter, fermenter); + super(fermenter); this.fermenter = fermenter; - this.addSlotToContainer(new SlotCustom(fermenter, MachineFermenter.SLOT_RESOURCE, 85, 23).setExclusion(true)); - this.addSlotToContainer(new SlotCustom(fermenter, MachineFermenter.SLOT_FUEL, 75, 57).setExclusion(true)); + + this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_RESOURCE, 85, 23)); + this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_FUEL, 75, 57)); this.addSlotToContainer(new SlotOutput(fermenter, MachineFermenter.SLOT_CAN_OUTPUT, 150, 58)); - this.addSlotToContainer(new SlotLiquidContainer(fermenter, MachineFermenter.SLOT_CAN_INPUT, 150, 22, true)); - this.addSlotToContainer(new SlotLiquidContainer(fermenter, MachineFermenter.SLOT_INPUT, 10, 40)); + this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_CAN_INPUT, 150, 22)); + this.addSlotToContainer(new SlotFiltered(fermenter, MachineFermenter.SLOT_INPUT, 10, 40)); for (int i = 0; i < 3; ++i) { for (int var4 = 0; var4 < 9; ++var4) { diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index 5117290fc..0841c4daa 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -10,39 +10,42 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotCraftAuto; -import forestry.core.gui.slots.SlotWorking; -import forestry.core.interfaces.IContainerCrafting; -import forestry.factory.gadgets.MachineMoistener; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotCraftAuto; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotWorking; +import forestry.core.interfaces.IContainerCrafting; +import forestry.factory.gadgets.MachineMoistener; + public class ContainerMoistener extends ContainerLiquidTanks implements IContainerCrafting { protected final MachineMoistener tile; public ContainerMoistener(InventoryPlayer player, MachineMoistener tile) { - super(tile, tile); + super(tile); this.tile = tile; + // Stash for (int l = 0; l < 2; l++) { for (int k1 = 0; k1 < 3; k1++) { - addSlotToContainer(new Slot(tile, k1 + l * 3, 39 + k1 * 18, 16 + l * 18)); + addSlotToContainer(new SlotFiltered(tile, k1 + l * 3, 39 + k1 * 18, 16 + l * 18)); } } // Reservoir for (int k1 = 0; k1 < 3; k1++) { - addSlotToContainer(new Slot(tile, k1 + 6, 39 + k1 * 18, 22 + 36)); + addSlotToContainer(new SlotFiltered(tile, k1 + 6, 39 + k1 * 18, 22 + 36)); } // Working slot this.addSlotToContainer(new SlotWorking(tile, 9, 105, 37)); // Product slot - this.addSlotToContainer(new Slot(tile, 10, 143, 55)); + this.addSlotToContainer(new SlotFiltered(tile, 10, 143, 55)); // Boxes this.addSlotToContainer(new SlotCraftAuto(this, tile, 11, 143, 19)); diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index f0408977c..84e2ae3c0 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -10,20 +10,21 @@ ******************************************************************************/ package forestry.factory.gui; -import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotLiquidContainer; -import forestry.factory.gadgets.MachineRaintank; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerLiquidTanks; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.factory.gadgets.MachineRaintank; + public class ContainerRaintank extends ContainerLiquidTanks { public ContainerRaintank(InventoryPlayer player, MachineRaintank tile) { - super(tile, tile); + super(tile); - this.addSlotToContainer(new SlotLiquidContainer(tile, MachineRaintank.SLOT_RESOURCE, 116, 19, true)); - this.addSlotToContainer(new SlotClosed(tile, MachineRaintank.SLOT_PRODUCT, 116, 55)); + this.addSlotToContainer(new SlotFiltered(tile, MachineRaintank.SLOT_RESOURCE, 116, 19)); + this.addSlotToContainer(new SlotOutput(tile, MachineRaintank.SLOT_PRODUCT, 116, 55)); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 9; ++j) { diff --git a/src/main/java/forestry/factory/gui/ContainerSqueezer.java b/src/main/java/forestry/factory/gui/ContainerSqueezer.java index 5e30fde2e..a67e31e23 100755 --- a/src/main/java/forestry/factory/gui/ContainerSqueezer.java +++ b/src/main/java/forestry/factory/gui/ContainerSqueezer.java @@ -14,27 +14,27 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotLiquidContainer; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; import forestry.factory.gadgets.MachineSqueezer; public class ContainerSqueezer extends ContainerLiquidTanks { public ContainerSqueezer(InventoryPlayer player, MachineSqueezer tile) { - super(tile, tile); + super(tile); // Resource inventory for (int l = 0; l < 3; l++) for (int k = 0; k < 3; k++) - addSlotToContainer(new Slot(tile, k + l * 3, 19 + k * 18, 18 + l * 18)); + addSlotToContainer(new SlotFiltered(tile, k + l * 3, 19 + k * 18, 18 + l * 18)); // Remnants slot - this.addSlotToContainer(new SlotClosed(tile, 9, 123, 19)); + this.addSlotToContainer(new SlotOutput(tile, MachineSqueezer.SLOT_REMNANT, 123, 19)); // Can slot - this.addSlotToContainer(new SlotLiquidContainer(tile, 10, 106, 55, true)); + this.addSlotToContainer(new SlotFiltered(tile, MachineSqueezer.SLOT_CAN_INPUT, 106, 55)); // Output slot - this.addSlotToContainer(new SlotClosed(tile, 11, 140, 55)); + this.addSlotToContainer(new SlotOutput(tile, MachineSqueezer.SLOT_CAN_OUTPUT, 140, 55)); // Player inventory for (int i1 = 0; i1 < 3; i1++) diff --git a/src/main/java/forestry/factory/gui/ContainerStill.java b/src/main/java/forestry/factory/gui/ContainerStill.java index 6984eae12..68ecffa7a 100755 --- a/src/main/java/forestry/factory/gui/ContainerStill.java +++ b/src/main/java/forestry/factory/gui/ContainerStill.java @@ -14,17 +14,18 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import forestry.core.gui.ContainerLiquidTanks; -import forestry.core.gui.slots.SlotLiquidContainer; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; import forestry.factory.gadgets.MachineStill; public class ContainerStill extends ContainerLiquidTanks { public ContainerStill(InventoryPlayer player, MachineStill tile) { - super(tile, tile); + super(tile); - this.addSlotToContainer(new Slot(tile, MachineStill.SLOT_PRODUCT, 150, 54)); - this.addSlotToContainer(new SlotLiquidContainer(tile, MachineStill.SLOT_RESOURCE, 150, 18, true)); - this.addSlotToContainer(new SlotLiquidContainer(tile, MachineStill.SLOT_CAN, 10, 36)); + this.addSlotToContainer(new SlotOutput(tile, MachineStill.SLOT_PRODUCT, 150, 54)); + this.addSlotToContainer(new SlotFiltered(tile, MachineStill.SLOT_RESOURCE, 150, 18)); + this.addSlotToContainer(new SlotFiltered(tile, MachineStill.SLOT_CAN, 10, 36)); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 9; ++j) { diff --git a/src/main/java/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java index 00af4add6..07ade1966 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarm.java +++ b/src/main/java/forestry/farming/gadgets/TileFarm.java @@ -27,6 +27,8 @@ import forestry.api.farming.Farmables; import forestry.api.farming.IFarmComponent; import forestry.api.farming.IFarmListener; import forestry.core.gadgets.TileForestry; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; @@ -187,6 +189,9 @@ public abstract class TileFarm extends TileForestry implements IFarmComponent { public void makeMaster() { setCentralTE(null); this.isMaster = true; + + if (worldObj != null && !worldObj.isRemote) + sendNetworkUpdate(); } @Override @@ -251,7 +256,7 @@ public abstract class TileFarm extends TileForestry implements IFarmComponent { } @Override - public ISidedInventory getStructureInventory() { + public IInventoryAdapter getStructureInventory() { return getInternalInventory(); } diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 5aebd7df8..7665a1ac9 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -10,6 +10,29 @@ ******************************************************************************/ package forestry.farming.gadgets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.Stack; +import java.util.TreeMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.BiomeHelper; @@ -32,48 +55,35 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.interfaces.IClimatised; import forestry.core.interfaces.IHintSource; import forestry.core.interfaces.ISocketable; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.proxy.Proxies; import forestry.core.utils.DelayTimer; +import forestry.core.utils.GuiUtil; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.core.vect.Vect; import forestry.farming.FarmTarget; import forestry.farming.logic.FarmLogicArboreal; import forestry.plugins.PluginFarming; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.Stack; -import java.util.TreeMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable, IClimatised, IHintSource { public static final int SLOT_RESOURCES_1 = 0; + public static final int SLOT_RESOURCES_COUNT = 6; public static final int SLOT_GERMLINGS_1 = 6; + public static final int SLOT_GERMLINGS_COUNT = 6; public static final int SLOT_PRODUCTION_1 = 12; - public static final int SLOT_COUNT_RESERVOIRS = 6; - public static final int SLOT_COUNT_PRODUCTION = 8; + public static final int SLOT_PRODUCTION_COUNT = 8; public static final int SLOT_FERTILIZER = 20; + public static final int SLOT_FERTILIZER_COUNT = 1; public static final int SLOT_CAN = 21; + public static final int SLOT_CAN_COUNT = 1; - public static final int SLOT_COUNT = 22; + public static final int SLOT_COUNT = SLOT_RESOURCES_COUNT + SLOT_GERMLINGS_COUNT + SLOT_PRODUCTION_COUNT + SLOT_FERTILIZER_COUNT + SLOT_CAN_COUNT; private static final int DELAY_HYDRATION = 100; private static final float RAINFALL_MODIFIER_CAP = 15f; @@ -348,7 +358,22 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } protected void createInventory() { - setInternalInventory(new TileInventoryAdapter(this, SLOT_COUNT, "Items")); + setInternalInventory(new TileInventoryAdapter(this, SLOT_COUNT, "Items") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (GuiUtil.isIndexInRange(slotIndex, SLOT_FERTILIZER, SLOT_FERTILIZER_COUNT)) { + return acceptsAsFertilizer(itemStack); + } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT)) { + return acceptsAsGermling(itemStack); + } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT)) { + return acceptsAsResource(itemStack); + } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_CAN, SLOT_CAN_COUNT)) { + Fluid fluid = FluidHelper.getFluidInContainer(itemStack); + return tankManager.accepts(fluid); + } + return false; + } + }); FilteredTank liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); tankManager = new TankManager(liquidTank); } @@ -362,9 +387,6 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } else if (checkTimer.delayPassed(worldObj, 400)) setExtents(); - if (getInternalInventory() == null) - createInventory(); - // System.out.println("Targets set"); if (tryAddPending()) return true; @@ -524,21 +546,21 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } private void addProduceToInventory(ItemStack produce) { - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); for (IFarmLogic logic : getFarmLogics()) { // Germlings try to go into germling slots first. if (logic.isAcceptedGermling(produce)) - produce.stackSize -= inventory.addStack(produce, SLOT_GERMLINGS_1, SLOT_COUNT_RESERVOIRS, false, true); + produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT, false, true); if (produce.stackSize <= 0) return; if (logic.isAcceptedResource(produce)) - produce.stackSize -= inventory.addStack(produce, SLOT_RESOURCES_1, SLOT_COUNT_RESERVOIRS, false, true); + produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT, false, true); if (produce.stackSize <= 0) return; } - produce.stackSize -= inventory.addStack(produce, SLOT_PRODUCTION_1, SLOT_COUNT_PRODUCTION, false, true); + produce.stackSize -= InvTools.addStack(inventory, produce, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, false, true); } private boolean cullCrop(ICrop crop, IFarmLogic provider) { @@ -574,8 +596,8 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable // Let event handlers handle the harvest first. for (IFarmListener listener : eventHandlers) listener.afterCropHarvest(harvested, crop); - - TileInventoryAdapter inventory = getInternalInventory(); + + IInventoryAdapter inventory = getInternalInventory(); // Stow harvest. for (ItemStack harvest : harvested) { @@ -583,7 +605,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable // Special case germlings for (IFarmLogic logic : farmLogics) if (logic.isAcceptedGermling(harvest)) { - harvest.stackSize -= inventory.addStack(harvest, SLOT_GERMLINGS_1, SLOT_COUNT_RESERVOIRS, false, true); + harvest.stackSize -= InvTools.addStack(inventory, harvest, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT, false, true); break; } @@ -591,7 +613,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable if (harvest.stackSize <= 0) continue; - harvest.stackSize -= inventory.addStack(harvest, SLOT_PRODUCTION_1, SLOT_COUNT_PRODUCTION, false, true); + harvest.stackSize -= InvTools.addStack(inventory, harvest, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, false, true); if (harvest.stackSize <= 0) continue; @@ -606,7 +628,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable return false; ItemStack next = pendingProduce.peek(); - if (getInternalInventory().tryAddStack(next, SLOT_PRODUCTION_1, SLOT_COUNT_PRODUCTION, true, true)) { + if (InvTools.tryAddStack(getInternalInventory(), next, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT, true, true)) { pendingProduce.pop(); return true; } @@ -622,7 +644,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable return; } - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); ItemStack fertilizer = inventory.getStackInSlot(SLOT_FERTILIZER); if (fertilizer == null || fertilizer.stackSize <= 0) return; @@ -742,25 +764,25 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable @Override public boolean hasResources(ItemStack[] resources) { - return getInternalInventory().contains(resources, SLOT_RESOURCES_1, SLOT_COUNT_RESERVOIRS); + return InvTools.contains(getInternalInventory(), resources, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT); } public boolean hasResourcesAmount(int amount) { - return getInternalInventory().containsAmount(amount, SLOT_RESOURCES_1, SLOT_COUNT_RESERVOIRS); + return InvTools.containsAmount(getInternalInventory(), amount, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT); } public boolean hasGermlingsPercent(float percent) { - return getInternalInventory().containsPercent(percent, SLOT_GERMLINGS_1, SLOT_COUNT_RESERVOIRS); + return InvTools.containsPercent(getInternalInventory(), percent, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT); } public boolean hasFertilizerPercent(float percent) { - return getInternalInventory().containsPercent(percent, SLOT_FERTILIZER, 1); + return InvTools.containsPercent(getInternalInventory(), percent, SLOT_FERTILIZER, 1); } @Override public void removeResources(ItemStack[] resources) { EntityPlayer player = Proxies.common.getPlayer(worldObj, getOwnerProfile()); - getInternalInventory().removeSets(1, resources, SLOT_RESOURCES_1, SLOT_COUNT_RESERVOIRS, player, false, true, true); + InvTools.removeSets(getInternalInventory(), 1, resources, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT, player, false, true, true); } @Override @@ -774,13 +796,13 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } public boolean hasGermlings(ItemStack[] germlings) { - return getInternalInventory().contains(germlings, SLOT_GERMLINGS_1, SLOT_COUNT_RESERVOIRS); + return InvTools.contains(getInternalInventory(), germlings, SLOT_GERMLINGS_1, SLOT_GERMLINGS_COUNT); } @Override public boolean plantGermling(IFarmable germling, World world, int x, int y, int z) { - TileInventoryAdapter inventory = getInternalInventory(); - for (int i = SLOT_GERMLINGS_1; i < SLOT_GERMLINGS_1 + SLOT_COUNT_RESERVOIRS; i++) { + IInventoryAdapter inventory = getInternalInventory(); + for (int i = SLOT_GERMLINGS_1; i < SLOT_GERMLINGS_1 + SLOT_GERMLINGS_COUNT; i++) { if (inventory.getStackInSlot(i) == null) continue; if (!germling.isGermling(inventory.getStackInSlot(i))) @@ -877,7 +899,8 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable /* NETWORK GUI */ public void getGUINetworkData(int i, int j) { - i -= tankManager.maxMessageId() + 1; + if (tankManager != null) + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: storedFertilizer = j; diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index 52a456e57..b06fae332 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -10,26 +10,28 @@ ******************************************************************************/ package forestry.farming.gadgets; -import buildcraft.api.statements.ITriggerExternal; -import cpw.mods.fml.common.Optional; -import forestry.api.core.ITileStructure; -import forestry.core.config.Defaults; -import forestry.core.inventory.AdjacentInventoryCache; -import forestry.core.inventory.ITileFilter; -import forestry.core.inventory.InvTools; -import forestry.core.inventory.TileInventoryAdapter; -import forestry.core.inventory.wrappers.InventoryMapper; -import forestry.core.utils.Utils; -import forestry.farming.triggers.FarmingTriggers; import java.util.Collection; import java.util.LinkedList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; + +import cpw.mods.fml.common.Optional; + +import forestry.api.core.ITileStructure; +import forestry.core.inventory.AdjacentInventoryCache; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.ITileFilter; +import forestry.core.inventory.InvTools; +import forestry.core.inventory.wrappers.InventoryMapper; +import forestry.farming.triggers.FarmingTriggers; + +import buildcraft.api.statements.ITriggerExternal; public class TileHatch extends TileFarm implements ISidedInventory { @@ -58,11 +60,8 @@ public class TileHatch extends TileFarm implements ISidedInventory { /* AUTO-EJECTING */ private IInventory getProductInventory() { - TileInventoryAdapter inventory = getStructureInventory(); - if (inventory == null) - return null; - - return new InventoryMapper(inventory, TileFarmPlain.SLOT_PRODUCTION_1, TileFarmPlain.SLOT_COUNT_PRODUCTION); + IInventoryAdapter inventory = getStructureInventory(); + return new InventoryMapper(inventory, TileFarmPlain.SLOT_PRODUCTION_1, TileFarmPlain.SLOT_PRODUCTION_COUNT); } protected void dumpStash() { @@ -77,142 +76,12 @@ public class TileHatch extends TileFarm implements ISidedInventory { /* IINVENTORY */ @Override - public TileInventoryAdapter getStructureInventory() { - if (hasMaster()) { - ITileStructure central = getCentralTE(); - if (central != null) - return (TileInventoryAdapter) central.getInventory(); - } + public IInventoryAdapter getInternalInventory() { + ITileStructure central = getCentralTE(); + if (central instanceof TileFarmPlain) + return ((TileFarmPlain) central).getInternalInventory(); - return null; - } - - @Override - public int getSizeInventory() { - IInventory inv = getStructureInventory(); - if (inv == null) - return 0; - - return inv.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slotIndex) { - IInventory inv = getStructureInventory(); - if (inv == null) - return null; - - return inv.getStackInSlot(slotIndex); - } - - @Override - public ItemStack decrStackSize(int slotIndex, int amount) { - IInventory inv = getStructureInventory(); - if (inv == null) - return null; - - return inv.decrStackSize(slotIndex, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slotIndex) { - IInventory inv = getStructureInventory(); - if (inv == null) - return null; - - return inv.getStackInSlotOnClosing(slotIndex); - } - - @Override - public void setInventorySlotContents(int slotIndex, ItemStack itemstack) { - IInventory inv = getStructureInventory(); - if (inv != null) - inv.setInventorySlotContents(slotIndex, itemstack); - } - - @Override - public int getInventoryStackLimit() { - IInventory inv = getStructureInventory(); - if (inv == null) - return 0; - - return inv.getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - IInventory inv = getStructureInventory(); - if (inv != null) - return inv.isUseableByPlayer(player); - return Utils.isUseableByPlayer(player, this); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - if (!hasMaster()) - return false; - - ITileStructure struct = getCentralTE(); - if (!(struct instanceof TileFarmPlain)) - return false; - - TileInventoryAdapter inventory = getStructureInventory(); - if (inventory == null || !inventory.isItemValidForSlot(slotIndex, itemstack)) - return false; - - TileFarmPlain housing = (TileFarmPlain) struct; - if (slotIndex == TileFarmPlain.SLOT_FERTILIZER && housing.acceptsAsFertilizer(itemstack)) - return true; - if (slotIndex >= TileFarmPlain.SLOT_RESOURCES_1 && slotIndex < TileFarmPlain.SLOT_RESOURCES_1 + TileFarmPlain.SLOT_COUNT_RESERVOIRS - && housing.acceptsAsResource(itemstack)) - return true; - if (slotIndex >= TileFarmPlain.SLOT_GERMLINGS_1 && slotIndex < TileFarmPlain.SLOT_GERMLINGS_1 + TileFarmPlain.SLOT_COUNT_RESERVOIRS - && housing.acceptsAsGermling(itemstack)) - return true; - if (slotIndex == TileFarmPlain.SLOT_CAN) - return FluidContainerRegistry.isFilledContainer(itemstack); - - return false; - } - - @Override - public boolean canInsertItem(int slotIndex, ItemStack itemstack, int side) { - return isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { - TileInventoryAdapter inventory = getStructureInventory(); - if (inventory == null || !inventory.canExtractItem(slotIndex, itemstack, side)) - return false; - - return slotIndex >= TileFarmPlain.SLOT_PRODUCTION_1 && slotIndex < TileFarmPlain.SLOT_PRODUCTION_1 + TileFarmPlain.SLOT_COUNT_PRODUCTION; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - TileInventoryAdapter inventory = getStructureInventory(); - if (inventory == null) - return Defaults.FACINGS_NONE; - return inventory.getAccessibleSlotsFromSide(side); + return super.getInternalInventory(); } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java index 6fcffc577..88ae85103 100755 --- a/src/main/java/forestry/farming/gui/ContainerFarm.java +++ b/src/main/java/forestry/farming/gui/ContainerFarm.java @@ -10,21 +10,16 @@ ******************************************************************************/ package forestry.farming.gui; -import forestry.api.farming.IFarmLogic; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; + import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.StandardTank; import forestry.core.gui.ContainerSocketed; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.gui.slots.SlotForestry; -import forestry.core.gui.slots.SlotLiquidContainer; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.farming.gadgets.TileFarmPlain; -import forestry.plugins.PluginFarming; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class ContainerFarm extends ContainerSocketed { @@ -35,40 +30,38 @@ public class ContainerFarm extends ContainerSocketed { this.tile = tile; - IInventory inv = tile.getInventory(); - // Resources for (int i = 0; i < 3; i++) { for (int j = 0; j < 2; j++) { - addSlotToContainer(new SlotResources(inv, tile.getFarmLogics(), TileFarmPlain.SLOT_RESOURCES_1 + j + i * 2, 123 + j * 18, 22 + i * 18)); + addSlotToContainer(new SlotFiltered(tile, TileFarmPlain.SLOT_RESOURCES_1 + j + i * 2, 123 + j * 18, 22 + i * 18)); } } // Germlings for (int i = 0; i < 3; i++) { for (int j = 0; j < 2; j++) { - addSlotToContainer(new SlotGermlings(inv, tile.getFarmLogics(), TileFarmPlain.SLOT_GERMLINGS_1 + j + i * 2, 164 + j * 18, 22 + i * 18)); + addSlotToContainer(new SlotFiltered(tile, TileFarmPlain.SLOT_GERMLINGS_1 + j + i * 2, 164 + j * 18, 22 + i * 18)); } } // Production 1 for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { - addSlotToContainer(new SlotOutput(inv, TileFarmPlain.SLOT_PRODUCTION_1 + j + i * 2, 123 + j * 18, 86 + i * 18)); + addSlotToContainer(new SlotOutput(tile, TileFarmPlain.SLOT_PRODUCTION_1 + j + i * 2, 123 + j * 18, 86 + i * 18)); } } // Production 2 for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { - addSlotToContainer(new SlotOutput(inv, TileFarmPlain.SLOT_PRODUCTION_1 + 4 + j + i * 2, 164 + j * 18, 86 + i * 18)); + addSlotToContainer(new SlotOutput(tile, TileFarmPlain.SLOT_PRODUCTION_1 + 4 + j + i * 2, 164 + j * 18, 86 + i * 18)); } } // Fertilizer - addSlotToContainer(new SlotCustom(inv, TileFarmPlain.SLOT_FERTILIZER, 63, 95, PluginFarming.farmFertilizer)); + addSlotToContainer(new SlotFiltered(tile, TileFarmPlain.SLOT_FERTILIZER, 63, 95)); // Can Slot - addSlotToContainer(new SlotLiquidContainer(inv, TileFarmPlain.SLOT_CAN, 15, 95)); + addSlotToContainer(new SlotFiltered(tile, TileFarmPlain.SLOT_CAN, 15, 95)); // Player inventory for (int i = 0; i < 3; i++) { @@ -115,41 +108,4 @@ public class ContainerFarm extends ContainerSocketed { return tile.getTankManager().get(slot); } - private class SlotResources extends SlotForestry { - - private final IFarmLogic[] logics; - - public SlotResources(IInventory inventory, IFarmLogic[] logics, int slotIndex, int xPos, int yPos) { - super(inventory, slotIndex, xPos, yPos); - this.logics = logics; - } - - @Override - public boolean isItemValid(ItemStack stack) { - for (IFarmLogic logic : logics) { - if (logic != null && logic.isAcceptedResource(stack)) - return true; - } - return false; - } - } - - private class SlotGermlings extends SlotForestry { - - private final IFarmLogic[] logics; - - public SlotGermlings(IInventory inventory, IFarmLogic[] logics, int slotIndex, int xPos, int yPos) { - super(inventory, slotIndex, xPos, yPos); - this.logics = logics; - } - - @Override - public boolean isItemValid(ItemStack stack) { - for (IFarmLogic logic : logics) { - if (logic != null && logic.isAcceptedGermling(stack)) - return true; - } - return false; - } - } } diff --git a/src/main/java/forestry/food/GuiHandlerFood.java b/src/main/java/forestry/food/GuiHandlerFood.java index 0fe74e5d5..2f3c0f0ca 100755 --- a/src/main/java/forestry/food/GuiHandlerFood.java +++ b/src/main/java/forestry/food/GuiHandlerFood.java @@ -16,6 +16,7 @@ import forestry.food.gui.ContainerInfuser; import forestry.food.gui.GuiInfuser; import forestry.food.items.ItemInfuser.InfuserInventory; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class GuiHandlerFood extends GuiHandlerBase { @@ -28,7 +29,10 @@ public class GuiHandlerFood extends GuiHandlerBase { switch (GuiId.values()[id]) { case InfuserGUI: - return new GuiInfuser(player.inventory, new InfuserInventory(player)); + ItemStack infuser = player.getCurrentEquippedItem(); + if (infuser == null) + return null; + return new GuiInfuser(player.inventory, new InfuserInventory(player, infuser)); default: return null; @@ -44,7 +48,10 @@ public class GuiHandlerFood extends GuiHandlerBase { switch (GuiId.values()[id]) { case InfuserGUI: - return new ContainerInfuser(player.inventory, new InfuserInventory(player)); + ItemStack infuser = player.getCurrentEquippedItem(); + if (infuser == null) + return null; + return new ContainerInfuser(player.inventory, new InfuserInventory(player, infuser)); default: return null; diff --git a/src/main/java/forestry/food/gui/ContainerInfuser.java b/src/main/java/forestry/food/gui/ContainerInfuser.java index 6a7ec5a61..f780569e6 100755 --- a/src/main/java/forestry/food/gui/ContainerInfuser.java +++ b/src/main/java/forestry/food/gui/ContainerInfuser.java @@ -10,17 +10,17 @@ ******************************************************************************/ package forestry.food.gui; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.proxy.Proxies; -import forestry.food.items.ItemBeverage; -import forestry.food.items.ItemInfuser.InfuserInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.core.proxy.Proxies; +import forestry.food.items.ItemInfuser.InfuserInventory; + public class ContainerInfuser extends ContainerForestry { private final InfuserInventory inventory; @@ -30,16 +30,16 @@ public class ContainerInfuser extends ContainerForestry { this.inventory = inventory; // Input - this.addSlotToContainer(new SlotCustom(inventory, 0, 152, 12, ForestryItem.beverage.getItemStack())); + this.addSlotToContainer(new SlotFiltered(inventory, 0, 152, 12)); // Output - this.addSlotToContainer(new SlotCustom(inventory, 1, 152, 72, ItemBeverage.class)); + this.addSlotToContainer(new SlotOutput(inventory, 1, 152, 72)); // Ingredients - this.addSlotToContainer(new Slot(inventory, 2, 12, 12)); - this.addSlotToContainer(new Slot(inventory, 3, 12, 32)); - this.addSlotToContainer(new Slot(inventory, 4, 12, 52)); - this.addSlotToContainer(new Slot(inventory, 5, 12, 72)); + this.addSlotToContainer(new SlotFiltered(inventory, 2, 12, 12)); + this.addSlotToContainer(new SlotFiltered(inventory, 3, 12, 32)); + this.addSlotToContainer(new SlotFiltered(inventory, 4, 12, 52)); + this.addSlotToContainer(new SlotFiltered(inventory, 5, 12, 72)); // Player inventory for (int i1 = 0; i1 < 3; i1++) diff --git a/src/main/java/forestry/food/items/ItemInfuser.java b/src/main/java/forestry/food/items/ItemInfuser.java index 98bb93fb4..4e1457a7b 100755 --- a/src/main/java/forestry/food/items/ItemInfuser.java +++ b/src/main/java/forestry/food/items/ItemInfuser.java @@ -230,14 +230,14 @@ public class ItemInfuser extends ItemForestry { // / INVENTORY MANAGMENT public static class InfuserInventory extends ItemInventory { - private final ItemStack[] inventoryStacks = new ItemStack[6]; private final short inputSlot = 0; private final short outputSlot = 1; private final short ingredientSlot1 = 2; + private final short ingredientSlotCount = 4; private final EntityPlayer player; - public InfuserInventory(EntityPlayer player) { - super(ItemInfuser.class); + public InfuserInventory(EntityPlayer player, ItemStack itemStack) { + super(ItemInfuser.class, 6, itemStack); this.player = player; } @@ -290,25 +290,6 @@ public class ItemInfuser extends ItemForestry { } - @Override - public ItemStack decrStackSize(int i, int j) { - if (inventoryStacks[i] == null) - return null; - - ItemStack product; - if (inventoryStacks[i].stackSize <= j) { - product = inventoryStacks[i]; - inventoryStacks[i] = null; - return product; - } else { - product = inventoryStacks[i].splitStack(j); - if (inventoryStacks[i].stackSize == 0) - inventoryStacks[i] = null; - - return product; - } - } - @Override public void markDirty() { if (!Proxies.common.isSimulating(player.worldObj)) @@ -316,61 +297,19 @@ public class ItemInfuser extends ItemForestry { trySeasoning(); } - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - inventoryStacks[i] = itemstack; - } - - @Override - public ItemStack getStackInSlot(int i) { - return inventoryStacks[i]; - } - - @Override - public int getSizeInventory() { - return inventoryStacks.length; - } - @Override public String getInventoryName() { return "Infuser"; } @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - if (inventoryStacks[slot] == null) - return null; - ItemStack toReturn = inventoryStacks[slot]; - inventoryStacks[slot] = null; - return toReturn; - } - - @Override - public boolean hasCustomInventoryName() { - return true; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (slotIndex == inputSlot) { + ForestryItem.beverage.isItemEqual(itemStack); + } else if (slotIndex >= ingredientSlot1 && slotIndex < ingredientSlot1 + ingredientSlotCount) { + BeverageManager.infuserManager.isIngredient(itemStack); + } + return false; } } diff --git a/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java index 687af84fd..22a65e6e5 100755 --- a/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java @@ -10,16 +10,17 @@ ******************************************************************************/ package forestry.lepidopterology; -import forestry.core.GuiHandlerBase; -import forestry.core.network.GuiId; -import forestry.lepidopterology.genetics.ButterflyHelper; -import forestry.lepidopterology.gui.ContainerFlutterlyzer; -import forestry.lepidopterology.gui.GuiFlutterlyzer; -import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.core.GuiHandlerBase; +import forestry.core.gui.ContainerAlyzer; +import forestry.core.network.GuiId; +import forestry.lepidopterology.genetics.ButterflyHelper; +import forestry.lepidopterology.gui.GuiFlutterlyzer; +import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; + public class GuiHandlerLepidopterology extends GuiHandlerBase { @Override @@ -32,11 +33,11 @@ public class GuiHandlerLepidopterology extends GuiHandlerBase { switch (GuiId.values()[cleanId]) { case FlutterlyzerGUI: - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; - return new ContainerFlutterlyzer(player.inventory, new FlutterlyzerInventory(player, equipped)); + return new ContainerAlyzer(new FlutterlyzerInventory(player, equipped), player); case LepidopteristChestGUI: return getNaturalistChestContainer(ButterflyHelper.UID, player, world, x, y, z, guiData); @@ -57,7 +58,7 @@ public class GuiHandlerLepidopterology extends GuiHandlerBase { switch (GuiId.values()[cleanId]) { case FlutterlyzerGUI: - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; diff --git a/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java deleted file mode 100755 index 5c23e09ff..000000000 --- a/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.lepidopterology.gui; - -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerAlyzer; -import forestry.lepidopterology.items.ItemButterflyGE; -import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; -import net.minecraft.entity.player.InventoryPlayer; - -public class ContainerFlutterlyzer extends ContainerAlyzer { - - FlutterlyzerInventory inventory; - - public ContainerFlutterlyzer(InventoryPlayer inventoryplayer, FlutterlyzerInventory inventory) { - super(inventoryplayer, inventory, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop }, ItemButterflyGE.class); - } - -} diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index e04b5ebea..5c65cfca2 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -21,6 +21,7 @@ import forestry.api.lepidopterology.IButterfly; import forestry.core.config.ForestryItem; import forestry.core.genetics.AlleleBoolean; import forestry.core.genetics.GenericRatings; +import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.utils.StringUtil; import forestry.lepidopterology.genetics.ButterflyGenome; @@ -37,7 +38,7 @@ import net.minecraft.item.ItemStack; public class GuiFlutterlyzer extends GuiAlyzer { public GuiFlutterlyzer(EntityPlayer player, FlutterlyzerInventory inventory) { - super("rootButterflies", player, new ContainerFlutterlyzer(player.inventory, inventory), inventory, "gui.flutterlyzer"); + super("rootButterflies", player, new ContainerAlyzer(inventory, player), inventory, "gui.flutterlyzer"); ArrayList butterflyList = new ArrayList(); ((ItemButterflyGE) ForestryItem.butterflyGE.item()).addCreativeItems(butterflyList, false); diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index 7b879591c..ac5ff30a3 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -10,12 +10,16 @@ ******************************************************************************/ package forestry.lepidopterology.items; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.api.lepidopterology.IButterfly; import forestry.core.EnumErrorCode; import forestry.core.config.Config; -import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; import forestry.core.inventory.AlyzerInventory; @@ -23,30 +27,19 @@ import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.plugins.PluginLepidopterology; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class ItemFlutterlyzer extends ItemInventoried { public static class FlutterlyzerInventory extends AlyzerInventory implements IErrorSource, IHintSource { - public FlutterlyzerInventory(EntityPlayer player) { - super(ItemFlutterlyzer.class, 7); - this.player = player; - } - public FlutterlyzerInventory(EntityPlayer player, ItemStack itemStack) { super(ItemFlutterlyzer.class, 7, itemStack); this.player = player; } - private boolean isEnergy(ItemStack itemstack) { - if (itemstack == null || itemstack.stackSize <= 0) - return false; - - return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + @Override + protected boolean isSpecimen(ItemStack itemStack) { + return PluginLepidopterology.butterflyInterface.isMember(itemStack); } private void tryAnalyze() { diff --git a/src/main/java/forestry/mail/GuiHandlerMail.java b/src/main/java/forestry/mail/GuiHandlerMail.java index eee2a1c7f..e32d8c0f0 100755 --- a/src/main/java/forestry/mail/GuiHandlerMail.java +++ b/src/main/java/forestry/mail/GuiHandlerMail.java @@ -44,7 +44,7 @@ public class GuiHandlerMail extends GuiHandlerBase { switch (GuiId.values()[id]) { case CatalogueGUI: - ItemStack cata = getEquippedItem(player); + ItemStack cata = player.getCurrentEquippedItem(); if (cata == null) return null; @@ -54,7 +54,7 @@ public class GuiHandlerMail extends GuiHandlerBase { return null; case LetterGUI: - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; @@ -85,7 +85,7 @@ public class GuiHandlerMail extends GuiHandlerBase { switch (GuiId.values()[id]) { case CatalogueGUI: - ItemStack cata = getEquippedItem(player); + ItemStack cata = player.getCurrentEquippedItem(); if (cata == null) return null; @@ -95,12 +95,12 @@ public class GuiHandlerMail extends GuiHandlerBase { return null; case LetterGUI: - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; if (equipped.getItem() instanceof ItemLetter) - return new ContainerLetter(player, new LetterInventory(getEquippedItem(player))); + return new ContainerLetter(player, new LetterInventory(equipped)); else return null; diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index f296ed577..4dec87f0f 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -14,6 +14,7 @@ import forestry.api.core.INBTTagable; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; +import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.StringUtil; import java.util.List; @@ -26,7 +27,9 @@ public class Letter implements ILetter, INBTTagable { // CONSTANTS public static final short SLOT_ATTACHMENT_1 = 0; + public static final short SLOT_ATTACHMENT_COUNT = 18; public static final short SLOT_POSTAGE_1 = 18; + public static final short SLOT_POSTAGE_COUNT = 4; private boolean isProcessed = false; @@ -86,12 +89,12 @@ public class Letter implements ILetter, INBTTagable { @Override public ItemStack[] getPostage() { - return inventory.getStacks(SLOT_POSTAGE_1, 4); + return InvTools.getStacks(inventory, SLOT_POSTAGE_1, SLOT_POSTAGE_COUNT); } @Override public ItemStack[] getAttachments() { - return inventory.getStacks(SLOT_ATTACHMENT_1, 18); + return InvTools.getStacks(inventory, SLOT_ATTACHMENT_1, SLOT_ATTACHMENT_COUNT); } @Override @@ -108,7 +111,7 @@ public class Letter implements ILetter, INBTTagable { @Override public void addAttachment(ItemStack itemstack) { - inventory.tryAddStack(itemstack, false); + InvTools.tryAddStack(inventory, itemstack, false); } @Override @@ -170,7 +173,7 @@ public class Letter implements ILetter, INBTTagable { @Override public void addStamps(ItemStack stamps) { - this.inventory.tryAddStack(stamps, SLOT_POSTAGE_1, 4, false); + InvTools.tryAddStack(inventory, stamps, SLOT_POSTAGE_1, 4, false); } @Override diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index 851cf1b3e..ee4eea106 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -10,23 +10,25 @@ ******************************************************************************/ package forestry.mail; -import forestry.api.mail.ILetter; -import forestry.api.mail.IMailAddress; -import forestry.api.mail.PostManager; -import forestry.core.inventory.InventoryAdapter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldSavedData; +import forestry.api.mail.ILetter; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; +import forestry.core.inventory.InvTools; +import forestry.core.inventory.InventoryAdapter; + public class POBox extends WorldSavedData implements IInventory { public static final String SAVE_NAME = "POBox_"; public static final short SLOT_SIZE = 84; private IMailAddress address; - private final InventoryAdapter letters = new InventoryAdapter(SLOT_SIZE, "Letters"); + private final InventoryAdapter letters = new InventoryAdapter(SLOT_SIZE, "Letters").disableAutomation(); public POBox(IMailAddress address) { super(SAVE_NAME + address); @@ -69,7 +71,8 @@ public class POBox extends WorldSavedData implements IInventory { letterstack.setTagCompound(nbttagcompound); this.markDirty(); - return this.letters.tryAddStack(letterstack, true); + + return InvTools.tryAddStack(letters, letterstack, true); } public POBoxInfo getPOBoxInfo() { @@ -151,7 +154,7 @@ public class POBox extends WorldSavedData implements IInventory { @Override public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; + return letters.isItemValidForSlot(i, itemstack); } } diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 467680f20..c5e929806 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -92,6 +92,9 @@ public class PostRegistry implements IPostRegistry { @Override public TradeStation getTradeStation(World world, IMailAddress address) { + if (address.getName() == null) + return null; + if (cachedTradeStations.containsKey(address)) return (TradeStation) cachedTradeStations.get(address); diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 6b5a21f38..00822f0ef 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -10,7 +10,19 @@ ******************************************************************************/ package forestry.mail; +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.world.World; +import net.minecraft.world.WorldSavedData; + import com.mojang.authlib.GameProfile; + import forestry.api.mail.EnumPostage; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; @@ -20,22 +32,67 @@ import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; import forestry.core.config.ForestryItem; -import forestry.core.interfaces.ICrafter; +import forestry.core.inventory.IInventoryAdapter; +import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; +import forestry.core.utils.GuiUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.StackUtils; import forestry.mail.items.ItemLetter; -import java.util.ArrayList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; -public class TradeStation extends WorldSavedData implements ITradeStation, ISidedInventory { +public class TradeStation extends WorldSavedData implements ITradeStation, IInventoryAdapter { + + public static class TradeStationInventory extends InventoryAdapter { + + public TradeStationInventory(int size, String name) { + super(size, name); + } + + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + + ArrayList slots = new ArrayList(); + + for (int i = SLOT_LETTERS_1; i < SLOT_LETTERS_1 + SLOT_LETTERS_COUNT; i++) + slots.add(i); + for (int i = SLOT_STAMPS_1; i < SLOT_STAMPS_1 + SLOT_STAMPS_COUNT; i++) + slots.add(i); + for (int i = SLOT_SEND_BUFFER; i < SLOT_SEND_BUFFER + SLOT_SEND_BUFFER_COUNT; i++) + slots.add(i); + + int[] slotsInt = new int[slots.size()]; + for (int i = 0; i < slots.size(); i++) + slotsInt[i] = slots.get(i); + + return slotsInt; + } + + @Override + public boolean canExtractItem(int slot, ItemStack itemStack, int side) { + return GuiUtil.isIndexInRange(slot, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT); + } + + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (GuiUtil.isIndexInRange(slotIndex, SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { + for (int i = 0; i < SLOT_TRADEGOOD_COUNT; i++) { + ItemStack tradeGood = getStackInSlot(SLOT_TRADEGOOD + i); + if (StackUtils.isIdenticalItem(tradeGood, itemStack)) + return true; + } + return false; + } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { + Item item = itemStack.getItem(); + return item == Items.paper; + } else if (GuiUtil.isIndexInRange(slotIndex, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { + Item item = itemStack.getItem(); + return item instanceof IStamps; + } + + return false; + } + } // / CONSTANTS public static final String SAVE_NAME = "TradePO_"; @@ -58,7 +115,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide private IMailAddress address; private boolean isVirtual = false; private boolean isInvalid = false; - private final InventoryAdapter inventory = new InventoryAdapter(SLOT_SIZE, "INV"); + private final InventoryAdapter inventory = new TradeStationInventory(SLOT_SIZE, "INV"); // / CONSTRUCTORS public TradeStation(GameProfile owner, IMailAddress address) { @@ -139,7 +196,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide @Override public TradeStationInfo getTradeInfo() { - ItemStack[] condensedRequired = StackUtils.condenseStacks(inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); + ItemStack[] condensedRequired = StackUtils.condenseStacks(InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); // Set current state EnumStationState state = EnumStationState.OK; @@ -171,7 +228,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide if (!isVirtual() && !hasPaper(sendOwnerNotice ? 2 : 1)) return EnumStationState.INSUFFICIENT_PAPER; - int ordersToFill = StackUtils.containsSets(inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT), letter.getAttachments()); + int ordersToFill = StackUtils.containsSets(InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT), letter.getAttachments()); // Not a single match. if (ordersToFill <= 0) @@ -188,7 +245,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide ordersToFill = fillable; // Check for sufficient output buffer - int storable = countStorablePayment(ordersToFill, inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); + int storable = countStorablePayment(ordersToFill, InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); if (storable <= 0) return EnumStationState.INSUFFICIENT_BUFFER; @@ -233,11 +290,11 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide // Store received items for (int i = 0; i < ordersToFill; i++) { - for (ItemStack stack : inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)) { + for (ItemStack stack : InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)) { if (stack == null) continue; - - inventory.tryAddStack(stack.copy(), SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, false); + + InvTools.tryAddStack(inventory, stack.copy(), SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, false); } } @@ -277,7 +334,8 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide // How many orders are fillable? int itemCount = 0; - for (ItemStack stack : inventory.getStacks(SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { + + for (ItemStack stack : InvTools.getStacks(inventory, SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { if (stack != null && stack.isItemEqual(tradegood) && ItemStack.areItemStackTagsEqual(stack, tradegood)) itemCount += stack.stackSize; } @@ -287,9 +345,9 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide public boolean canReceivePayment() { InventoryAdapter test = inventory.copy(); - ItemStack [] payment = inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); + ItemStack [] payment = InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); - return test.tryAddStacksCopy(payment, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true); + return InvTools.tryAddStacksCopy(test, payment, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true); } private int countStorablePayment(int max, ItemStack[] exchange) { @@ -298,7 +356,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide int count = 0; for (int i = 0; i < max; i++) { - if (test.tryAddStacksCopy(exchange, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true)) + if (InvTools.tryAddStacksCopy(test, exchange, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true)) count++; else break; @@ -335,8 +393,8 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide private boolean hasPaper(int amountRequired) { int amountFound = 0; - - for (ItemStack stack : inventory.getStacks(SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { + + for (ItemStack stack : InvTools.getStacks(inventory, SLOT_LETTERS_1, SLOT_LETTERS_COUNT)) { if (stack != null) amountFound += stack.stackSize; @@ -360,8 +418,8 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide private boolean canPayPostage(int postage) { int posted = 0; - - for (ItemStack stamp : inventory.getStacks(SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { + + for (ItemStack stamp : InvTools.getStacks(inventory, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { if (stamp == null) continue; @@ -405,7 +463,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide private int getNumStamps(EnumPostage postage) { int count = 0; - for (ItemStack stamp : inventory.getStacks(SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { + for (ItemStack stamp : InvTools.getStacks(inventory, SLOT_STAMPS_1, SLOT_STAMPS_COUNT)) { if (stamp == null) continue; if (!(stamp.getItem() instanceof IStamps)) @@ -456,7 +514,8 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide // Remove stuff until we are only left with the remnants for (int i = 0; i < filled; i++) { - ItemStack[] condensedRequired = StackUtils.condenseStacks(inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT)); + ItemStack[] required = InvTools.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); + ItemStack[] condensedRequired = StackUtils.condenseStacks(required); for (ItemStack req : condensedRequired) { for (int j = 0; j < pool.length; j++) { ItemStack pol = pool[j]; @@ -529,7 +588,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide @Override public boolean isUseableByPlayer(EntityPlayer player) { - return PlayerUtil.isSameGameProfile(owner, player.getGameProfile()); + return true; } @Override @@ -540,68 +599,38 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide public void closeInventory() { } + @Override + public boolean isItemValidForSlot(int i, ItemStack itemStack) { + return inventory.isItemValidForSlot(i, itemStack); + } + @Override public boolean hasCustomInventoryName() { return true; } - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemStack) { - if (itemStack == null || itemStack.getItem() == null) - return false; - - if (slot >= SLOT_LETTERS_1 && slot < SLOT_LETTERS_1 + SLOT_LETTERS_COUNT) - return itemStack.getItem() == Items.paper; - - if (slot >= SLOT_STAMPS_1 && slot < SLOT_STAMPS_1 + SLOT_STAMPS_COUNT) - return itemStack.getItem() instanceof IStamps; - - if (slot >= SLOT_SEND_BUFFER && slot < SLOT_SEND_BUFFER + SLOT_SEND_BUFFER_COUNT) { - ItemStack item = StackUtils.createSplitStack(itemStack, 1); - return inventory.contains(item, SLOT_TRADEGOOD, SLOT_TRADEGOOD_COUNT); - } - - return false; - } - @Override public int[] getAccessibleSlotsFromSide(int side) { - return getAccessibleSlotsFromSide(side, false); - } - - public int[] getAccessibleSlotsFromSide(int side, boolean permission) { - - ArrayList slots = new ArrayList(); - - for (int i = SLOT_LETTERS_1; i < SLOT_LETTERS_1 + SLOT_LETTERS_COUNT; i++) - slots.add(i); - for (int i = SLOT_STAMPS_1; i < SLOT_STAMPS_1 + SLOT_STAMPS_COUNT; i++) - slots.add(i); - if (permission) { - for (int i = SLOT_RECEIVE_BUFFER; i < SLOT_RECEIVE_BUFFER + SLOT_RECEIVE_BUFFER_COUNT; i++) - slots.add(i); - } - for (int i = SLOT_SEND_BUFFER; i < SLOT_SEND_BUFFER + SLOT_SEND_BUFFER_COUNT; i++) - slots.add(i); - - int[] slotsInt = new int[slots.size()]; - for (int i = 0; i < slots.size(); i++) - slotsInt[i] = slots.get(i); - - return slotsInt; + return inventory.getAccessibleSlotsFromSide(side); } @Override public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - return isItemValidForSlot(slot, itemStack); + return inventory.canInsertItem(slot, itemStack, side); } @Override public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return canExtractItem(slot, itemStack, side, false); + return inventory.canExtractItem(slot, itemStack, side); } - public boolean canExtractItem(int slot, ItemStack itemStack, int side, boolean permission) { - return permission && slot >= SLOT_RECEIVE_BUFFER && slot < SLOT_RECEIVE_BUFFER + SLOT_RECEIVE_BUFFER_COUNT; + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return inventory.canSlotAccept(slotIndex, itemStack); + } + + @Override + public IInventoryAdapter configureSided(int[] sides, int[] slots) { + return inventory.configureSided(sides, slots); } } diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index 27a8ea980..87d3c704d 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -50,6 +50,7 @@ public class MachineMailbox extends TileBase implements IMailContainer { public MachineMailbox() { setHints(Config.hints.get("mailbox")); + setInternalInventory(new InventoryAdapter(POBox.SLOT_SIZE, "Letters").disableAutomation()); } /* GUI */ @@ -83,8 +84,9 @@ public class MachineMailbox extends TileBase implements IMailContainer { /* MAIL HANDLING */ public IInventory getOrCreateMailInventory(World world, GameProfile playerProfile) { - if (!Proxies.common.isSimulating(world)) - return new InventoryAdapter(POBox.SLOT_SIZE, "Letters"); + if (!Proxies.common.isSimulating(world)) { + return getInternalInventory(); + } IMailAddress address = PostManager.postRegistry.getMailAddress(playerProfile); return PostRegistry.getOrCreatePOBox(worldObj, address); diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java index 3d885e651..95499f49b 100755 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java @@ -10,16 +10,18 @@ ******************************************************************************/ package forestry.mail.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import forestry.api.core.ForestryAPI; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; import forestry.core.gadgets.TileBase; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.utils.StackUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class MachinePhilatelist extends TileBase implements IInventory { @@ -29,12 +31,12 @@ public class MachinePhilatelist extends TileBase implements IInventory { public static final short SLOT_BUFFER_COUNT = 27; public MachinePhilatelist() { - setInternalInventory(new TileInventoryAdapter(this, 28, "INV")); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); + setInternalInventory(new TileInventoryAdapter(this, 28, "INV") { + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + return itemStack.getItem() instanceof IStamps; + } + }); } @Override @@ -50,7 +52,7 @@ public class MachinePhilatelist extends TileBase implements IInventory { ItemStack stamp = null; - TileInventoryAdapter inventory = getInternalInventory(); + IInventoryAdapter inventory = getInternalInventory(); if (inventory.getStackInSlot(SLOT_FILTER) == null) stamp = PostManager.postRegistry.getPostOffice(worldObj).getAnyStamp(1); else { @@ -65,59 +67,4 @@ public class MachinePhilatelist extends TileBase implements IInventory { // Store it. StackUtils.stowInInventory(stamp, inventory, true, SLOT_BUFFER_1, SLOT_BUFFER_COUNT); } - - /* IINVENTORY */ - @Override - public int getSizeInventory() { - return getInternalInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getInternalInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getInternalInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getInternalInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getInternalInventory().getStackInSlotOnClosing(slot); - } - - @Override - public int getInventoryStackLimit() { - return getInternalInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return getInternalInventory().isUseableByPlayer(player); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return getInternalInventory().isItemValidForSlot(slotIndex, itemstack); - } - } diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 4f929b4da..a56fef9b7 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -16,7 +16,6 @@ import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -30,32 +29,25 @@ import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; import forestry.core.EnumErrorCode; -import forestry.core.config.Defaults; import forestry.core.gadgets.TileBase; -import forestry.core.inventory.InventoryAdapter; +import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; -import forestry.core.utils.EnumAccess; import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; import forestry.mail.MailAddress; import forestry.mail.TradeStation; import forestry.mail.triggers.MailTriggers; import buildcraft.api.statements.ITriggerExternal; -public class MachineTrader extends TileBase implements ISidedInventory { +public class MachineTrader extends TileBase { private IMailAddress address; public MachineTrader() { address = new MailAddress(); - } - - @Override - public String getInventoryName() { - return getUnlocalizedName(); + setInternalInventory(new TradeStation.TradeStationInventory(TradeStation.SLOT_SIZE, "INV")); } @Override @@ -94,7 +86,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { @Override public PacketPayload getPacketPayload() { - if (address == null) + if (address == null || address.getName() == null) return null; PacketPayload payload = new PacketPayload(0, 0, 1); @@ -140,7 +132,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { return; } - IInventory inventory = getOrCreateTradeInventory(); + IInventory inventory = getInternalInventory(); ItemStack tradeGood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); if (tradeGood == null) { @@ -181,7 +173,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { private boolean hasItemCount(int startSlot, int countSlots, ItemStack item, int itemCount) { int count = 0; - IInventory tradeInventory = this.getOrCreateTradeInventory(); + IInventory tradeInventory = this.getInternalInventory(); for (int i = startSlot; i < startSlot + countSlots; i++) { ItemStack itemInSlot = tradeInventory.getStackInSlot(i); if (itemInSlot == null) @@ -203,7 +195,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { int count = 0; int total = 0; - IInventory tradeInventory = this.getOrCreateTradeInventory(); + IInventory tradeInventory = this.getInternalInventory(); for (int i = startSlot; i < startSlot + countSlots; i++) { ItemStack itemInSlot = tradeInventory.getStackInSlot(i); if (itemInSlot == null) @@ -223,7 +215,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { } public boolean hasInputBufMin(float percentage) { - IInventory inventory = getOrCreateTradeInventory(); + IInventory inventory = getInternalInventory(); ItemStack tradeGood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); if (tradeGood == null) return true; @@ -238,7 +230,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { int posted = 0; - IInventory tradeInventory = this.getOrCreateTradeInventory(); + IInventory tradeInventory = this.getInternalInventory(); for (int i = TradeStation.SLOT_STAMPS_1; i < TradeStation.SLOT_STAMPS_1 + TradeStation.SLOT_STAMPS_COUNT; i++) { ItemStack stamp = tradeInventory.getStackInSlot(i); if (stamp == null) @@ -283,107 +275,14 @@ public class MachineTrader extends TileBase implements ISidedInventory { } } - /* TRADING */ - public IInventory getOrCreateTradeInventory() { - + @Override + public IInventoryAdapter getInternalInventory() { // Handle client side - if (!Proxies.common.isSimulating(worldObj)) - return new InventoryAdapter(TradeStation.SLOT_SIZE, "INV"); - - if (!address.isValid()) - return new InventoryAdapter(TradeStation.SLOT_SIZE, "INV"); - - return PostManager.postRegistry.getOrCreateTradeStation(worldObj, getOwnerProfile(), address); - } - - /* ISIDEDINVENTORY */ - @Override - public int getSizeInventory() { - return getOrCreateTradeInventory().getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getOrCreateTradeInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getOrCreateTradeInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getOrCreateTradeInventory().setInventorySlotContents(i, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return getOrCreateTradeInventory().getStackInSlotOnClosing(slot); - } - - @Override - public void markDirty() { - getOrCreateTradeInventory().markDirty(); - } - - @Override - public int getInventoryStackLimit() { - return getOrCreateTradeInventory().getInventoryStackLimit(); - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean hasCustomInventoryName() { - return getOrCreateTradeInventory().hasCustomInventoryName(); - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return getOrCreateTradeInventory().isItemValidForSlot(slotIndex, itemstack); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if (!Utils.isUseableByPlayer(player, this)) - return false; - return allowsViewing(player); - } - - /* ISIDEDINVENTORY */ - @Override - public boolean canInsertItem(int i, ItemStack itemstack, int j) { - IInventory inventory = getOrCreateTradeInventory(); - if (inventory instanceof TradeStation) - return ((TradeStation) inventory).canInsertItem(i, itemstack, j); - return false; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { - IInventory inventory = getOrCreateTradeInventory(); - if (inventory instanceof TradeStation) { - boolean permission = (getAccess() == EnumAccess.SHARED); - return ((TradeStation) inventory).canExtractItem(i, itemstack, j, permission); + if (!Proxies.common.isSimulating(worldObj) || !address.isValid()) { + return super.getInternalInventory(); } - return false; - } - @Override - public int[] getAccessibleSlotsFromSide(int side) { - IInventory inventory = getOrCreateTradeInventory(); - if (inventory instanceof TradeStation) { - boolean permission = (getAccess() == EnumAccess.SHARED); - return ((TradeStation) inventory).getAccessibleSlotsFromSide(side, permission); - } - return Defaults.FACINGS_NONE; + return (TradeStation)PostManager.postRegistry.getOrCreateTradeStation(worldObj, getOwnerProfile(), address); } /* ITRIGGERPROVIDER */ @@ -401,5 +300,4 @@ public class MachineTrader extends TileBase implements ISidedInventory { res.add(MailTriggers.highBuffer75); return res; } - } diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index 6dfe3946c..da9a6555e 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -10,7 +10,18 @@ ******************************************************************************/ package forestry.mail.gui; +import java.util.Iterator; +import java.util.UUID; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import org.apache.commons.lang3.StringUtils; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; @@ -19,8 +30,7 @@ import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; @@ -28,15 +38,7 @@ import forestry.core.proxy.Proxies; import forestry.mail.Letter; import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemLetter.LetterInventory; -import forestry.mail.items.ItemStamps; import forestry.mail.network.PacketLetterInfo; -import java.util.Iterator; -import java.util.UUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; -import org.apache.commons.lang3.StringUtils; public class ContainerLetter extends ContainerItemInventory { @@ -55,23 +57,15 @@ public class ContainerLetter extends ContainerItemInventory { inventory.parent.setItemDamage(ItemLetter.encodeMeta(2, ItemLetter.getSize(inventory.parent.getItemDamage()))); // Init slots - Object[] validStamps = new Object[] { ItemStamps.class }; - if (letterInventory.getLetter().isProcessed()) - validStamps = new Object[] {}; // Stamps for (int i = 0; i < 4; i++) - addSlotToContainer(new SlotCustom(inventory, Letter.SLOT_POSTAGE_1 + i, 150, 14 + i * 19, validStamps).setStackLimit(1)); + addSlotToContainer(new SlotFiltered(inventory, Letter.SLOT_POSTAGE_1 + i, 150, 14 + i * 19).setStackLimit(1)); // Attachments - if (!letterInventory.getLetter().isProcessed()) - for (int i = 0; i < 2; i++) - for (int j = 0; j < 9; j++) - addSlotToContainer(new SlotCustom(inventory, Letter.SLOT_ATTACHMENT_1 + j + i * 9, 17 + j * 18, 98 + i * 18, ItemLetter.class).setExclusion(true)); - else - for (int i = 0; i < 2; i++) - for (int j = 0; j < 9; j++) - addSlotToContainer(new SlotClosed(inventory, Letter.SLOT_ATTACHMENT_1 + j + i * 9, 17 + j * 18, 98 + i * 18)); + for (int i = 0; i < 2; i++) + for (int j = 0; j < 9; j++) + addSlotToContainer(new SlotFiltered(inventory, Letter.SLOT_ATTACHMENT_1 + j + i * 9, 17 + j * 18, 98 + i * 18)); // Player inventory for (int i = 0; i < 3; i++) @@ -102,11 +96,6 @@ public class ContainerLetter extends ContainerItemInventory { super.onContainerClosed(entityplayer); } - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return true; - } - public ILetter getLetter() { return letterInventory.getLetter(); } diff --git a/src/main/java/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java index 642697792..0fdf59bf3 100755 --- a/src/main/java/forestry/mail/gui/ContainerMailbox.java +++ b/src/main/java/forestry/mail/gui/ContainerMailbox.java @@ -12,7 +12,6 @@ package forestry.mail.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -20,7 +19,7 @@ import net.minecraft.item.ItemStack; import forestry.api.mail.IMailAddress; import forestry.api.mail.PostManager; import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; +import forestry.core.gui.slots.SlotOutput; import forestry.core.proxy.Proxies; import forestry.mail.POBox; import forestry.mail.gadgets.MachineMailbox; @@ -48,7 +47,7 @@ public class ContainerMailbox extends ContainerForestry { for (int i = 0; i < 7; i++) for (int j = 0; j < 12; j++) - addSlotToContainer(new SlotClosed(inventory, j + i * 9, 8 + j * 18, 8 + i * 18)); + addSlotToContainer(new SlotOutput(inventory, j + i * 9, 8 + j * 18, 8 + i * 18)); // Player inventory for (int i = 0; i < 3; i++) diff --git a/src/main/java/forestry/mail/gui/ContainerPhilatelist.java b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java index 6ab9b9972..5adf0b062 100755 --- a/src/main/java/forestry/mail/gui/ContainerPhilatelist.java +++ b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java @@ -10,26 +10,26 @@ ******************************************************************************/ package forestry.mail.gui; -import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotCustom; -import forestry.mail.gadgets.MachinePhilatelist; -import forestry.mail.items.ItemStamps; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import forestry.core.gui.ContainerForestry; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotOutput; +import forestry.mail.gadgets.MachinePhilatelist; + public class ContainerPhilatelist extends ContainerForestry { public ContainerPhilatelist(InventoryPlayer player, MachinePhilatelist tile) { super(tile); // Filter - addSlotToContainer(new SlotCustom(tile, MachinePhilatelist.SLOT_FILTER, 80, 19, ItemStamps.class)); + addSlotToContainer(new SlotFiltered(tile, MachinePhilatelist.SLOT_FILTER, 80, 19)); // Collected Stamps for (int i = 0; i < 3; i++) for (int j = 0; j < 9; j++) - addSlotToContainer(new SlotClosed(tile, j + i * 9 + MachinePhilatelist.SLOT_BUFFER_1, 8 + j * 18, 46 + i * 18)); + addSlotToContainer(new SlotOutput(tile, j + i * 9 + MachinePhilatelist.SLOT_BUFFER_1, 8 + j * 18, 46 + i * 18)); // Player inventory for (int i = 0; i < 3; i++) diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index 38fb66134..eec4eaf5f 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -11,18 +11,15 @@ package forestry.mail.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import forestry.api.mail.IMailAddress; import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; -import forestry.core.gui.slots.SlotCustom; +import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotForestry; +import forestry.core.gui.slots.SlotOutput; import forestry.mail.TradeStation; import forestry.mail.gadgets.MachineTrader; -import forestry.mail.items.ItemStamps; public class ContainerTrader extends ContainerForestry { @@ -32,29 +29,28 @@ public class ContainerTrader extends ContainerForestry { super(tile); machine = tile; - IInventory inventory = machine.getOrCreateTradeInventory(); // Trade good - this.addSlotToContainer(new SlotForestry(inventory, TradeStation.SLOT_TRADEGOOD, 78, 109).blockShift()); + this.addSlotToContainer(new SlotForestry(machine, TradeStation.SLOT_TRADEGOOD, 78, 109).blockShift()); // Exchange for (int row = 0; row < 2; row++) { for (int col = 0; col < 2; col++) { - addSlotToContainer(new SlotForestry(inventory, TradeStation.SLOT_EXCHANGE_1 + col + row * 2, 69 + col * 18, 55 + row * 18).blockShift()); + addSlotToContainer(new SlotForestry(machine, TradeStation.SLOT_EXCHANGE_1 + col + row * 2, 69 + col * 18, 55 + row * 18).blockShift()); } } // Stamps for (int row = 0; row < 2; row++) { for (int col = 0; col < 2; col++) { - addSlotToContainer(new SlotCustom(inventory, TradeStation.SLOT_STAMPS_1 + col + row * 2, 15 + col * 18, 37 + row * 18, ItemStamps.class)); + addSlotToContainer(new SlotFiltered(machine, TradeStation.SLOT_STAMPS_1 + col + row * 2, 15 + col * 18, 37 + row * 18)); } } // Letters for (int row = 0; row < 3; row++) { for (int col = 0; col < 2; col++) { - addSlotToContainer(new SlotCustom(inventory, TradeStation.SLOT_LETTERS_1 + col + row * 2, 15 + col * 18, 73 + row * 18, Items.paper)); + addSlotToContainer(new SlotFiltered(machine, TradeStation.SLOT_LETTERS_1 + col + row * 2, 15 + col * 18, 73 + row * 18)); } } @@ -62,13 +58,13 @@ public class ContainerTrader extends ContainerForestry { final int bufCols = 5; for (int row = 0; row < 3; row++) { for (int col = 0; col < bufCols; col++) { - addSlotToContainer(new SlotClosed(inventory, TradeStation.SLOT_RECEIVE_BUFFER + col + row * bufCols, 123 + col * 18, 19 + row * 18)); + addSlotToContainer(new SlotOutput(machine, TradeStation.SLOT_RECEIVE_BUFFER + col + row * bufCols, 123 + col * 18, 19 + row * 18)); } } for (int row = 0; row < 2; row++) { for (int col = 0; col < bufCols; col++) { - addSlotToContainer(new Slot(inventory, TradeStation.SLOT_SEND_BUFFER + col + row * bufCols, 123 + col * 18, (19 + (18 * 4)) + row * 18)); + addSlotToContainer(new SlotFiltered(machine, TradeStation.SLOT_SEND_BUFFER + col + row * bufCols, 123 + col * 18, (19 + (18 * 4)) + row * 18)); } } diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index b155adb12..a616492f0 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -10,12 +10,25 @@ ******************************************************************************/ package forestry.mail.items; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.core.ForestryAPI; import forestry.api.mail.ILetter; import forestry.core.EnumErrorCode; import forestry.core.config.Config; +import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; import forestry.core.inventory.ItemInventory; @@ -23,16 +36,9 @@ import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; +import forestry.core.utils.GuiUtil; import forestry.core.utils.StringUtil; import forestry.mail.Letter; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; public class ItemLetter extends ItemInventoried { @@ -41,9 +47,7 @@ public class ItemLetter extends ItemInventoried { ILetter letter; public LetterInventory(ItemStack itemstack) { - super(ItemLetter.class); - this.parent = itemstack; - this.isItemInventory = true; + super(ItemLetter.class, 0, itemstack); // Set an uid to identify the itemstack on SMP setUID(true); @@ -132,19 +136,24 @@ public class ItemLetter extends ItemInventoried { return letter.isUseableByPlayer(entityplayer); } - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - @Override public ItemStack getStackInSlotOnClosing(int slot) { return letter.getStackInSlotOnClosing(slot); } + @Override + public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { + if (letter.isProcessed()) { + return false; + } else if (GuiUtil.isIndexInRange(slotIndex, Letter.SLOT_POSTAGE_1, Letter.SLOT_POSTAGE_COUNT)) { + Item item = itemStack.getItem(); + return item instanceof ItemStamps; + } else if (GuiUtil.isIndexInRange(slotIndex, Letter.SLOT_ATTACHMENT_1, Letter.SLOT_ATTACHMENT_COUNT)) { + return !ForestryItem.letters.isItemEqual(itemStack); + } + return false; + } + // / IERRORSOURCE @Override public boolean throwsErrors() { diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index b46a1cb64..fc37a28f8 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -85,17 +85,21 @@ public class BackpackDefinition implements IBackpackDefinition { addValidItem(validItem); } - public ArrayList getValidItems(EntityPlayer player) { + public ArrayList getValidItems() { return validItems; } @Override public boolean isValidItem(EntityPlayer player, ItemStack itemstack) { - for (ItemStack stack : getValidItems(player)) + return isValidItem(itemstack); + } + + @Override + public boolean isValidItem(ItemStack itemstack) { + for (ItemStack stack : getValidItems()) if (StackUtils.isCraftingEquivalent(stack, itemstack, true, false)) return true; return false; } - } diff --git a/src/main/java/forestry/storage/GuiHandlerStorage.java b/src/main/java/forestry/storage/GuiHandlerStorage.java index 8624dc305..34692d6a4 100755 --- a/src/main/java/forestry/storage/GuiHandlerStorage.java +++ b/src/main/java/forestry/storage/GuiHandlerStorage.java @@ -10,6 +10,11 @@ ******************************************************************************/ package forestry.storage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; @@ -18,25 +23,22 @@ import forestry.core.config.Defaults; import forestry.core.gui.GuiNaturalistInventory; import forestry.core.gui.IPagedInventory; import forestry.core.inventory.ItemInventory; +import forestry.core.inventory.ItemInventoryBackpack; import forestry.core.network.GuiId; import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.ContainerNaturalistBackpack; import forestry.storage.gui.GuiBackpack; import forestry.storage.gui.GuiBackpackT2; import forestry.storage.items.ItemBackpack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class GuiHandlerStorage extends GuiHandlerBase { - public static class PagedInventory extends ItemInventory implements IPagedInventory { + public static class PagedBackpackInventory extends ItemInventoryBackpack implements IPagedInventory { //private final int x, y, z; private final int guiId; - public PagedInventory(Class itemClass, int size, ItemStack itemstack, int x, int y, int z, int guiId) { + public PagedBackpackInventory(Class itemClass, int size, ItemStack itemstack, int x, int y, int z, int guiId) { super(itemClass, size, itemstack); /*this.x = x; this.y = y; @@ -67,28 +69,28 @@ public class GuiHandlerStorage extends GuiHandlerBase { if (equipped == null) return null; ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"); - PagedInventory inventory = new PagedInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, cleanId); - return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistBackpack(speciesRoot, player.inventory, inventory, guiData, 25), inventory, guiData, 5); + PagedBackpackInventory inventory = new PagedBackpackInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, cleanId); + return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistBackpack(player.inventory, inventory, guiData, 25), inventory, guiData, 5); case BackpackGUI: equipped = getBackpackItem(player); if (equipped == null) return null; - return new GuiBackpack(new ContainerBackpack(player, new ItemInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_DEFAULT, equipped))); + return new GuiBackpack(new ContainerBackpack(player, new ItemInventoryBackpack(ItemBackpack.class, Defaults.SLOTS_BACKPACK_DEFAULT, equipped))); case BackpackT2GUI: equipped = getBackpackItem(player); if (equipped == null) return null; - return new GuiBackpackT2(new ContainerBackpack(player, new ItemInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_T2, equipped))); + return new GuiBackpackT2(new ContainerBackpack(player, new ItemInventoryBackpack(ItemBackpack.class, Defaults.SLOTS_BACKPACK_T2, equipped))); case LepidopteristBackpackGUI: equipped = getBackpackItem(player); if (equipped == null) return null; speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"); - inventory = new PagedInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, id); - return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistBackpack(speciesRoot, player.inventory, inventory, guiData, 25), inventory, guiData, 5); + inventory = new PagedBackpackInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, id); + return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistBackpack(player.inventory, inventory, guiData, 25), inventory, guiData, 5); default: return null; @@ -97,7 +99,7 @@ public class GuiHandlerStorage extends GuiHandlerBase { } private ItemStack getBackpackItem(EntityPlayer player) { - ItemStack equipped = getEquippedItem(player); + ItemStack equipped = player.getCurrentEquippedItem(); if (equipped == null) return null; if (equipped.getItem() instanceof ItemBackpack) @@ -121,32 +123,28 @@ public class GuiHandlerStorage extends GuiHandlerBase { if (equipped == null) return null; - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"); - speciesRoot.getBreedingTracker(world, player.getGameProfile()).synchToPlayer(player); - return new ContainerNaturalistBackpack(speciesRoot, player.inventory, new PagedInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, cleanId), guiData, 25); + return new ContainerNaturalistBackpack(player.inventory, new PagedBackpackInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, cleanId), guiData, 25); case BackpackGUI: equipped = getBackpackItem(player); if (equipped == null) return null; - return new ContainerBackpack(player, new ItemInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_DEFAULT, equipped)); + return new ContainerBackpack(player, new ItemInventoryBackpack(ItemBackpack.class, Defaults.SLOTS_BACKPACK_DEFAULT, equipped)); case BackpackT2GUI: equipped = getBackpackItem(player); if (equipped == null) return null; - return new ContainerBackpack(player, new ItemInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_T2, equipped)); + return new ContainerBackpack(player, new ItemInventoryBackpack(ItemBackpack.class, Defaults.SLOTS_BACKPACK_T2, equipped)); case LepidopteristBackpackGUI: equipped = getBackpackItem(player); if (equipped == null) return null; - speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"); - speciesRoot.getBreedingTracker(world, player.getGameProfile()).synchToPlayer(player); - return new ContainerNaturalistBackpack(speciesRoot, player.inventory, new PagedInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, cleanId), guiData, 25); + return new ContainerNaturalistBackpack(player.inventory, new PagedBackpackInventory(ItemBackpack.class, Defaults.SLOTS_BACKPACK_APIARIST, equipped, x, y, z, cleanId), guiData, 25); default: return null; diff --git a/src/main/java/forestry/storage/ResupplyHandler.java b/src/main/java/forestry/storage/ResupplyHandler.java index ee44c5c30..52d26fb77 100755 --- a/src/main/java/forestry/storage/ResupplyHandler.java +++ b/src/main/java/forestry/storage/ResupplyHandler.java @@ -16,6 +16,7 @@ import forestry.api.storage.BackpackResupplyEvent; import forestry.api.storage.IBackpackDefinition; import forestry.core.interfaces.IResupplyHandler; import forestry.core.inventory.ItemInventory; +import forestry.core.inventory.ItemInventoryBackpack; import forestry.storage.items.ItemBackpack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ContainerPlayer; @@ -59,7 +60,7 @@ public class ResupplyHandler implements IResupplyHandler { // Load their inventory ItemBackpack packItem = ((ItemBackpack) backpack.getItem()); - ItemInventory backpackinventory = new ItemInventory(ItemBackpack.class, packItem.getBackpackSize(), backpack); + ItemInventory backpackinventory = new ItemInventoryBackpack(ItemBackpack.class, packItem.getBackpackSize(), backpack); Event event = new BackpackResupplyEvent(player, packItem.getDefinition(), backpackinventory); MinecraftForge.EVENT_BUS.post(event); if (event.isCanceled()) diff --git a/src/main/java/forestry/storage/gui/ContainerBackpack.java b/src/main/java/forestry/storage/gui/ContainerBackpack.java index 727d0e92d..a456b4886 100755 --- a/src/main/java/forestry/storage/gui/ContainerBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerBackpack.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.storage.gui; +import net.minecraft.entity.player.EntityPlayer; + import forestry.core.config.Defaults; import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.slots.SlotForestry; -import forestry.core.inventory.ItemInventory; -import forestry.storage.items.ItemBackpack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.inventory.ItemInventoryBackpack; public class ContainerBackpack extends ContainerItemInventory { - public ContainerBackpack(final EntityPlayer player, ItemInventory inventory) { + public ContainerBackpack(final EntityPlayer player, ItemInventoryBackpack inventory) { super(inventory, player); int lines = 0; @@ -40,18 +39,12 @@ public class ContainerBackpack extends ContainerItemInventory { } // Inventory - for (int j = 0; j < lines; j++) + for (int j = 0; j < lines; j++) { for (int k = 0; k < columns; k++) { int slot = k + j * columns; - addSlotToContainer(new SlotForestry(inventory, slot, startX + k * 18, startY + j * 18) { - - @Override - public boolean isItemValid(ItemStack stack) { - return isAcceptedItem(player, stack); - } - - }); + addSlotToContainer(new SlotFiltered(inventory, slot, startX + k * 18, startY + j * 18)); } + } // Player inventory for (int i = 0; i < 3; i++) @@ -62,21 +55,4 @@ public class ContainerBackpack extends ContainerItemInventory { addSecuredSlot(player.inventory, i, 8 + i * 18, 11 + startY + lines * 18 + 58); } - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - // FIXME: This is incorrect. - // However, if we return false here, even valid items will be dropped - // while being kept inside the backpack, leading to duping. - // inventory.parent will turn null with the current implementation if - // something is put inside a backpack and the backpack is then - // moved from the action bar into the player's inventory. - if (inventory.parent == null) - return true; - - if (!(inventory.parent.getItem() instanceof ItemBackpack)) - return false; - - return ((ItemBackpack) inventory.parent.getItem()).getDefinition().isValidItem(player, stack); - } - } diff --git a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java index e93141cdc..f5e6c7b19 100755 --- a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java @@ -10,32 +10,28 @@ ******************************************************************************/ package forestry.storage.gui; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.IGuiSelectable; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.network.PacketUpdate; -import forestry.core.proxy.Proxies; -import forestry.storage.GuiHandlerStorage.PagedInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; + +import forestry.core.gui.ContainerItemInventory; +import forestry.core.gui.IGuiSelectable; +import forestry.core.gui.slots.SlotFiltered; +import forestry.core.network.PacketUpdate; +import forestry.storage.GuiHandlerStorage.PagedBackpackInventory; public class ContainerNaturalistBackpack extends ContainerItemInventory implements IGuiSelectable { - private final PagedInventory inv; - private final ISpeciesRoot speciesRoot; + private final PagedBackpackInventory inv; - public ContainerNaturalistBackpack(ISpeciesRoot speciesRoot, InventoryPlayer player, PagedInventory inventory, int page, int pageSize) { + public ContainerNaturalistBackpack(InventoryPlayer player, PagedBackpackInventory inventory, int page, int pageSize) { super(inventory, player.player); this.inv = inventory; - this.speciesRoot = speciesRoot; // Inventory for (int x = 0; x < 5; x++) { for (int y = 0; y < 5; y++) { - addSlotToContainer(new SlotCustom(inventory, y + page * pageSize + x * 5, 100 + y * 18, 21 + x * 18, speciesRoot)); + addSlotToContainer(new SlotFiltered(inventory, y + page * pageSize + x * 5, 100 + y * 18, 21 + x * 18)); } } @@ -51,27 +47,6 @@ public class ContainerNaturalistBackpack extends ContainerItemInventory implemen } } - @Override - public void purgeBag(EntityPlayer player) { - for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack == null) - continue; - - if (speciesRoot.isMember(stack)) - continue; - - Proxies.common.dropItemPlayer(player, stack); - inventory.setInventorySlotContents(i, null); - } - } - - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - // TODO Auto-generated method stub - return false; - } - @Override public void handleSelectionChange(EntityPlayer player, PacketUpdate packet) { inv.flipPage(player, packet.payload.intPayload[0]); diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 825bdc2b3..9fbba383f 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -21,6 +21,7 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.inventory.InvTools; import forestry.core.inventory.ItemInventory; +import forestry.core.inventory.ItemInventoryBackpack; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.items.ItemInventoried; @@ -101,7 +102,7 @@ public class ItemBackpack extends ItemInventoried { public ItemStack tryStowing(EntityPlayer player, ItemStack backpackStack, ItemStack stack) { ItemBackpack backpack = ((ItemBackpack) backpackStack.getItem()); - ItemInventory inventory = new ItemInventory(ItemBackpack.class, backpack.getBackpackSize(), backpackStack); + ItemInventory inventory = new ItemInventoryBackpack(ItemBackpack.class, backpack.getBackpackSize(), backpackStack); if (backpackStack.getItemDamage() == 1) return stack; @@ -147,7 +148,7 @@ public class ItemBackpack extends ItemInventoried { return true; // Create our own backpack inventory - ItemInventory backpackInventory = new ItemInventory(ItemBackpack.class, getBackpackSize(), stack); + ItemInventoryBackpack backpackInventory = new ItemInventoryBackpack(ItemBackpack.class, getBackpackSize(), stack); BackpackMode mode = getMode(stack); if (mode == BackpackMode.RECEIVE) @@ -163,7 +164,7 @@ public class ItemBackpack extends ItemInventoried { return false; } - private void tryChestTransfer(ItemInventory backpackInventory, IInventory target) { + private void tryChestTransfer(ItemInventoryBackpack backpackInventory, IInventory target) { for (IInvSlot slot : InventoryIterator.getIterable(backpackInventory)) { ItemStack packStack = slot.getStackInSlot(); @@ -175,7 +176,7 @@ public class ItemBackpack extends ItemInventoried { } } - private void tryChestReceive(EntityPlayer player, ItemInventory backpackInventory, IInventory target) { + private void tryChestReceive(EntityPlayer player, ItemInventoryBackpack backpackInventory, IInventory target) { for (IInvSlot slot : InventoryIterator.getIterable(target)) { ItemStack targetStack = slot.getStackInSlot(); diff --git a/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java b/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java index 3397e9fa1..edd69ccdd 100755 --- a/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java +++ b/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java @@ -27,7 +27,7 @@ public class ItemNaturalistBackpack extends ItemBackpack { } @Override - public boolean isValidItem(EntityPlayer player, ItemStack stack) { + public boolean isValidItem(ItemStack stack) { return PluginApiculture.beeInterface.isMember(stack); } } @@ -39,7 +39,7 @@ public class ItemNaturalistBackpack extends ItemBackpack { } @Override - public boolean isValidItem(EntityPlayer player, ItemStack stack) { + public boolean isValidItem(ItemStack stack) { return PluginLepidopterology.butterflyInterface.isMember(stack); } }