diff --git a/src/main/java/forestry/energy/tiles/TileEngineClockwork.java b/src/main/java/forestry/energy/tiles/TileEngineClockwork.java index be0b17415..9279bc0cd 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineClockwork.java +++ b/src/main/java/forestry/energy/tiles/TileEngineClockwork.java @@ -14,8 +14,6 @@ import javax.annotation.Nonnull; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java index 15a87b588..6d7795772 100755 --- a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java +++ b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java @@ -11,10 +11,13 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; - +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotFiltered; +import forestry.core.gui.slots.SlotLocked; import forestry.core.gui.slots.SlotOutput; +import forestry.core.network.packets.PacketItemStackDisplay; import forestry.factory.tiles.TileCentrifuge; public class ContainerCentrifuge extends ContainerSocketed { @@ -23,14 +26,34 @@ public class ContainerCentrifuge extends ContainerSocketed { super(tile, player, 8, 84); // Resource - this.addSlotToContainer(new SlotFiltered(tile, 0, 30, 37)); + this.addSlotToContainer(new SlotFiltered(tile, 0, 16, 37)); + // Craft Preview display + addSlotToContainer(new SlotLocked(tile.getCraftPreviewInventory(), 0, 49, 37)); + // Product Inventory for (int l = 0; l < 3; l++) { for (int k = 0; k < 3; k++) { - addSlotToContainer(new SlotOutput(tile, 1 + k + l * 3, 98 + k * 18, 19 + l * 18)); + addSlotToContainer(new SlotOutput(tile, 1 + k + l * 3, 112 + k * 18, 19 + l * 18)); } } } + + private ItemStack oldCraftPreview; + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + + IInventory craftPreviewInventory = tile.getCraftPreviewInventory(); + + ItemStack newCraftPreview = craftPreviewInventory.getStackInSlot(0); + if (!ItemStack.areItemStacksEqual(oldCraftPreview, newCraftPreview)) { + oldCraftPreview = newCraftPreview; + + PacketItemStackDisplay packet = new PacketItemStackDisplay(tile, newCraftPreview); + sendPacketToListeners(packet); + } + } } diff --git a/src/main/java/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java index 44ef1cd4d..e81577c15 100755 --- a/src/main/java/forestry/factory/gui/GuiCentrifuge.java +++ b/src/main/java/forestry/factory/gui/GuiCentrifuge.java @@ -21,7 +21,7 @@ public class GuiCentrifuge extends GuiForestryTitled= OUTPUTS.length) { return; } - int x = 72 + OUTPUTS[i][0] * 18; + int x = 100 + OUTPUTS[i][0] * 18; int y = OUTPUTS[i][1] * 18; int slotIndex = outputSlot + i; guiItemStacks.init(slotIndex, false, x, y); diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index 5bc899542..a042edcc0 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -55,7 +55,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu private final FilteredTank resourceTank; private final TankManager tankManager; - private final InventoryAdapterTile craftingInventory; + private final InventoryAdapterTile craftingInventory; private final InventoryCraftResult craftPreviewInventory; @Nullable diff --git a/src/main/java/forestry/factory/tiles/TileCentrifuge.java b/src/main/java/forestry/factory/tiles/TileCentrifuge.java index e62188694..f084e40ee 100644 --- a/src/main/java/forestry/factory/tiles/TileCentrifuge.java +++ b/src/main/java/forestry/factory/tiles/TileCentrifuge.java @@ -16,11 +16,12 @@ import java.util.Collection; import java.util.Stack; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitBoard; @@ -34,6 +35,7 @@ import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.InventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; +import forestry.core.tiles.IItemStackDisplay; import forestry.core.tiles.TilePowered; import forestry.core.utils.InventoryUtil; import forestry.factory.gui.ContainerCentrifuge; @@ -41,12 +43,13 @@ import forestry.factory.gui.GuiCentrifuge; import forestry.factory.inventory.InventoryCentrifuge; import forestry.factory.recipes.CentrifugeRecipeManager; -public class TileCentrifuge extends TilePowered implements ISocketable, ISidedInventory { +public class TileCentrifuge extends TilePowered implements ISocketable, ISidedInventory, IItemStackDisplay { private static final int TICKS_PER_RECIPE_TIME = 1; private static final int ENERGY_PER_WORK_CYCLE = 3200; private static final int ENERGY_PER_RECIPE_TIME = ENERGY_PER_WORK_CYCLE / 20; private final InventoryAdapter sockets = new InventoryAdapter(1, "sockets"); + private final InventoryCraftResult craftPreviewInventory; private ICentrifugeRecipe currentRecipe; @@ -55,6 +58,7 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn public TileCentrifuge() { super("centrifuge", 800, Constants.MACHINE_MAX_ENERGY); setInternalInventory(new InventoryCentrifuge(this)); + craftPreviewInventory = new InventoryCraftResult(); } /* LOADING & SAVING */ @@ -114,10 +118,12 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn @Override public boolean workCycle() { if (tryAddPending()) { + setCurrentPreviewItem(); return true; } if (!pendingProducts.isEmpty()) { + setCurrentPreviewItem(); return false; } @@ -130,8 +136,8 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn pendingProducts.addAll(products); getInternalInventory().decrStackSize(InventoryCentrifuge.SLOT_RESOURCE, 1); - - tryAddPending(); + + setCurrentPreviewItem(); return true; } @@ -255,4 +261,21 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn public Object getContainer(EntityPlayer player, int data) { return new ContainerCentrifuge(player.inventory, this); } + + public IInventory getCraftPreviewInventory() { + return craftPreviewInventory; + } + + private void setCurrentPreviewItem(){ + if(!pendingProducts.isEmpty()){ + craftPreviewInventory.setInventorySlotContents(0, pendingProducts.peek()); + }else{ + craftPreviewInventory.setInventorySlotContents(0, null); + } + } + + @Override + public void handleItemStackForDisplay(ItemStack itemStack) { + craftPreviewInventory.setInventorySlotContents(0, itemStack); + } } diff --git a/src/main/resources/assets/forestry/textures/gui/centrifugesocket.png b/src/main/resources/assets/forestry/textures/gui/centrifugesocket.png index f84945838..976e46dc8 100644 Binary files a/src/main/resources/assets/forestry/textures/gui/centrifugesocket.png and b/src/main/resources/assets/forestry/textures/gui/centrifugesocket.png differ