From b3f3ecfe2e5e416954d62130a0d049c75e9fd7c7 Mon Sep 17 00:00:00 2001 From: Runakai1 Date: Sat, 13 Aug 2022 15:41:55 +0200 Subject: [PATCH] Made button functional added icon + proper functionality --- .../gui/GuiBaseFluidPatternTerminalEx.java | 16 ++++++---------- .../github/client/gui/GuiFCImgButton.java | 2 ++ .../github/nei/recipes/FluidRecipe.java | 12 +++++++++--- .../resources/assets/ae2fc/lang/en_US.lang | 5 +++++ .../assets/ae2fc/textures/gui/states.png | Bin 734 -> 1122 bytes 5 files changed, 22 insertions(+), 13 deletions(-) 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 97268d3e..2d0a5256 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java @@ -34,8 +34,8 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { private GuiImgButton substitutionsEnabledBtn; private GuiImgButton substitutionsDisabledBtn; - private GuiImgButton fluidPrioritizedEnabledBtn; - private GuiImgButton fluidPrioritizedDisabledBtn; + private GuiFCImgButton fluidPrioritizedEnabledBtn; + private GuiFCImgButton fluidPrioritizedDisabledBtn; private GuiImgButton encodeBtn; private GuiImgButton invertBtn; private GuiImgButton clearBtn; @@ -104,15 +104,13 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { this.substitutionsDisabledBtn.setHalfSize( true ); this.buttonList.add( this.substitutionsDisabledBtn ); - this.fluidPrioritizedEnabledBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 143, Settings.ACTIONS, FluidPrioritization.ENABLED ); + this.fluidPrioritizedEnabledBtn = new GuiFCImgButton( this.guiLeft + 97, this.guiTop + this.ySize - 143, "FORCE_PRIO", "DO_PRIO" ); this.fluidPrioritizedEnabledBtn.setHalfSize( true ); this.buttonList.add( this.fluidPrioritizedEnabledBtn ); - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("ENABLED IMMER")); - this.fluidPrioritizedDisabledBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 143, Settings.ACTIONS, FluidPrioritization.DISABLED ); + this.fluidPrioritizedDisabledBtn = new GuiFCImgButton( this.guiLeft + 97, this.guiTop + this.ySize - 143, "NOT_PRIO", "DONT_PRIO" ); this.fluidPrioritizedDisabledBtn.setHalfSize( true ); this.buttonList.add( this.fluidPrioritizedDisabledBtn ); - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("DISABLED IMMER")); invertBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 153, Settings.ACTIONS, container.inverted ? PatternSlotConfig.C_4_16 : PatternSlotConfig.C_16_4); invertBtn.setHalfSize( true ); @@ -162,13 +160,11 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { { this.fluidPrioritizedEnabledBtn.visible = false; this.fluidPrioritizedDisabledBtn.visible = true; - // MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("ENABLED")); } else { this.fluidPrioritizedEnabledBtn.visible = true; this.fluidPrioritizedDisabledBtn.visible = false; - //MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("DISABLED")); } if ( this.container.combine ) @@ -229,8 +225,8 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { substitutionsEnabledBtn.xPosition = this.guiLeft + 97 + offset; substitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset; - fluidPrioritizedEnabledBtn.xPosition = this.guiLeft + 87 + offset; - fluidPrioritizedDisabledBtn.xPosition = this.guiLeft + 87 + offset; + fluidPrioritizedEnabledBtn.xPosition = this.guiLeft + 97 + offset; + fluidPrioritizedDisabledBtn.xPosition = this.guiLeft + 97 + offset; doubleBtn.xPosition = this.guiLeft + 97 + offset; clearBtn.xPosition = this.guiLeft + 87 + offset; invertBtn.xPosition = this.guiLeft + 87 + offset; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java index 3b5b0c2e..e405c881 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java @@ -37,6 +37,8 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { appearances = new HashMap<>(); this.registerApp( 0, "NOT_COMBINE", "DONT_COMBINE", "not_combine" ); this.registerApp( 1, "FORCE_COMBINE", "DO_COMBINE", "combine" ); + this.registerApp( 2, "FORCE_PRIO", "DO_PRIO", "prio" ); + this.registerApp( 3, "NOT_PRIO", "DONT_PRIO", "not_prio" ); } } diff --git a/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java b/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java index 9b8f6a11..c8c3e7b6 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java +++ b/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java @@ -41,16 +41,22 @@ public final class FluidRecipe { IRecipeExtractor extractor = IdentifierMap.get(tRecipe.getOverlayIdentifier()); if (extractor == null) return new ArrayList<>(); List tmp = new ArrayList<>(tRecipe.getIngredientStacks(index)); + List fluidClone = new ArrayList<>(); if (priority) { for (int i = 0; i < tmp.size(); i++) { if(tmp.get(i).item.getItem() instanceof GT_FluidDisplayItem) { - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText(String.valueOf(tmp.size()))); PositionedStack Stack = tmp.get(i); - tmp.remove(Stack); - tmp.add(0, Stack); + fluidClone.add(Stack); } } + for (int i = 0; i < fluidClone.size(); i++) { + tmp.remove(fluidClone.get(i)); } + Collections.reverse(fluidClone); + for (int i = 0; i < fluidClone.size(); i++) { + tmp.add(0, fluidClone.get(i)); + } + } return extractor.getInputIngredients(tmp, recipe, index); } diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index c750f6b4..89076d29 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -40,6 +40,11 @@ ae2fc.tooltip.not_combine.hint=Disabled ae2fc.tooltip.combine=Merge the same items ae2fc.tooltip.combine.hint=Enabled +ae2fc.tooltip.not_prio=Allow fluids to be placed first +ae2fc.tooltip.not_prio.hint=Enabled +ae2fc.tooltip.prio=Allow fluids to be placed first +ae2fc.tooltip.prio.hint=Disabled + ae2fc.gui.part_fluid_pattern_terminal=Fluid Pattern Terminal ae2fc.gui.part_fluid_pattern_terminal_ex=Fluid Processing Pattern Terminal ae2fc.gui.fluid_pattern_encoder=Fluid Pattern Encoder diff --git a/src/main/resources/assets/ae2fc/textures/gui/states.png b/src/main/resources/assets/ae2fc/textures/gui/states.png index ce994c2e4ca9f9e28577d4f399f7f46cc3aa087b..7e7bb6dcf0e9638e3c7ed8bd5011d0c3ff6c82f5 100644 GIT binary patch delta 1102 zcmV-U1hMy*hBYyw^b5ch_0Itp)=>Px(97#k$RA_710Ws?aW zG{?=7OqK|e%N)YOuo=ogjuDLHIAFjTyyhNq-DL0}C`53{K^Hyb7$%Afdh7@ik~JC^ zj3hzblQ?5m?VieErrYl6KeqNn+wWpkSzo{J)qAh%4McDn+@k>$i$x|TCdlXWp+@`q z`aA;K!4DEY_5)6>&|!sfU4qdTy$ zut0x*Ke=4a*Ql=R{C@W?4|JVEp+KorvgbmGbNNoumV@PT***X-eo*E=s>#ouecLSJ z#{?CzB7~6R2#VXd}mb3*ot~baK*LV)x~@m&m&;{FMn;&NoQxcm!u{Jt_Xb4d*4n6RaHSs%zC{s zc3}0FKiZndao}D8%=0G9(wD#cE%kyUTrxx?qh zuh`ky;jh&vyrC+{R0oP;UW?EmxEwG|6a9siE+^c7^oqT`J$ucR2LB$PT(!nfxExRw zcz^WH*?fP0pIWWvSX21%*Y;do?SflPN~OE20|4{Y5$g6+-b=yB>y4Vd)uBg z44!NBt{;CCQNFKkrY_+IG7x6{gX3;5^n zhnMEg%*-@v;2QgROGp?D!$8x#9YCd0NoEZghT%K*L*g9pJ8f(3=S*TcGfP~Uc)v7C zR0RA4g7@T|^Tasd6mJ-YM|4mcCB^{@t*PWp9ltb7oC6S^_nM};qL7#(w%`;PR7cQG zBq9P~Iq$bOktyU974ff3hx*8&?Bm&`y8z_)jX8%BA`L0kRri Uhj@?Gvj6}907*qoM6N<$g5@DB%m4rY delta 711 zcmV;&0yzER2;K#dBYy&=Nklck$WhdB1i? z%lCbdLAhKeUvyp9k|G2U%D0~641^#hBZ{ck>+G6r64LxxOn>(!K>|V1YPAZR%?9{u zQAw!suLT()ktl)}=CN9>U^pDIaZuvp2q|>HvTfV1R4UMHHre$s;cmD4Dqb#^kWQyT zg}?AVtB(+h_xpV)l}eGK`F#Guz%BSHU^{@~v)PP%Mu{S}+wEmB6!~#M5}+;5WHKyb zQUFzu4)l6Ga+`L$4ZGb=D9TJfKeJET0U16&N@)J$w}1EW{nH=t!BOe}Nq|-kXL!9{ zLpGZY73R%*o+r&mZllqF!C=75lNTvCYA-VSCYITOUeATveM^E*I6?C_O@Nx9GrU+Vn22Sai^U1k_zM2TJqTCvIQ=q%cZ`>#ghC5- z^WWWb^?wmb0=khTpc_d7x{)NH8%YAXktCoS|H*M$BYyvSj4eJMkInc!fJUNlJRTvH zx~%ndIyG|#(6H!#5sXVfRBalIlF_~c6x3XldC?dd)d7(~5LBLzjY)tvj|PLL!^X(S z9e|M05sjIVPob!}$C&SeF-uIr8w^`$9!7K^YCz^i-!*cCcvG@ZBQPZa8N;Dt^^d*9 t!rkqF2r}jo+J6sx{qmEXDq{fv{sJ`R4N(n>Z3X}U002ovPDHLkV1gKvPk;ab