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 ce994c2e..7e7bb6dc 100644 Binary files a/src/main/resources/assets/ae2fc/textures/gui/states.png and b/src/main/resources/assets/ae2fc/textures/gui/states.png differ