From 9253a541c4765b6de779fa33de618e2fc478d513 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 16 Feb 2020 21:20:11 -0600 Subject: [PATCH] Replace bauble box slots with a player render because what else would i put there --- .../client/gui/box/ContainerBaubleBox.java | 13 ------------- .../botania/client/gui/box/GuiBaubleBox.java | 12 ++++++------ .../botania/textures/gui/bauble_box.png | Bin 16368 -> 1808 bytes 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 07e28f18b..b01d7278f 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -47,19 +47,6 @@ public class ContainerBaubleBox extends Container { this.box = box; IItemHandlerModifiable baubleBoxInv = (IItemHandlerModifiable) box.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null); - /* todo 1.13 remove these slots from the gui texture and provide a button to open curios gui instead - baubles = BaublesApi.getBaublesHandler(player); - - addSlotToContainer(new SlotBauble(player, baubles, 0, 8, 8 + 0 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 1, 8, 8 + 1 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 2, 8, 8 + 2 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 3, 8, 8 + 3 * 18)); - - addSlotToContainer(new SlotBauble(player, baubles, 4, 27, 8 + 0 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 5, 27, 8 + 1 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 6, 27, 8 + 2 * 18)); - */ - for(i = 0; i < 4; ++i) for(j = 0; j < 6; ++j) { int k = j + i * 6; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 8fa269497..068b8a436 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -13,6 +13,7 @@ package vazkii.botania.client.gui.box; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.client.gui.screen.inventory.InventoryScreen; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.util.ResourceLocation; @@ -22,6 +23,8 @@ import vazkii.botania.client.lib.LibResources; public class GuiBaubleBox extends ContainerScreen { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX); + private int mouseX; + private int mouseY; public GuiBaubleBox(ContainerBaubleBox container, PlayerInventory player, ITextComponent title) { super(container, player, title); @@ -31,6 +34,8 @@ public class GuiBaubleBox extends ContainerScreen { public void render(int mouseX, int mouseY, float partialTicks) { this.renderBackground(); super.render(mouseX, mouseY, partialTicks); + this.mouseX = mouseX; + this.mouseY = mouseY; this.renderHoveredToolTip(mouseX, mouseY); } @@ -39,12 +44,7 @@ public class GuiBaubleBox extends ContainerScreen { GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); Minecraft.getInstance().getTextureManager().bindTexture(texture); blit(guiLeft, guiTop, 0, 0, xSize, ySize); - - for(int i1 = 0; i1 < 7; ++i1) { - Slot slot = container.inventorySlots.get(i1); - if(slot.getHasStack() && slot.getSlotStackLimit() == 1) - blit(guiLeft+slot.xPos, guiTop+slot.yPos, 200, 0, 16, 16); - } + InventoryScreen.drawEntityOnScreen(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player); } } diff --git a/src/main/resources/assets/botania/textures/gui/bauble_box.png b/src/main/resources/assets/botania/textures/gui/bauble_box.png index 3e91da92da115201a94d0b6b8f3247a5bce3f877..f5927411543b5e40636451f89cdd2e215a197cea 100644 GIT binary patch literal 1808 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^adUI?(9qEC?(Sp9j{X1tA1E>kMnhnPgh10{aTQRmDGBlm z1}6TI3>bpHv#SE5owL9rvY3H^?+6GpPSxglFzsfc@f<6_oh0}D?`Tb{5WeN=Fyu-rrt&>-qM#w{z!mv22_A@89j;HI4fj-mfm% z=_9^_`N?f@4u%G!hVB2~{kpt--OYd_{@7|{ofxecTG-eFa?_8Ft0i) zo?&OTtmwV>Y3}WQs~A6Rs|@+!WR2B|1@FwtuX!3eyo+^fEw{dTaUsx)e=f<1{+n@r zF3g5ccP_(R$FO4e$(f}=JQJ#?2R^*(S61?3iIl?rE$*%M&x)}I$E&=ew7DY8YXpIY z0nPcvbmH#o6(8!%t*uIecqeQ>yZDg!t)0S9n?O#7S;|nledlJsF2-xXD7eQkovWdC zcl~=KQHD3s`>I=){r_9u&|lx2`m5%}OwpRBQH&?H@j7hFW!RL~6@vd$@?2>=43BSioJ literal 16368 zcmeI3dt4J&7RPS_0)h{s^;N2*(MnkxCJBVc5JH3?&^Abc-GZVLk|AWtt9eM!3PEcH zYY|&^FA|!E|&%|-sOr| zB26fkDvwy8#bOsk#Yq;VNdlydV7@cYh~fd1m|jdbDitanY7Ao7;-a{19Yz>*n?#=$ z#F%bPNRJmq(?iu-jL!A)WlC7SessS8FE-cD&&Tf#I)}yPA}nvjo5kdKqdqLuhePkV z7<^~k;%TKRXpC@1PdfasAV#WQuR#$cJw4qk-P=p8l_BhafB=NWK{y;Hu3+jiRC=+I zsnSjE4)P?95YtJta*bZDR?)3-#mQ=eK8V4vChEO?^M z>BHvZ2zrnX=&6g#&|pXmrc)cV5-e;!{wR|NdV0M)rLQZ%)9q$! zh3*RR@MlFswU}71*2byT3VwH&ML$7E4-K_-75(*h`6R!Oi(As-*`lFOy2FP9S_^_OByws(qzDNXV5XZo{P943q9 zQ*01LBG~4SL%rmJX#bWP0J^ExqA-A1L8nIS~S$A9z^3(Wi^G*mN1*6Mto|cSn8Nt$%nP zVmYJ^FNgo^4KERiSUkKa! zyT=ut?(drLd{=n7ziXf8KUH!)pVO1A-!SB5J$bv2g;@M00pt5}x!znJ(to(WN3`6C zDdL54eE;gKUCH74_Bi#Q8PGFfP)}&4$FsXw&_8rrExSkY*9H7d1?hcNdAiKKTj6gu z`X1?T4h)AQlfX0xZ4wtDB3MA;f@u)iBrZZkuze>2ob>o z5*JK^&?a#aB7y}ZE|>ra@?vxCjx!0umQYgU}{%5h8*GBrcc+ zp-ti+Trdqno5V$k2o{jIU>bxriHi^sEFf{gGze`H7a<~8K;nXF5ZWXzLPW5D z#0AqJv`Jiqh+qMU3#LJ6KNpvC-^YKL3jg9S9sjgXy0N+d|16L$iHH#au;4WSOiKWG z)P>(005GrsxSa$5x)y+O>QCk!o&kWPFj6=@&Um5m;`E%=_3j7nUEY@V+W3e`x1(L{ zi!3odE)!AvtD>{9MWq;0lQ$$+??g?|H_#Vfd9`uWKK-Yt;q~#~-ny}2O7$+*g|TDV z%Gh*NQTp9)#~K?Ccvt@%*nCrWyRs!K@kZ;Trj`Si&Rxcm3DG0Ym;YH(Q&SW2$Huvp zGEeiW(L0V`R$S;>Eqy3U(5(;Gn3kzSlH7jiR?X-l%#4k@cotnWm++>~o#L*f zv44>HSk^jSp8!~Sl%rWrN5ivU-7woER(0k$c9oPbI`c>P4AvIPQFWurefXq9j(Mh6 z9g?a8^OQ-rjvL zSIrL`XSzfiJu;kkPw`7$QSK2(WN%D<2=MLLGl#mn_Nwq{PHuk%QBiSu4sQ`$#FA>U7Yi=dnLE7 zeq8llE%(|rzvDRt^CnMS!}znN-g&w+B~{s&83o+JO5RKE>hLzbC7aB+_N!mp;bm$h zTzKfz%C@jW9v0;NCg#t8zFP(^`94f>$k-lEXH;wt9`=57W30t|?^YIKOferH>FJQ< zI(p&Rnc(Kv<}0Ub$|ttPf(Qn9RJtg*>yn|x-RPJ6vxK%X`0^hk=Y0LrZo7G5b=7qh zFDV`lEvfZ3iH1Lj|AxlS@K3HUYhCYjv1URwaw)IAzP`Qv{-?BkZNkP26RRFJNB&?y%225Ui|kp8T)O+`Z|3$v1_Co!2UJjxr|A%H8`&cIZTI&cbaKuAAD1 zCB5Z#KvdV+Q2tF@N>=6L&K2A2w+<cl>|)aF^<~hl>Z$P;VW3kZ9SoGwR>5o2MCEl4k8N>{&Q*WZ5MupaLgg zJ8hmZOu*`e~3%6#4qz{Ep%2e@(nTZ9>KKK@v+&a5kPOEiE_4FFQa;I1lGph^82i^Tj->yebz%}(DhO7j>Wg&80kND8a|n~ z>?(WA+SBYY=a@Du(KU6!OV~78!W!)OjMA&emo6^`yJqdUajC@T$Gc$Xu>0zyGqXb? zyPBqYwyvj2w`OG@yldNX&&l_~Q-iMjg(LM==&yu~IA*p3NYWA71