Test

Test

src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java

@@ -10,12 +10,15 @@ import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.container.slot.AppEngSlot;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.FCBasePartContainerEx;
+import com.glodblock.github.client.gui.container.FluidPrioritization;
 import com.glodblock.github.network.CPacketFluidPatternTermBtns;
 import com.glodblock.github.util.Ae2ReflectClient;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.NameConst;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.StatCollector;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -24,11 +27,15 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
 
     private static final String SUBSITUTION_DISABLE = "0";
     private static final String SUBSITUTION_ENABLE = "1";
+    private static final String PRIORITY_DISABLE = "0";
+    private static final String PRIORITY_ENABLE = "1";
 
     public FCBasePartContainerEx container;
 
     private GuiImgButton substitutionsEnabledBtn;
     private GuiImgButton substitutionsDisabledBtn;
+    private GuiImgButton fluidPrioritizedEnabledBtn;
+    private GuiImgButton fluidPrioritizedDisabledBtn;
     private GuiImgButton encodeBtn;
     private GuiImgButton invertBtn;
     private GuiImgButton clearBtn;
@@ -63,6 +70,10 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
         {
             FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) );
         }
+        else if( this.fluidPrioritizedEnabledBtn == btn || this.fluidPrioritizedDisabledBtn == btn )
+        {
+            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Prioritize", this.fluidPrioritizedEnabledBtn == btn ? PRIORITY_DISABLE : PRIORITY_ENABLE ) );
+        }
         else if( this.invertBtn == btn )
         {
             FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Invert", container.inverted ? "0" : "1" ) );
@@ -87,6 +98,16 @@ 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.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.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 );
         this.buttonList.add( this.invertBtn );
@@ -123,6 +144,18 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
             this.substitutionsEnabledBtn.visible = false;
             this.substitutionsDisabledBtn.visible = true;
         }
+        if( this.container.prioritize )
+        {
+            this.fluidPrioritizedEnabledBtn.visible = true;
+            this.fluidPrioritizedDisabledBtn.visible = false;
+           // MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("ENABLED"));
+        }
+        else
+        {
+            this.fluidPrioritizedEnabledBtn.visible = false;
+            this.fluidPrioritizedDisabledBtn.visible = true;
+            //MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("DISABLED"));
+        }
 
         super.drawFG( offsetX, offsetY, mouseX, mouseY );
         this.fontRendererObj.drawString( StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL_EX), 8, this.ySize - 96 + 2 - Ae2ReflectClient.getReservedSpace(this), 4210752 );
@@ -159,11 +192,20 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
             substitutionsEnabledBtn.visible = false;
             substitutionsDisabledBtn.visible = true;
         }
+        if (container.prioritize) {
+            fluidPrioritizedEnabledBtn.visible = true;
+            fluidPrioritizedDisabledBtn.visible = false;
+        } else {
+            fluidPrioritizedEnabledBtn.visible = false;
+            fluidPrioritizedDisabledBtn.visible = true;
+        }
 
         final int offset = container.inverted? 18 * -3: 0;
 
         substitutionsEnabledBtn.xPosition  = this.guiLeft + 97 + offset;
         substitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset;
+        fluidPrioritizedEnabledBtn.xPosition = this.guiLeft + 87 + offset;
+        fluidPrioritizedDisabledBtn.xPosition = this.guiLeft + 87 + offset;
         doubleBtn.xPosition = this.guiLeft + 97 + offset;
         clearBtn.xPosition  = this.guiLeft + 87 + offset;
         invertBtn.xPosition = this.guiLeft + 87 + offset;

src/main/java/com/glodblock/github/client/gui/GuiFCPriority.java

@@ -34,6 +34,7 @@ public class GuiFCPriority extends AEBaseGui
     private GuiButton plus10;
     private GuiButton plus100;
     private GuiButton plus1000;
+    private GuiButton plus10000;
     private GuiButton minus1;
     private GuiButton minus10;
     private GuiButton minus100;
@@ -56,16 +57,20 @@ public class GuiFCPriority extends AEBaseGui
         final int b = AEConfig.instance.priorityByStacksAmounts( 1 );
         final int c = AEConfig.instance.priorityByStacksAmounts( 2 );
         final int d = AEConfig.instance.priorityByStacksAmounts( 3 );
+        final int e = AEConfig.instance.priorityByStacksAmounts( 4 );
 
         this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 32, 22, 20, "+" + a ) );
         this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 32, 28, 20, "+" + b ) );
         this.buttonList.add( this.plus100 = new GuiButton( 0, this.guiLeft + 82, this.guiTop + 32, 32, 20, "+" + c ) );
         this.buttonList.add( this.plus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 32, 38, 20, "+" + d ) );
