From 9811e590e7887d092d3dac3d0ea3da42e6631a52 Mon Sep 17 00:00:00 2001
From: Astoria <netadmin@broken-moon.net>
Date: Fri, 17 Mar 2023 20:26:42 -0500
Subject: [PATCH] By Eris it works on MP.

---
 .../afloydironchest/blocks/SteelChest.java    |   4 +--
 .../gui/ContainerWideChest.java               |   8 ++---
 .../afloydironchest/gui/GuiDiamondChest.java  |  25 ++-------------
 .../mixin/MixinEntityPlayerMP.java            |   2 +-
 .../mixin/MixinNetClientHandler.java          |  29 ++++++++++++++++++
 .../resources/afloydironchest.mixins.json     |   3 +-
 .../assets/ironchest/gui/containerWide.png    | Bin 5172 -> 5674 bytes
 7 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/net/brokenmoon/afloydironchest/mixin/MixinNetClientHandler.java

diff --git a/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java b/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java
index 22651fa..a69ce89 100644
--- a/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java
+++ b/src/main/java/net/brokenmoon/afloydironchest/blocks/SteelChest.java
@@ -57,10 +57,10 @@ public class SteelChest 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
index b547c31..4a4e47c 100644
--- a/src/main/java/net/brokenmoon/afloydironchest/gui/ContainerWideChest.java
+++ b/src/main/java/net/brokenmoon/afloydironchest/gui/ContainerWideChest.java
@@ -4,28 +4,26 @@ 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));
+                this.addSlot(new Slot(upperInventory, i1 + j * 12, 8 + i1 * 18, 8 + 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));
+                this.addSlot(new Slot(lowerInventory, j1 + k * 9 + 9, 8 + 18 + 9 + j1 * 18, 174 + k * 18));
             }
         }
         //Taskbar
         for (int l = 0; l < 9; ++l) {
-            this.addSlot(new Slot(lowerInventory, l, 3 + l * 18, 49 + 18 * 3 + 4 + i));
+            this.addSlot(new Slot(lowerInventory, l, 8 + 18 + 9 + l * 18, 232));
         }
     }
 
diff --git a/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java b/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java
index 3ffb39c..29e0333 100644
--- a/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java
+++ b/src/main/java/net/brokenmoon/afloydironchest/gui/GuiDiamondChest.java
@@ -9,24 +9,14 @@ public class GuiDiamondChest extends GuiContainer {
     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);
+        this.ySize = 256;
+        this.xSize = 230;
     }
 
     @Override
@@ -36,15 +26,6 @@ public class GuiDiamondChest extends GuiContainer {
         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);
+        this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
     }
 }
diff --git a/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java
index 0e2c91a..deda0f0 100644
--- a/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java
+++ b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinEntityPlayerMP.java
@@ -29,7 +29,7 @@ public class MixinEntityPlayerMP implements IEntityPlayerMP {
     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()));
