From 992a02c945ff6aeda5e6a614d580f8d69db54d47 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 16 May 2022 17:47:48 +0800 Subject: [PATCH] fix texture missing in official ae2 --- .../client/gui/GuiBaseFluidPatternTerminal.java | 4 ++-- .../gui/GuiBaseFluidPatternTerminalEx.java | 2 +- .../github/client/gui/GuiFCBaseMonitor.java | 12 ++++++++++-- .../assets/ae2fc/textures/gui/pattern.png | Bin 0 -> 2336 bytes .../assets/ae2fc/textures/gui/pattern2.png | Bin 0 -> 2325 bytes .../assets/ae2fc/textures/gui/pattern3.png | Bin 0 -> 3329 bytes .../assets/ae2fc/textures/gui/terminal.png | Bin 0 -> 2935 bytes 7 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/ae2fc/textures/gui/pattern.png create mode 100644 src/main/resources/assets/ae2fc/textures/gui/pattern2.png create mode 100644 src/main/resources/assets/ae2fc/textures/gui/pattern3.png create mode 100644 src/main/resources/assets/ae2fc/textures/gui/terminal.png diff --git a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java index bae893e3..e6277cf3 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java @@ -142,9 +142,9 @@ public class GuiBaseFluidPatternTerminal extends GuiFCBaseMonitor { { if( this.container.isCraftingMode() ) { - return "guis/pattern.png"; + return "gui/pattern.png"; } - return "guis/pattern2.png"; + return "gui/pattern2.png"; } @Override diff --git a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java index b64df2ba..a79600d5 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java @@ -114,7 +114,7 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { @Override protected String getBackground() { - return "guis/pattern3.png"; + return "gui/pattern3.png"; } @Override diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java index 12df9433..988d119d 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java @@ -16,6 +16,7 @@ import appeng.container.AEBaseContainer; import appeng.container.slot.*; import appeng.core.AEConfig; import appeng.core.AELog; +import appeng.core.AppEng; import appeng.core.localization.ButtonToolTips; import appeng.core.localization.GuiText; import appeng.core.sync.GuiBridge; @@ -43,6 +44,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; @@ -577,11 +579,17 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi memoryText = this.searchField.getText(); } + public void bindTextureBack( final String file ) + { + final ResourceLocation loc = new ResourceLocation( FluidCraft.MODID, "textures/" + file ); + this.mc.getTextureManager().bindTexture( loc ); + } + @Override public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { - this.bindTexture( this.getBackground() ); + this.bindTextureBack( this.getBackground() ); final int x_width = 197; this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 ); @@ -624,7 +632,7 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi protected String getBackground() { - return "guis/terminal.png"; + return "gui/terminal.png"; } @Override diff --git a/src/main/resources/assets/ae2fc/textures/gui/pattern.png b/src/main/resources/assets/ae2fc/textures/gui/pattern.png new file mode 100644 index 0000000000000000000000000000000000000000..1022e8435b4a0fffe0701018a39a8a9d85c1724a GIT binary patch literal 2336 zcmeHI`%_a#6h8MR;U#E5!RR2`YCsdk5WryY5fBC#1Of>$K7u?H0gFP71}WOxiVwsJ zHA6u|6{_-32}pxzaUd-i#Ue5i5wQ|LR1guS1Q9{fd(-+`{{#JIcD_Al_MF{0`|X|# zez2dF#as&junO?^2?IdzDFS9BoOWIj3vnXv@Cxz*xSBO>GKvB~0{(iTFYf1XIN{;p znVFf@)zun}#$Yhu&d>Notr25Z`=bgy^0t} zOmf~G+-WEE6-x!XW2LgFueU=|RQxWf^RDgE1#ZqP&%V)k{C7DP;NvAsi5UFrNveWH zJsg_A*>B(!{iIqL73?S^9UC9Bdb{9Gob7G#Xs&Xorl^&f%ANf~UdSVvF37KSv*Okz z-lKPub#*;@(T*RFEM0`Ax#!4l-bf z`do6)fMzD9dC|bYkD2Z0IUA<}XSM6WsfuF<)r)gU9^8i@9T5Jlz1G`%_rjmQCq`Jo zyi+3wstDsXz8Y(MLxsE9hariH^-IKaDzg<5Ge~{e_VtK4p3ZD|jEP*{32WF6I;=tr4C3Zc?)Vu zNkc8k`RFX995$*c*x6dYiAmI7y&QXc15!ddik)^L`u1g*Lv7DYUY7S3w9o5=A0!Iw z(VNA#*q#mPDmD9LEhDALmepLy^bS1qAi{L{cb=s6TRBUTcf9KEgv$Y|JxsFIJp+pd zYh8J>#8bZ3n{RS>7QpRZ3>O@T&O9nvM%)$j_rB_K!?g7jXcDEjop*GGq~Nd_x$ivE za02LZh>Y)M4eo^s2LUFaX#Xf~N8Jb=@(yg6M#N*yojihxd}ch|TgGGkQ&wW2C9@4S zr8YiR(GG6ITm8S_>mC{vXS6DYYNGr^ClJ+}u;}a8&L=h&9e2l+Dx<{yKO(aFl;Co- zWx?KDoBFDGiGeG^uOQNk&uI}&6NJ8vz}_qEKF$GZa`HFX#$YRmT}y@%#*vneof+Nl zmBb@ygVgFqm$Y?HHW1}7LMy|6oR4TPd(n1@Mp9WDHCq9FHA$VZ(a<8}%BGdBF~D%@ q95=aEdXJW0Sq24VPyQRN`VVU<6X#r>J$LOPQU&-1`zXC5zyAlTfd>Wv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2fc/textures/gui/pattern2.png b/src/main/resources/assets/ae2fc/textures/gui/pattern2.png new file mode 100644 index 0000000000000000000000000000000000000000..2f10f8d1e33f5a3f4024f2e526df64418055d9a5 GIT binary patch literal 2325 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