+        this.buttonList.add( this.plus10000 = new GuiButton( 0, this.guiLeft + 140, this.guiTop + 32, 42, 20, "+" + e ) );
+
 
         this.buttonList.add( this.minus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 69, 22, 20, "-" + a ) );
         this.buttonList.add( this.minus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 69, 28, 20, "-" + b ) );
         this.buttonList.add( this.minus100 = new GuiButton( 0, this.guiLeft + 82, this.guiTop + 69, 32, 20, "-" + c ) );
         this.buttonList.add( this.minus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 69, 38, 20, "-" + d ) );
+        this.buttonList.add( this.plus10000 = new GuiButton( 0, this.guiLeft + 140, this.guiTop + 32, 42, 20, "+" + e ) );
 
         ItemStack myIcon = null;
         final Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();

src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java

@@ -66,6 +66,8 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAp
     public boolean inverted;
     @GuiSync( 96 + (17-9) + 17 )
     public int activePage = 0;
+    @GuiSync( 96 + (17-9) + 13 )
+    public boolean prioritize = false;
 
     public FCBasePartContainerEx(final InventoryPlayer ip, final ITerminalHost monitorable )
     {
@@ -205,6 +207,11 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAp
         encodedValue.setTag( "out", tagOut );
         encodedValue.setBoolean( "substitute", this.isSubstitute() );
 
+        encodedValue.setTag( "in", tagIn );
+        encodedValue.setTag( "out", tagOut );
+        encodedValue.setBoolean( "piroritize", this.isPrioritize() );
+
+
         output.setTagCompound( encodedValue );
     }
 
@@ -383,6 +390,8 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAp
         return this.substitute;
     }
 
+    private boolean isPrioritize() { return this.prioritize; }
+
     static boolean canDoubleStacks(SlotFake[] slots)
     {
         List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());

src/main/java/com/glodblock/github/client/gui/container/FluidPrioritization.java

@@ -0,0 +1,12 @@
+package com.glodblock.github.client.gui.container;
+
+
+import akka.actor.Status;
+
+import java.lang.reflect.Type;
+
+public enum FluidPrioritization {
+    ENABLED,
+    DISABLED;
+
+}

src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java

@@ -38,6 +38,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
     private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 );
 
     private boolean substitute = false;
+    private boolean priorization = false;
     private boolean inverted = false;
     private int activePage = 0;
 
@@ -84,6 +85,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
         this.crafting.readFromNBT( data, "craftingGrid" );
 
         this.setSubstitution( data.getBoolean( "substitute" ) );
+        this.setPrioritization( data.getBoolean( "priorization") );
         this.setInverted( data.getBoolean( "inverted" ) );
         this.setActivePage( data.getInteger( "activePage" ) );
     }
@@ -95,7 +97,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
         this.pattern.writeToNBT( data, "pattern" );
         this.output.writeToNBT( data, "outputList" );
         this.crafting.writeToNBT( data, "craftingGrid" );
-
+        data.setBoolean("priorization", this.priorization);
         data.setBoolean( "substitute", this.substitute );
         data.setBoolean( "inverted", this.inverted );
         data.setInteger( "activePage", this.activePage );
@@ -208,6 +210,10 @@ public class PartFluidPatternTerminalEx extends FCBasePart {
     {
         this.substitute = canSubstitute;
     }
+    public void setPrioritization( boolean canPrioritize )
+    {
+        this.priorization = canPrioritize;
+    }
 
     public void onChangeCrafting(IAEItemStack[] newCrafting, IAEItemStack[] newOutput) {
         IInventory crafting = this.getInventoryByName("crafting");

src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java

@@ -3,14 +3,22 @@ package com.glodblock.github.nei.recipes;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.IRecipeHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import com.glodblock.github.client.gui.container.FluidPrioritization;
 import com.glodblock.github.nei.object.IRecipeExtractor;
 import com.glodblock.github.nei.object.IRecipeExtractorLegacy;
 import com.glodblock.github.nei.object.OrderStack;
+import ibxm.Player;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.server.command.ForgeCommand;
+import tv.twitch.chat.Chat;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import net.minecraft.util.ChatComponentText;
 
 public final class FluidRecipe {
 
@@ -31,6 +39,20 @@ public final class FluidRecipe {
         IRecipeExtractor extractor = IdentifierMap.get(tRecipe.getOverlayIdentifier());
         if (extractor == null) return new ArrayList<>();
         List<PositionedStack> tmp = new ArrayList<>(tRecipe.getIngredientStacks(index));
+        FluidPrioritization fluid = FluidPrioritization.ENABLED;
+        switch(fluid) {
+            case ENABLED:
+                MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText("hi"));
+
+                for (int i = 0; i < tmp.size(); i++) {
+                    if(tmp.get(i).toString().contains("GregTech_FluidDisplay")) {
+                        MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText(String.valueOf(tmp.size())));
+                        PositionedStack Stack = tmp.get(i);
+                        tmp.remove(Stack);
+                        tmp.add(0, Stack);
+                        }
+                    }
+                }
         return extractor.getInputIngredients(tmp, recipe, index);
     }