From b2b743398c356f583efc9a6eed6b845e17211ebe Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 19 Sep 2016 20:28:52 +0200 Subject: [PATCH] Adding a preview slot to the centrifuge --- .../energy/tiles/TileEngineClockwork.java | 2 -- .../factory/gui/ContainerCentrifuge.java | 29 ++++++++++++++-- .../forestry/factory/gui/GuiCentrifuge.java | 5 +-- .../factory/recipes/jei/FactoryJeiPlugin.java | 3 +- .../centrifuge/CentrifugeRecipeCategory.java | 7 ++-- .../forestry/factory/tiles/TileCarpenter.java | 2 +- .../factory/tiles/TileCentrifuge.java | 31 +++++++++++++++--- .../textures/gui/centrifugesocket.png | Bin 644 -> 3704 bytes 8 files changed, 63 insertions(+), 16 deletions(-) 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 f8494583881f0578751c76b0e46900f185a60e0d..976e46dc87a88d5d965f6cb6fd2f1977d8fdbede 100644 GIT binary patch literal 3704 zcmeHKYgAKL7CtvL;zTRf!cr^(+Sa#diwd}e-~)m%qC7G|jYL$4gNi^5Dj^Stb^;cO zsKD^hU{R4Kk`ZbVY96ydK_Q6`Gy_3E2rnTLguF;d=7xt|YVE99YwVwyA9vk*&bjyO zZ|`sK{hgb-JrMITYAy-@@bMPE&A|Xb@FN7KPJwUu_-j#?5h)n65tK+Adf~xG#0^_F z0C0mf%@~1%$A5_R+d%?gMwR7)YK~mn4^P@3^$9x~awO{Lv55Fc5F7F5n4>N+kw=|Z zyR35gYSncVN(7th*|K><=<#snvkmDEH8;PF*m`+I+?UO%3G=T9SXJ$_a{Nri_|)pD zAAl-jW>?J!zgU@LPxepm(OK#6V)^bO*TMy?*1~=*P4}v^E>C`n4qcT=4(U|StFpVg z*>qDE#XZ5CZMa$*7QhvJ)cy~%v9rjHAd@?Et5juKyM&_}IX%D`)kZLzdc`ue7{Vxj zMx=<5QJTSy8n?KFC5-N*5D;B9&KgKo^G4sIGxc9b-DMfp z6IUASzC-*|HjJD}uaheVE@16M2TWW88M_>{hY&K`+Z>y|{<63baeN{D?&#c4#@~HF zr>f^4{sGY=6r4qO&`ziLK>Y__AZpv6r?D#%A4p8|M43iAO<&q;^8t3=2W)y9=|wYe zrdg^(rlkh*7f%m)ya=b*GNkdy2ab}fVve=OAIcXKB8BPIxhpWw4zduc9i?ES`OMlE z-BnKz?&pN}Y4cLo>`JecIU?K24nfs2mZRj*WzgQYl%6@dZq~t{9LPLRl!(}iIR0&! zp3^VOc#R+%Rp9BsyF9~ZpkI2r@@y+jW1mr|8A;Qah_9_x;K7Sc2G=`lZogU=et~_V zQHybq*-!4uMEL#IWRrotdotRvyA=1Thpk4|ak3yjs@18NcPtd2oJ;7e57IUjf~1Qs z43ksl>Dm*Sy3shkGFOi8439f+_P@~(&c5Wu;_MY?6~4TQfppcC{Fdyd{);1wCst%1 z31@wxH}<6+M(=MHENn5SjOhP%CzwL@Rdm(=+Bfn|tCx0T+qE_7pAN>5GAVb0OrPud zquTRcWqh}+rao7^P4ff`+qm*RYO(lbvCS>|8DGV1f1~MEOM>`tNj%T}KCa2I(^u$5 zjWUzDnjs~{0`qxdTU6b+H+!Fj4+I=e*hUp8y;=9)^2v|J%heLJIfoqslxq7D>zE0W z7Clv}1r1T!25Sdvy}bu-mJnT1zMGWCXwPm_5Sx74yBS)S`ET zB0uSvIka@p(2*!#Q(keO-@e$KVQit5yfW0UWnIyXOqW@?P2|g`eVRlXq=uJl~)6^_p8Rbt7upWr+R?ZcUackwN!hmFzE`P7x^Rq zUd||cpPHU73ybDSV?ARhbM8hAPkUwU&qZEs2?dzWH~FJ~A;gIdyx$5+da^O?t)Tc* z2z5Q$tI~d9`V*Rfy7IjVGp{G;E&iPD4Jd_0!#PU+dsAgJdG&%fb5rn0$V=7YmYI|G zSHCYTTAN2HZ^7i*S`w?w^H#}t^-m_2gOkd&Jwlm1l0&?`j*tpxgQeJIlU*kmIkSCk z_=$NuiB!^W_*}V@{fVr=(oq}un#I5g<$QunOMpu^4o~DZ#=n1(9e{k`Re-ymH0L}H zT|gYV@MfBK2Sc};a;$98Bz3`QlX(i4TS~x;mv{M2D9L2hYrYq1&1`z6mU--6HEt`h=~xzTQ~xBmq5~MCH?mc>{8G!Y#!w5q)d(;t7vE;1$t$}3KRiV zTdUH-6zhEhSNzE`V}o3klAr6kh#g=tHfM97IOm-7ON*XQUr^Llf3N$j1B{14OGdqmNO2hho_ht;u@wgfGJ5%xBa{4~vfRm`~yZpqA z5T1oAm|}*#b{Fd~TaBA@X0NbLpcWeK=Mil}awe$+U0zS!Op!EZE zLbD(=Z+d+Sv$aExZZ=Kj7NE=LEMfwU^Z&089fJf_C({hvzP70VkFR|N{}_TTK7pG{ JHtzY$zW{Yj0nY#c delta 631 zcmew%)51DIqMn7Bfq`LN%+^pKWf0&K;`;yp|6|9F0ZDUnbD&sgXlO}E$@@=i*KV>t ze#ZLeKijD@tbhLe`T6tbt5>hOySx2+SCj(PF_r}R1v5B2yOGAgz{KR~;uum9_vXe% zzrzLsYzh251`9fNdL_IUnBpWE6Kcccf5B_}yesYx1nVnW?3nlu?cOqRkKCfJM+-^{ zLSyS2-_O_apMPg{t>yDL(@h1Xk1rL4WTQmzFtXUtAEM7Q4AyOh~W_P}TN zcMZ$G-(l3Bzms_l+Z(wVxkc<}wkI4|WhESNrMArd`|XQK<}4QFdJey)xPO1|-u>x5 zBaZ+Fk3y181M|Y{`h>R!8!j|3>J}bgl2Xz+Ae_u7u6JmWoC?#U;^ll39F-nipPSR* zc{SB4N`v858q0;39ZC(mPAK+!AC>Z8|M0N>fKWh#LY&LDLmCW|`43e)&2tbqHjja` z(Z6AWxsK*UDoc;aj#E_{kWuSrklh5 z@PA+ZH@}{o?y{Ese8;s226oeivmN_{7#Eo;@A712`OxFRVxYV!b0_05{bUx6QWq{u z-UJ3_i31F58vAZ;P8McJRNz^>P9aHFhC%={6fEhIG(P4 JF6*2UngGxB0`33+