+        this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 7, 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/MixinNetClientHandler.java b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinNetClientHandler.java
new file mode 100644
index 0000000..bdf382e
--- /dev/null
+++ b/src/main/java/net/brokenmoon/afloydironchest/mixin/MixinNetClientHandler.java
@@ -0,0 +1,29 @@
+package net.brokenmoon.afloydironchest.mixin;
+
+import net.brokenmoon.afloydironchest.MixinInterfaces.IEntityPlayerSP;
+import net.brokenmoon.afloydironchest.tileEntities.TileEntityDiamondChest;
+import net.minecraft.client.Minecraft;
+import net.minecraft.src.NetClientHandler;
+import net.minecraft.src.Packet100OpenWindow;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = NetClientHandler.class, remap = false)
+public class MixinNetClientHandler {
+
+    @Shadow
+    private Minecraft mc;
+
+    @Inject(method = "handleOpenWindow", at = @At("TAIL"))
+    public void injectMethod(Packet100OpenWindow packet100openwindow, CallbackInfo info) {
+        if (packet100openwindow.inventoryType == 7) {
+            TileEntityDiamondChest dchest = new TileEntityDiamondChest();
+            ((IEntityPlayerSP)this.mc.thePlayer).displayGUIDiamondChest(dchest);
+            this.mc.thePlayer.craftingInventory.windowId = packet100openwindow.windowId;
+        }
+    }
+
+}
diff --git a/src/main/resources/afloydironchest.mixins.json b/src/main/resources/afloydironchest.mixins.json
index 291f41c..02391ee 100644
--- a/src/main/resources/afloydironchest.mixins.json
+++ b/src/main/resources/afloydironchest.mixins.json
@@ -6,7 +6,8 @@
     "mixins": [
         "MixinEntityPlayerMP",
         "MixinEntityPlayerSP",
-        "MixinTileEntity"
+        "MixinTileEntity",
+        "MixinNetClientHandler"
     ],
     "client": [
 
diff --git a/src/main/resources/assets/ironchest/gui/containerWide.png b/src/main/resources/assets/ironchest/gui/containerWide.png
index befcfab8f4c45683a40ecf93b15e4120e969b77e..920ec3556e04fbdc18690a75b1ee0e33f03ba63b 100644
GIT binary patch
delta 1549
zcmXw(dpJ~S9LJ9_W+qfKq?w*fChUqF&Rm_D!45-3HM&VIi<v>Wlw5XD$&5;+5*;f&
zOX%rhBN44jZn>mY%tpDk2qhUsNs6*(dbank_xXO`_xt;N-#^~6bvG?jof5p4H9~}W
zrMV1SKl)o%^yJll{acL8qeBWj8{oC{CBgI6e&h7Dg)UM1uU&M+P4)$5?i;1>nd9wv
zc<xTl(H)kJjOu?}pYvuvON6#tULxBMZxC0mtU8n-V<vCNwARxPrF?`EV-=15bLIIn
zyOn->I8|5TuDYD~GwG6F?X85neKTEQ@w7V%hX?X6s~!s)APwn;yT{HR@Jc(!45@Cy
zy$=`RJIDjqJWUgOZ#@72jbp(=;WihckajRKJSaFU5CCGc;?wLlH3|%y{dPL1-OQyr
zIWcyb-OE2Ez2!)<IPR6_jz>1v<+=zj3=glXSZTPhr;t|xPrMnjAS5Ij(Tc1@$yPgt
z7cV%Tp)60CpME<q@|H?_`e;ijPa?nGA7nuyGke`jCJY>Of!B@sk1eI53m2xSexC?a
zAFWzT7nEPQhn{6M%jKI4rAfj1;Y4LvA8ssu7+T+IG0mMm?m{*_I$AY6y?QM15k{%|
z$M{p*h|E2fWhEUC3KRB)G<7zS+&j(v9>x|%4h$FmUQih4_N`%?$j|c?uZ?6{eCnr7
z#Jt>Oz1CvVHFvXS$K=@&`)}fI>$J^lJ(ip`)X5hdQ+>I=I22R9`)EkVX6<H0JGtdE
zMYBq#*w7YHd!BkD0)x#_tgm@_`>CSWts@i!Be65#n&fV9Yp=7WRg65(OvnlJ(C%3A
zK5ppi*;;cQ-2seUsBd^%e3m^B{Kg_q)6ftzqSfmADJ~}FaQNco;Mq@_c8bWf>PyD=
z0ARU&=?P3S#*{8$NCN_cAdt=qkbo>^00)FQL1K`>h9z7!%&`%(m<Utrye=Jrm~7Yv
zMkNSo*E)yi@>pyh+Xj)~%zo@kQ*k5>q!#C6$`NydI5tu-7{p=2APWwZfRaE42NZL-
z;vlv-Adm}j5qrF7IhO~)JUSDE*gOa_wni#&QWFV_DP^$eARJ)B1z9Wx0~FI?HYjFt
z#7qd{O1OdF@BTj(E=BMM2v{hkbt9rhWF+VTATLXEOcMaGOI@5CcE$EhKEHpuUqDHE
zv1;U|igVRb_e}$yEO|z^3Y`t;Dp>l&;qS-wi?*pk!V%v)bIn~Zl;hr81#XqyI$d5h
zi+L0Gei?g3g5y3kQe4g3emOn1AMm|>aS$6l6>Gc0)!Z&e8I*$+<s?kMI=M&mO@}D}
z<ns1}`Ii1k*__t(VAqMNz7px)(x@8WmSy$xcsq$_Mp;n-l`rG)O>Cn+7y!1KNWGo`
zvW&EZNAZeZe{Eqds%~(i&c7ukd+@J!<#CrMY?W+wweG@*#nh}oaYi6hE!1UCI_IwO
zQ2dI$BfZg?az=pUl2+5?0Du8h2T2c8sAPqY+IopvG8J|pf<zz!0%VbBNR?BqFuf%s
z#;Izj?0E!wI=h~4h0(wO1OUm?U%jfh(V51V`Cuc}Rt9SImgvW}IMdYkjSOTJgn$+_
zRxNi%qB38Gd54HeCM%Ya6{;RIPc3=9RUZ=#Axrg5C_OKXQ>kc9rCNG~vZ;EORF4=F
z(P=aaUk!@JsMX*~l#9w&#Q0z_$bG#P=%eVs{wLL>6@>I8cpI?&V+CP!JrIjSVTrAA
z=|)Xj626Hl%=)9YKxp-_Z@fl-(xKuuFtkeDh5B=SaZ)87+Pc##qd6tJi2p=4%Ag13
zGf~Y{6P}J(6sx0;sMPpWni|9mQgeJpYvg~pAvf`<E{Tf%QJsbR-b1l8ibS|Fffn@u
zrgQ-!KuZ^|!BlC7?LD4-*+U`34}H~v8=iUdH^%sA;eOQE?oTYj^q1&o7Suxo4~2#j
z{T1a0jTXK6H_{{9D>HUfeI*J8-GI-Lm2-pgb}xHip;O1b4)fZg{78xQ?Jz++`Mp6m
OfG!tjkyDYQf8u|nHI=LY

delta 1447
zcmZ3bvqfWqOTDAeVFivozq{-hV;238xxB>qujBl9o+ZM@cO|EVmIPk<SGoUEvchJS
z$W_zAxFnZ&p1#{MX|enn754cL9%S18P1(kC`a{#S9i{I+r#Rp7)fHE+bxWMf?Q4_1
zSJG9vM?6(HT4Jk#(>JDe$M5-pnNjQGBg$tjl*<fAT$T82dVY5OO0&JW8|_Y1vN!iI
zel(V7Y{_Ff)|169d31|IFJtfY8xH@@zI6G;bT2(pS=d@5jDdl%In&uWz|+}Tp`a)~
zEi)&TfuUkf?L=FT!wxb><Aawfi3)0WSfs4*D+?4n9@VN8!m-t9HJ{q_I>*UvDo2k7
z7U)|1*cee-P<ZX?!BByE7JG-7*f}DxOOE_kZ51<=lllJm?%v~ftsOE#W~7xKW%S*C
zw!}y=t$20P3sFa&1dhO#)HKQBNmH8M|Jdc;u)f@I-qZSb=PxdQrpw0S^2oy2XLdz%
zMcQREi}%9r5uRb4=R4JXb}4*RzAoB--$FcAtRn5mnI+FVm5(HCY@W)OR<9bYJWs7}
z)hxfCPS=vBeiln#8<f1Z`jdFu=U=Ccu4ncsb-L;}HgT|;P6=%6l~`+~DRybg{0|@d
zchq&paP2&m@Fc=PR4U~<|3CKqySH)$PmT++U@X~haqhT;z%ABUrN@8TmCbp^DNw_<
z?#s6Qw;0mwJ=bsF`a<x+e%_dv?WU=&{5$S2w$10cIVD!pBUnSE;k)s#Wikd8++WsJ
z?%n#W@E1eMiq%(m3ko=T#5Jq$KEG=_ckkcoWmoU>S8gs^sdZ>82Ll6d#pYI~E+!Qd
zGh+jz#8g9FQ!^8DU6V9Rb6pE_3qxI_L`zePR6}D+^R$%7#;pB31{Rj)hL)D52IiJV
zlh3jCvYT0%SXdcbOip4`hp{(LU=w8AoX(lR!O}R*lx^~9L8E#>Q3G`jL(R<$49s^u
zT^vIyZoR!5n04Dhr0t^hvDKTlDeAf`i2dQnJ@J~Ne)gxJiy@j{o2AaSShD{L;Hr1(
zvCnbN5Bf8WSwnN`uO`d%^Yt3P-uS=##Bs;w=R&^Q+hYHD*~l_~sM>2I6mY=iyrAGl
zozto7S@P!pe{_;Rcjr&R$pXUSMjQ+u7T@{*wg0ijynjr!_mA&dSN7(H<(rb&@N$N4
z`Coc6XC=jkTbI3&Da-nCfBQYAhVzpPM8zii3v;@ynpS>$+ux7Rf7U$vf3Q#1I$m~u
z{$YbBi4sLFPgc+S^D>-4>Cx-;?B#+d`sTjBZ5hWh>$#<p(zMi@^Jm{b=c-^`#`Sgw
z2g~I5!eWyhM7boS^_XsMe5^E~+o9}D%uXOf)|&S{eHDm8-4GB`xPT!l^pVnp?F<i$
zCp!pBDgRJ>x3xwY7)tj(SigKb=kCj0ehgk8cRzVM<zD97{YR>~8SEyn6Oy-H5oY?G
z;n%+Y%vo=4Xzsc^OGMD}xr|`o7l|gIzp`#<Rtjd!d*0CzF)g(|Z`)_CgnEW^1s{){
zyD2N)IJr<%6d17FvMX9ZVPJ9w6h?NyFbeq*dO%X|-VMv$kCg-_e-su0h8L%K0|Ud<
z0#Mktg%%5PM1@0L%izG!uq@=W;)2x&!1jsmc**dF|A6GWd$)l4wG3eT%fR|YZvgf0
z<l>oHAS&@el0kvt!kyFqSKn1uS~}&^w%nupI2XLpZunAR^T%Yt25ozWKexqC$uVhY
f{S;&%1ROHu1Dkic$4<S~2vX|l>gTe~DWM4fvM6fE