From c9cef35acf503fcc7452cd6e0d3860d9395f7fb4 Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 13 Jan 2023 14:53:32 +0100 Subject: [PATCH] crash fix, acidizer GUI change --- .../container/ContainerCrystallizer.java | 19 +++++++++------ .../hbm/inventory/gui/GUICrystallizer.java | 22 +++++++++--------- .../com/hbm/module/ModulePatternMatcher.java | 4 ++++ .../gui/processing/gui_crystallizer_alt.png | Bin 2635 -> 2832 bytes 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java b/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java index 35ca3c64b..07a2d03cb 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java @@ -17,13 +17,18 @@ public class ContainerCrystallizer extends Container { public ContainerCrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer tedf) { diFurnace = tedf; - this.addSlotToContainer(new Slot(tedf, 0, 80, 35)); - this.addSlotToContainer(new Slot(tedf, 1, 8, 53)); - this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 140, 35)); - this.addSlotToContainer(new Slot(tedf, 3, 26, 17)); - this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 26, 53)); - this.addSlotToContainer(new SlotUpgrade(tedf, 5, 98, 17)); - this.addSlotToContainer(new SlotUpgrade(tedf, 6, 116, 17)); + //Input + this.addSlotToContainer(new Slot(tedf, 0, 62, 45)); + //Battery + this.addSlotToContainer(new Slot(tedf, 1, 152, 72)); + //Output + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 113, 45)); + //Fluid slots + this.addSlotToContainer(new Slot(tedf, 3, 17, 18)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 17, 54)); + //Upgrades + this.addSlotToContainer(new SlotUpgrade(tedf, 5, 80, 18)); + this.addSlotToContainer(new SlotUpgrade(tedf, 6, 98, 18)); for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { diff --git a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java index e9b03cea8..020eb1bef 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java @@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation; public class GUICrystallizer extends GuiInfoContainer { - public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_crystallizer.png"); + public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_crystallizer_alt.png"); private TileEntityMachineCrystallizer acidomatic; public GUICrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer acidomatic) { @@ -22,22 +22,22 @@ public class GUICrystallizer extends GuiInfoContainer { this.acidomatic = acidomatic; this.xSize = 176; - this.ySize = 168; + this.ySize = 204; } @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 51 - 34, 16, 34, acidomatic.power, acidomatic.maxPower); - acidomatic.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 44, guiTop + 17, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 18, 16, 34, acidomatic.power, acidomatic.maxPower); + acidomatic.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 35, guiTop + 18, 16, 52); String[] upgradeText = new String[4]; upgradeText[0] = I18nUtil.resolveKey("desc.gui.upgrade"); upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed"); upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.effectiveness"); upgradeText[3] = I18nUtil.resolveKey("desc.gui.upgrade.overdrive"); - this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 87, guiTop + 21, 8, 8, guiLeft + 200, guiTop + 45, upgradeText); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 117, guiTop + 22, 8, 8, guiLeft + 200, guiTop + 45, upgradeText); } @Override @@ -54,14 +54,14 @@ public class GUICrystallizer extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = (int)acidomatic.getPowerScaled(34); - drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 176, 34 - i, 16, i); + int i = (int)acidomatic.getPowerScaled(52); + drawTexturedModalRect(guiLeft + 152, guiTop + 70 - i, 176, 64 - i, 16, i); - int j = acidomatic.getProgressScaled(23); - drawTexturedModalRect(guiLeft + 104, guiTop + 34, 192, 0, j, 16); + int j = acidomatic.getProgressScaled(28); + drawTexturedModalRect(guiLeft + 80, guiTop + 47, 176, 0, j, 12); - this.drawInfoPanel(guiLeft + 87, guiTop + 21, 8, 8, 8); + this.drawInfoPanel(guiLeft + 117, guiTop + 22, 8, 8, 8); - acidomatic.tank.renderTank(guiLeft + 44, guiTop + 69, this.zLevel, 16, 52); + acidomatic.tank.renderTank(guiLeft + 35, guiTop + 70, this.zLevel, 16, 52); } } diff --git a/src/main/java/com/hbm/module/ModulePatternMatcher.java b/src/main/java/com/hbm/module/ModulePatternMatcher.java index 5a5d4e514..097bc6859 100644 --- a/src/main/java/com/hbm/module/ModulePatternMatcher.java +++ b/src/main/java/com/hbm/module/ModulePatternMatcher.java @@ -119,6 +119,10 @@ public class ModulePatternMatcher { String mode = modes[index]; + if(mode == null) { + modes[index] = mode = MODE_EXACT; + } + switch(mode) { case MODE_EXACT: return input.isItemEqual(filter) && ItemStack.areItemStackTagsEqual(input, filter); case MODE_WILDCARD: return input.getItem() == filter.getItem() && ItemStack.areItemStackTagsEqual(input, filter); diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_crystallizer_alt.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_crystallizer_alt.png index ae0884951f3620178de4a4653b06c3bf13375093..fb90b4c8b22b4faa8b72020526a253a9d04df832 100644 GIT binary patch literal 2832 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 literal 2635 zcmb7Fdpy)x8$UCKnPl9<&ZMEskQ8}P-z>?b zlC;Pwa>=c=ED4P#*$ieXK)k1$5P~mnb+%T}jV0>=^AdfuZaK!D}z4_td+ZWH_&|?#Y zXTI@2@2x?_o*@0cP2c0_&jsGdc6m+HGmnVg+ant*0_EGP4Z9E*gE)6QjD3@wa6UWs zg;1mkMXj>KIek$jwhMe~zLiqYoWJL2^{V9EGAw&*%jI1{t~QL$tnjDi*J7CKFP2+g z3zr=~Om@}}y^@yRmVDp3s{AuwBJJc%3d%i=5^ruAQjB6W9 zm(Ck%L_3bOx3~9}22_2UG*}t>qj~5^gevm#LUJ0=T4m~Yys~0ebVsb7wqf!Yzc!U# zt%?y&^@nH_u!A1+W_&Vtg=2=Y5R`N2>FIVD-M3S#&i;yw)U`PP1AhWMEU8(8&b()?Q+X(4!nBx7B|+bDXG)uHJ2v-RnYP^ z=z6AUVDpi%lFG zmdFSlw81a=WT=`18B!uSe;yklFt58;Oa4r#N#n-+gJ%~Fq;RGlO zakF0^$qFR8M4J9u;}1+=XDf;kZokMAew)5KDbs;w&&;vA1?bQ;3hr z5HbDIXbbw*dy^D!oKEaoPo~(M&rC0rVf{&l@;ec}{IArYGT8gZh46*qo$KXbSnIbwgR$ki!E93c{s6)zop$z)2{dw0;3EAO({k6Vp4t0D3S3 z>urr1zzL$PBRx|e=%516@@_#Mq7{u|L**;nZjte$}Vt4QR0Zti-UZE3;Ig#Zoma{ z*;A%V6rl?zs|iQJo7#FLTY@hy3k^YppE|-Nk~nstV(c^=8;1kFW87 zJDKWwfPh{Y5RS%G@~s+UQ*c%_r&mc-*G`xq)|_>7ZF{yl1EhXWXfW$F3OobX%KKI& z`c0T0&KLP129OYi1(Cq?rM_QSaLlLo9_uA{xJMBx(0B|#yKgMjeRE5Bxc|bfW9f~O zZBLO&PDfLOC4D-j72k6bcyY-#j*gBmu2Z;Un7%)fM zs5bgyy7Ow)&?}Fq0tz`{JJ=)IIC!`HN<_p*Gt_Uk+v69ohk%{_cbkSlZkEiNql!HOf*vyT4|tA;K_TEsTsGlXz4;J-uA>sT}jr3J)dp1?CD>iC{A~Z>LqE-I3=$To+sO@L9L$R9SI`z4rSM z4~Zl&4*rd|1R~=PBcf~M^;?Lnq*}3I1MRUi`Hk~eg4k^K z(#G<{fKq0z;`0l|RNcfJFQo+s9Y&Ii9&>kBf4@6MH?i4Ar75rejoV+aUCyf| znKEA{2ezq!JI095f$-gTEE7uYqwirJy&L0Ms1#Z|qs{~@G45e{b_IVf+1BZL$fu+Y z%NGGt$rNJ;XA~{{?*CYx=iY*xWvKxe#>x{Ud*>76GkB%Olfj97V6PLPG@(8R-ac)Z zRj5;(4>K_C4l}qCUW@woDs>F{Kj!(@YT9Kv5i>Z=%{TNkRWmvOk-sp^TeD*+Y==5p pZR4MLmLS{MqEGeoS);KJ6X?sT>>Wa?6mD%ian#wN#LoMNe*i^SiFE(~