From 3206c61a9e55c76ebc04b9028e2b489be806dbec Mon Sep 17 00:00:00 2001 From: Astoria Date: Fri, 17 Mar 2023 18:50:25 -0500 Subject: [PATCH] Revert "Revert "Wide Chest, almost working"" This reverts commit 4a645cd03551d057e230fb31318504ce82560996. --- .../MixinInterfaces/IEntityPlayerMP.java | 2 + .../MixinInterfaces/IEntityPlayerSP.java | 2 + .../afloydironchest/blocks/DiamondChest.java | 4 +- .../gui/ContainerWideChest.java | 59 ++++++++++++++++++ .../afloydironchest/gui/GuiDiamondChest.java | 50 +++++++++++++++ .../mixin/MixinEntityPlayerMP.java | 10 +++ .../mixin/MixinEntityPlayerSP.java | 5 ++ .../assets/ironchest/gui/containerWide.png | Bin 0 -> 5172 bytes 8 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 src/main/java/net/brokenmoon/afloydironchest/gui/ContainerWideChest.java create mode 100644 src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java create mode 100644 src/main/resources/assets/ironchest/gui/containerWide.png diff --git a/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerMP.java b/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerMP.java index f9ee7e9..2cb4170 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerMP.java +++ b/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerMP.java @@ -4,4 +4,6 @@ import net.minecraft.src.IInventory; public interface IEntityPlayerMP { public void displayGUIIronChest(IInventory iinventory); + + public void displayGUIDiamondChest(IInventory iinventory); } diff --git a/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerSP.java b/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerSP.java index 95562c6..8e29cc5 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerSP.java +++ b/src/main/java/net/brokenmoon/afloydironchest/MixinInterfaces/IEntityPlayerSP.java @@ -4,4 +4,6 @@ import net.minecraft.src.IInventory; public interface IEntityPlayerSP { public void displayGUIIronChest(IInventory iinventory); + + public void displayGUIDiamondChest(IInventory iinventory); } diff --git a/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java b/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java index af8bcd0..f82f2d2 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java +++ b/src/main/java/net/brokenmoon/afloydironchest/blocks/DiamondChest.java @@ -57,10 +57,10 @@ public class DiamondChest extends BlockContainer{ public static void displayGui(EntityPlayer player, IInventory inventory){ if(player instanceof EntityPlayerMP) { //Multiplayer - ((IEntityPlayerMP)player).displayGUIIronChest(inventory); + ((IEntityPlayerMP)player).displayGUIDiamondChest(inventory); return; } //Singleplayer - ((IEntityPlayerSP)player).displayGUIIronChest(inventory); + ((IEntityPlayerSP)player).displayGUIDiamondChest(inventory); } } diff --git a/src/main/java/net/brokenmoon/afloydironchest/gui/ContainerWideChest.java b/src/main/java/net/brokenmoon/afloydironchest/gui/ContainerWideChest.java new file mode 100644 index 0000000..b547c31 --- /dev/null +++ b/src/main/java/net/brokenmoon/afloydironchest/gui/ContainerWideChest.java @@ -0,0 +1,59 @@ +package net.brokenmoon.afloydironchest.gui; + +import net.minecraft.src.*; + +public class ContainerWideChest extends Container { + private IInventory inventory; + private int numberOfRowsLower = 4; + private int numberOfRowsUpper; + + public ContainerWideChest(IInventory lowerInventory, IInventory upperInventory) { + this.inventory = upperInventory; + this.numberOfRowsUpper = upperInventory.getSizeInventory() / 12; + int i = (this.numberOfRowsUpper - 4) * 18; + //Upper + for (int j = 0; j < this.numberOfRowsUpper; ++j) { + for (int i1 = 0; i1 < 12; ++i1) { + this.addSlot(new Slot(upperInventory, i1 + j * 12, -18 - 6 + i1 * 18, -36 + j * 18)); + } + } + //Lower + for (int k = 0; k < 3; ++k) { + for (int j1 = 0; j1 < 9; ++j1) { + this.addSlot(new Slot(lowerInventory, j1 + k * 9 + 9, 3 + j1 * 18, 49 + k * 18 + i)); + } + } + //Taskbar + for (int l = 0; l < 9; ++l) { + this.addSlot(new Slot(lowerInventory, l, 3 + l * 18, 49 + 18 * 3 + 4 + i)); + } + } + + @Override + public boolean isUsableByPlayer(EntityPlayer entityplayer) { + return this.inventory.canInteractWith(entityplayer); + } + + @Override + public void quickMoveItems(int slotID, EntityPlayer player, boolean shift, boolean control) { + Slot slot = (Slot)this.inventorySlots.get(slotID); + if (slot == null || !slot.hasStack()) { + return; + } + ItemStack item = slot.getStack(); + ItemStack originalItem = item.copy(); + if (slotID < this.numberOfRowsUpper * 12) { + this.onStackMergeShiftClick(item, this.numberOfRowsUpper * 12, this.inventorySlots.size(), true); + } else { + this.onStackMergeShiftClick(item, 0, this.numberOfRowsUpper * 12, false); + } + if (item.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + if (item.stackSize != originalItem.stackSize) { + slot.onPickupFromSlot(item); + } + } +} \ No newline at end of file diff --git a/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java b/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java new file mode 100644 index 0000000..3ffb39c --- /dev/null +++ b/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java @@ -0,0 +1,50 @@ +package net.brokenmoon.afloydironchest.gui; + +import net.minecraft.src.GuiContainer; +import net.minecraft.src.IInventory; +import org.lwjgl.opengl.GL11; + +public class GuiDiamondChest extends GuiContainer { + private IInventory upperChestInventory; + private IInventory lowerChestInventory; + private int inventoryRows; + + public int xSize = 240; + public int ySize = 222; + + public GuiDiamondChest(IInventory iinventory, IInventory iinventory1) { + super(new ContainerWideChest(iinventory, iinventory1)); + this.upperChestInventory = iinventory; + this.lowerChestInventory = iinventory1; + this.field_948_f = false; + int c = 222; + int i = c - 108; + this.inventoryRows = iinventory1.getSizeInventory() / 12; + this.ySize = i + this.inventoryRows * 18; + } + + @Override + protected void drawGuiContainerForegroundLayer() { + this.fontRenderer.drawString(this.lowerChestInventory.getInvName(), -24, -47, 0x404040); + this.fontRenderer.drawString(this.upperChestInventory.getInvName(), 3, 128, 0x404040); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f) { + int i = this.mc.renderEngine.getTexture("/assets/ironchest/gui/containerWide.png"); + GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + this.mc.renderEngine.bindTexture(i); + int x = (this.width - this.xSize) / 2; + int y = (this.height - this.ySize) / 2; + int h1 = Math.min(this.inventoryRows, 6) * 18 + 17; + this.drawTexturedModalRect(x, y, 0, 0, this.xSize, h1); + int rows = this.inventoryRows; + while (rows > 6) { + int h2 = Math.min(rows, 6) * 18; + this.drawTexturedModalRect(x, y + h1, 0, 17, this.xSize, h2); + rows -= 6; + h1 += h2; + } + this.drawTexturedModalRect(x, y + this.inventoryRows * 18 + 17, 0, 126, this.xSize, 96); + } +} diff --git a/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java index 8411926..0e2c91a 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java +++ b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java @@ -1,6 +1,7 @@ package net.brokenmoon.afloydironchest.mixin; import net.brokenmoon.afloydironchest.MixinInterfaces.IEntityPlayerMP; +import net.brokenmoon.afloydironchest.gui.ContainerWideChest; import net.minecraft.src.*; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -24,4 +25,13 @@ public class MixinEntityPlayerMP implements IEntityPlayerMP { ((EntityPlayerMP)(Object)this).craftingInventory.windowId = this.currentWindowId; ((EntityPlayerMP)(Object)this).craftingInventory.onContainerInit(((EntityPlayerMP)(Object)this)); } + + public void displayGUIDiamondChest(IInventory iinventory) { + this.getNextWindowId(); + NetServerHandler.logger.info(((EntityPlayerMP)(Object)this).username + " interacted with chest at (" + ((EntityPlayerMP)(Object)this).posX + ", " + ((EntityPlayerMP)(Object)this).posY + ", " + ((EntityPlayerMP)(Object)this).posZ + ")"); + this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 0, iinventory.getInvName(), iinventory.getSizeInventory())); + ((EntityPlayerMP)(Object)this).craftingInventory = new ContainerWideChest(((EntityPlayerMP)(Object)this).inventory, iinventory); + ((EntityPlayerMP)(Object)this).craftingInventory.windowId = this.currentWindowId; + ((EntityPlayerMP)(Object)this).craftingInventory.onContainerInit(((EntityPlayerMP)(Object)this)); + } } diff --git a/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerSP.java b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerSP.java index 45f1386..d56fda3 100644 --- a/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerSP.java +++ b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerSP.java @@ -1,5 +1,6 @@ package net.brokenmoon.afloydironchest.mixin; +import net.brokenmoon.afloydironchest.gui.GuiDiamondChest; import net.brokenmoon.afloydironchest.gui.GuiIronChest; import net.minecraft.client.Minecraft; import net.minecraft.src.*; @@ -13,4 +14,8 @@ public class MixinEntityPlayerSP { public void displayGUIIronChest(IInventory iinventory) { this.mc.displayGuiScreen(new GuiIronChest(((EntityPlayerSP)(Object)this).inventory, iinventory)); } + + public void displayGUIDiamondChest(IInventory iinventory) { + this.mc.displayGuiScreen(new GuiDiamondChest(((EntityPlayerSP)(Object)this).inventory, iinventory)); + } } diff --git a/src/main/resources/assets/ironchest/gui/containerWide.png b/src/main/resources/assets/ironchest/gui/containerWide.png new file mode 100644 index 0000000000000000000000000000000000000000..befcfab8f4c45683a40ecf93b15e4120e969b77e GIT binary patch literal 5172 zcmeHLdsGuw8Xu5KjL%dNaM6x~Z9zMEza}I+BnWX04G;xgs7^97FiIXKLlS&c1nbH! zKH3WIp(=K3T`Naj*MhI5*ecrfS#_(30^no}7!6n_Xl>(QV1;#Wc8F#~WhmE4M zNtnsClQ8L_fzwlGF~q!n23&Xal|tzp>6X?+baAWmn|4x&8%3 zK5deqrOT|oM~de92iJTVz0zmpy4vU`C!4jMz73f(Lq|r0%>dOE(6O-wU2N>Lf**u>qN39?){n~AeE8{`AB+}_3we00zUpXwM0A$%4^&Q#kABZdMm(N!mYZ${ z#0;6kNm@oy!OoA?=HF@GAD_3=E!z0cCAUwX`O^(_pr7`tQZnrmPl1OzCs*DX8K0(` zQFyxW?P>erw$KX!s~eSp8KXVa;S-yi3PTT@b`=y4quxvj-T2n3ZKa7Flh2!r?~Tsf zo^0N}@NVGpd!5I`7wA<;Vca`0`JC5eYm=6)4BD;=AAR=AvevfMd*3fi=k7Z;=XzRn zz!>7f@F)J&2P(KJAHSEZ^kJ%%r;Y}VsC%t6=V(WyYyFKuBNh$Zalf*<4x*xTJNH!F zD&?`^bEegBe$yJ!Te5$*joPgp>{i` zC@_3seN(+=L)GJjTfT1`p1a%e#l&waI6!wE8t5xcKTTz}S@<|%Gm(6c#SVlALFy=v z9XHP-8Q4T-(pC*}=Rh?A(}V^|mFb0gdn}nnCoFJ~DGL&f<^}W27=c7Za@8Ic0I-k@ z4tp%wR;S9NLABD6m)reP=kCI2QovPUwX*oJO!s z1<9n-mg6v!aW2xzg!YAq*Xa#C2y982w8ic%3Xu2QVuZOT&Yt7Q_Qnuq0hvu&0H_n> zCweZPp{ZW7p39B(c+2UV2w1KM|GDUAwR?j>lwPmW+RQoZqB^YxVe?fHHZx7AyhDjl zq?A(>fr_Of5|t`2DT}5%nCUnm6DP^P&%uV!L4SJg#zGw8sJFf5}_C;MW{?J zRiIJ|Q=m$PQiO_eOr|775==o6eIVX-&_I=VcHgX6C;~v?xLk-Sa1xb>q;gcMl;WsT zs>D&VSt=9b3Q~&6&0Z+B52_f0PJ@W~!d{CZ8)qn+!=gc^(bgPKufs@N$P@-=NfXHx zm{5r+fC^ngS4UARO9)XOaTDHPh>0+oA%+0Ag`g zrvTY&2eqhT9VE`!97dZhTZ6EAJu{wFtQP!) z6SX&>&mjZmb=kn-1TcC1&Ak*oYWbOnBjtao9FJ-@ zWwgf({_y;G!MwZ4XN=)L6pT5!4D;_aaF$H|?3*0QHp|2EvRuY(6t@r5`L4E=b} z`q|~DKdio{-1x+IapTebJ6tWbSPPSp>V_WJ?ibOeri|1GS4)U%ZhPaN2H(8X>|Y&z z&``6cKW+{->%wl z=MwgwUuhGDASL9*vQHXM#laCS?ybEXzZWIiC-sBB;`?6Qbq!hb`)F57`aUoi8!`0G z|KB`=asDP~*7U2$nmy1J$$z8V4{9HOyJAr&=wU-^MDwln_09Vep{Z>LuHRbQK;No9 zyl^lSIpF7-<_B$^A$tgQezlq|ZK)04f39>C4{HkHCEX9o2Nch(4bSCeZERYxBCUj6 zVy(Q#owEcwWp6uj>f+eIr9ZC+0KJUulJo@I+(^(|WBc@j!Tg3=?7%f-M4zVqSeRZ{ zv7Hsl^65?%z#>exsN-f*d7qn z8VokYcbAVpEw2wnK3{vc(o*x)piM24^6q=okEEOaJShr#bSd!IINz{|9X#k|uW0&> Xq=J3%8O3!=*-%|vqISpRIr;wqk^=?0 literal 0 HcmV?d00001