diff --git a/dependencies.gradle b/dependencies.gradle index 9732a608..1dadc7a9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -21,6 +21,6 @@ dependencies { compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.49:dev") {transitive = false} - + runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") } 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 55f6ba77..c20cbf85 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java @@ -71,7 +71,7 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { } else if( this.combineDisableBtn == btn || this.combineEnableBtn == btn ) { - FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.Combine", this.combineDisableBtn == btn ? "1" : "0" ) ); + FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Combine", this.combineDisableBtn == btn ? "1" : "0" ) ); } else if (ModAndClassUtil.isDoubleButton && doubleBtn == btn) { diff --git a/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java b/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java index dcf5bd7b..c521d3e8 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java +++ b/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java @@ -60,14 +60,14 @@ public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAp protected final ProcessingSlotFake[] outputSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES]; protected final SlotRestrictedInput patternSlotIN; protected final SlotRestrictedInput patternSlotOUT; + @GuiSync( 96 + (17-9) + 11 ) + public boolean combine = false; @GuiSync( 96 + (17-9) + 12 ) public boolean substitute = false; @GuiSync( 96 + (17-9) + 16 ) public boolean inverted; @GuiSync( 96 + (17-9) + 17 ) public int activePage = 0; - @GuiSync( 95 + (17-9) + 18 ) - public boolean combine = false; public FCBasePartContainerEx(final InventoryPlayer ip, final ITerminalHost monitorable ) { diff --git a/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java b/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java index 2694faaf..21251c85 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java +++ b/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java @@ -3,7 +3,6 @@ package com.glodblock.github.nei.recipes.extractor; import codechicken.nei.PositionedStack; import com.glodblock.github.nei.object.IRecipeExtractor; import com.glodblock.github.nei.object.OrderStack; -import com.glodblock.github.util.NEIUtil; import gregtech.api.enums.ItemList; import gregtech.common.items.GT_FluidDisplayItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech6RecipeExtractor.java b/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech6RecipeExtractor.java index bdca2db1..5ffa5956 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech6RecipeExtractor.java +++ b/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech6RecipeExtractor.java @@ -3,7 +3,6 @@ package com.glodblock.github.nei.recipes.extractor; import codechicken.nei.PositionedStack; import com.glodblock.github.nei.object.IRecipeExtractor; import com.glodblock.github.nei.object.OrderStack; -import com.glodblock.github.util.NEIUtil; import gregapi.item.ItemFluidDisplay; import gregapi.recipes.Recipe; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java index c41c0b07..0605204f 100644 --- a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java +++ b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java @@ -106,8 +106,9 @@ public class CPacketFluidPatternTermBtns implements IMessage { case "PatternTerminalEx.Double": cpt.doubleStacks(Value.equals("1")); break; - case "PatternTerminal.Combine": + case "PatternTerminalEx.Combine": cpt.getPatternTerminal().setCombineMode(Value.equals("1")); + break; case "PatternTerminalEx.ActivePage": cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value)); break; diff --git a/src/main/java/com/glodblock/github/util/NEIUtil.java b/src/main/java/com/glodblock/github/util/NEIUtil.java deleted file mode 100644 index 6312c24b..00000000 --- a/src/main/java/com/glodblock/github/util/NEIUtil.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.glodblock.github.util; - -import codechicken.nei.PositionedStack; -import net.minecraft.item.ItemStack; - -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -public class NEIUtil { - - public static List compress(List list) { - List comp = new LinkedList<>(); - for (PositionedStack positionedStack : list) { - if (positionedStack == null) continue; - ItemStack currentStack = positionedStack.items[0].copy(); - if (currentStack.stackSize == 0) continue; - boolean find = false; - for (PositionedStack storedStack : comp) { - if (storedStack == null) continue; - ItemStack firstStack = storedStack.items[0].copy(); - boolean areItemStackEqual = firstStack.isItemEqual(currentStack) && ItemStack.areItemStackTagsEqual(firstStack, currentStack); - if (areItemStackEqual && (firstStack.stackSize + currentStack.stackSize) <= firstStack.getMaxStackSize()) { - find = true; - storedStack.items[0].stackSize = firstStack.stackSize + currentStack.stackSize; - } - } - if (!find) { - comp.add(positionedStack.copy()); - } - } - return comp.stream().filter(Objects::nonNull).collect(Collectors.toList()); - } - -}