diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 86b0ef4ea..3f11b992b 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -11,6 +11,9 @@ import mekanism.common.frequency.Frequency; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.NonNullList; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -24,7 +27,7 @@ public class InventoryFrequency extends Frequency public double storedEnergy; public FluidTank storedFluid; public GasTank storedGas; - public ItemStack storedItem = ItemStack.EMPTY; + public NonNullList inventory = NonNullList.withSize(1, ItemStack.EMPTY); public double temperature; public InventoryFrequency(String n, String o) @@ -62,10 +65,20 @@ public class InventoryFrequency extends Frequency nbtTags.setTag("storedGas", storedGas.write(new NBTTagCompound())); } - if(!storedItem.isEmpty()) + NBTTagList tagList = new NBTTagList(); + + for(int slotCount = 0; slotCount < 1; slotCount++) { - nbtTags.setTag("storedItem", storedItem.writeToNBT(new NBTTagCompound())); + if(!inventory.get(slotCount).isEmpty()) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte)slotCount); + inventory.get(slotCount).writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } } + + nbtTags.setTag("Items", tagList); nbtTags.setDouble("temperature", temperature); } @@ -90,9 +103,18 @@ public class InventoryFrequency extends Frequency storedGas.read(nbtTags.getCompoundTag("storedGas")); } - if(nbtTags.hasKey("storedItem")) + NBTTagList tagList = nbtTags.getTagList("Items", NBT.TAG_COMPOUND); + inventory = NonNullList.withSize(2, ItemStack.EMPTY); + + for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) { - storedItem = InventoryUtils.loadFromNBT(nbtTags.getCompoundTag("storedItem")); + NBTTagCompound tagCompound = (NBTTagCompound)tagList.getCompoundTagAt(tagCount); + byte slotID = tagCompound.getByte("Slot"); + + if(slotID >= 0 && slotID < 1) + { + inventory.set(slotID, InventoryUtils.loadFromNBT(tagCompound)); + } } temperature = nbtTags.getDouble("temperature"); diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 5ae809400..df7acc601 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -41,7 +41,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl @Override public boolean isEmpty() { - for(ItemStack stack : inventory) + for(ItemStack stack : getInventory()) { if(!stack.isEmpty()) { @@ -100,45 +100,50 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl return nbtTags; } + + protected NonNullList getInventory() + { + return inventory; + } @Override public int getSizeInventory() { - return inventory != null ? inventory.size() : 0; + return getInventory() != null ? getInventory().size() : 0; } @Override public ItemStack getStackInSlot(int slotID) { - return inventory != null ? inventory.get(slotID) : null; + return getInventory() != null ? getInventory().get(slotID) : ItemStack.EMPTY; } @Override public ItemStack decrStackSize(int slotID, int amount) { - if(inventory == null) + if(getInventory() == null) { return ItemStack.EMPTY; } - return ItemStackHelper.getAndSplit(inventory, slotID, amount); + return ItemStackHelper.getAndSplit(getInventory(), slotID, amount); } @Override public ItemStack removeStackFromSlot(int slotID) { - if(inventory == null) + if(getInventory() == null) { return ItemStack.EMPTY; } - return ItemStackHelper.getAndRemove(inventory, slotID); + return ItemStackHelper.getAndRemove(getInventory(), slotID); } @Override public void setInventorySlotContents(int slotID, ItemStack itemstack) { - inventory.set(slotID, itemstack); + getInventory().set(slotID, itemstack); if(!itemstack.isEmpty() && itemstack.getCount() > getInventoryStackLimit()) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 61a30ba2c..db5a595ca 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -14,7 +14,6 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; @@ -22,9 +21,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -274,45 +272,9 @@ public abstract class TileEntityMultiblock> extend } @Override - public ItemStack getStackInSlot(int slotID) + protected NonNullList getInventory() { - return structure != null && getSynchronizedData().getInventory() != null ? getSynchronizedData().getInventory().get(slotID) : ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int slotID, ItemStack itemstack) - { - if(structure != null && getSynchronizedData().getInventory() != null) - { - getSynchronizedData().getInventory().set(slotID, itemstack); - - if(!itemstack.isEmpty() && itemstack.getCount() > getInventoryStackLimit()) - { - itemstack.setCount(getInventoryStackLimit()); - } - } - } - - @Override - public ItemStack decrStackSize(int slotID, int amount) - { - if(structure == null || getSynchronizedData().getInventory() == null) - { - return ItemStack.EMPTY; - } - - return ItemStackHelper.getAndSplit(getSynchronizedData().getInventory(), slotID, amount); - } - - @Override - public ItemStack removeStackFromSlot(int slotID) - { - if(structure == null || getSynchronizedData().getInventory() == null) - { - return ItemStack.EMPTY; - } - - return ItemStackHelper.getAndRemove(getSynchronizedData().getInventory(), slotID); + return structure != null ? structure.getInventory() : null; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index f5516cba9..014a64e24 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -509,29 +509,9 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public int getSizeInventory() + public NonNullList getInventory() { - return 1; - } - - @Override - public ItemStack getStackInSlot(int slotID) - { - return hasFrequency() && slotID == 0 ? frequency.storedItem : ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int slotID, ItemStack itemstack) - { - if(hasFrequency() && slotID == 0) - { - frequency.storedItem = itemstack; - - if(!itemstack.isEmpty() && itemstack.getCount() > getInventoryStackLimit()) - { - itemstack.setCount(getInventoryStackLimit()); - } - } + return hasFrequency() ? frequency.inventory : null; } @Override diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 2dffd03f9..449d23b88 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -143,6 +143,11 @@ public class TileComponentConfig implements ITileComponent public SideData getOutput(TransmissionType type, EnumFacing side) { + if(side == null) + { + return EMPTY; + } + int index = getConfig(type)[side.ordinal()]; if(index == -1) diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 1610a1fe6..4046d3bd7 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -28,14 +28,10 @@ public final class TransporterUtils return false; } - if(InventoryUtils.isItemHandler(tile, side.getOpposite())) - { - return true; - } - else if(tile instanceof IInventory) + if(tile instanceof IInventory) { IInventory inventory = (IInventory)tile; - + if(inventory.getSizeInventory() > 0) { if(!(inventory instanceof ISidedInventory)) @@ -48,6 +44,10 @@ public final class TransporterUtils return (slots != null && slots.length > 0); } } + else if(InventoryUtils.isItemHandler(tile, side.getOpposite())) + { + return true; + } return false; } diff --git a/src/main/resources/assets/mekanism/render/quantumentangloporter.png b/src/main/resources/assets/mekanism/render/quantumentangloporter.png index a1e1d5ecf..f6e4ea7f7 100644 Binary files a/src/main/resources/assets/mekanism/render/quantumentangloporter.png and b/src/main/resources/assets/mekanism/render/quantumentangloporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/quantum_entangloporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/quantum_entangloporter.png index a99747beb..517104037 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/quantum_entangloporter.png and b/src/main/resources/assets/mekanism/textures/blocks/models/quantum_entangloporter.png differ