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 fcedaf8f..233b88a8 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java @@ -2,7 +2,6 @@ package com.glodblock.github.client.gui; import appeng.api.config.ActionItems; import appeng.api.config.ItemSubstitution; -import appeng.api.config.PatternBeSubstitution; import appeng.api.config.Settings; import appeng.api.storage.ITerminalHost; import appeng.client.gui.widgets.GuiImgButton; @@ -118,19 +117,19 @@ public class GuiBaseFluidPatternTerminal extends GuiFCBaseMonitor { this.buttonList.add(this.doubleBtn); combineLeft = 84; } - if (ModAndClassUtil.isBeSubstitutionsButton) { - combineLeft = 74; - combineTop -= 11; - this.beSubstitutionsEnabledBtn = new GuiImgButton( - this.guiLeft + 84, this.guiTop + this.ySize - 153, Settings.ACTIONS, PatternBeSubstitution.ENABLED); - this.beSubstitutionsEnabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsEnabledBtn); - - this.beSubstitutionsDisabledBtn = new GuiImgButton( - this.guiLeft + 84, this.guiTop + this.ySize - 153, Settings.ACTIONS, PatternBeSubstitution.DISABLED); - this.beSubstitutionsDisabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsDisabledBtn); - } +// if (ModAndClassUtil.isBeSubstitutionsButton) { +// combineLeft = 74; +// combineTop -= 11; +// this.beSubstitutionsEnabledBtn = new GuiImgButton( +// this.guiLeft + 84, this.guiTop + this.ySize - 153, Settings.ACTIONS, PatternBeSubstitution.ENABLED); +// this.beSubstitutionsEnabledBtn.setHalfSize(true); +// this.buttonList.add(this.beSubstitutionsEnabledBtn); +// +// this.beSubstitutionsDisabledBtn = new GuiImgButton( +// this.guiLeft + 84, this.guiTop + this.ySize - 153, Settings.ACTIONS, PatternBeSubstitution.DISABLED); +// this.beSubstitutionsDisabledBtn.setHalfSize(true); +// this.buttonList.add(this.beSubstitutionsDisabledBtn); +// } this.combineEnableBtn = new GuiFCImgButton(this.guiLeft + combineLeft, this.guiTop + this.ySize - combineTop, "FORCE_COMBINE", "DO_COMBINE"); this.combineEnableBtn.setHalfSize(true); this.buttonList.add(this.combineEnableBtn); 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 db90f6e2..5102b5a4 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java @@ -1,6 +1,9 @@ package com.glodblock.github.client.gui; -import appeng.api.config.*; +import appeng.api.config.ActionItems; +import appeng.api.config.ItemSubstitution; +import appeng.api.config.PatternSlotConfig; +import appeng.api.config.Settings; import appeng.api.storage.ITerminalHost; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiScrollbar; @@ -133,17 +136,17 @@ public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor { this.combineDisableBtn = new GuiFCImgButton(this.guiLeft + 87, this.guiTop + this.ySize - 114, "NOT_COMBINE", "DONT_COMBINE"); this.combineDisableBtn.setHalfSize(true); this.buttonList.add(this.combineDisableBtn); - if (ModAndClassUtil.isBeSubstitutionsButton) { - this.beSubstitutionsEnabledBtn = new GuiImgButton( - this.guiLeft + 87, this.guiTop + this.ySize - 103, Settings.ACTIONS, PatternBeSubstitution.ENABLED); - this.beSubstitutionsEnabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsEnabledBtn); - - this.beSubstitutionsDisabledBtn = new GuiImgButton( - this.guiLeft + 87, this.guiTop + this.ySize - 103, Settings.ACTIONS, PatternBeSubstitution.DISABLED); - this.beSubstitutionsDisabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsDisabledBtn); - } +// if (ModAndClassUtil.isBeSubstitutionsButton) { +// this.beSubstitutionsEnabledBtn = new GuiImgButton( +// this.guiLeft + 87, this.guiTop + this.ySize - 103, Settings.ACTIONS, PatternBeSubstitution.ENABLED); +// this.beSubstitutionsEnabledBtn.setHalfSize(true); +// this.buttonList.add(this.beSubstitutionsEnabledBtn); +// +// this.beSubstitutionsDisabledBtn = new GuiImgButton( +// this.guiLeft + 87, this.guiTop + this.ySize - 103, Settings.ACTIONS, PatternBeSubstitution.DISABLED); +// this.beSubstitutionsDisabledBtn.setHalfSize(true); +// this.buttonList.add(this.beSubstitutionsDisabledBtn); +// } processingScrollBar.setTop(this.ySize - 164); } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java index 9f06b5c9..be5a58d4 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java @@ -119,7 +119,7 @@ public class ContainerFluidPatternTerminal extends FCBasePartContainer implement FluidPatternDetails pattern = new FluidPatternDetails(patternStack); pattern.setInputs(collectInventory(craftingSlots)); pattern.setOutputs(collectInventory(outputSlots)); - pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0); +// pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0); patternSlotOUT.putStack(pattern.writeToStack()); } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java index 6e4ec344..95645a9d 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java @@ -116,7 +116,7 @@ public class ContainerFluidPatternTerminalEx extends FCBasePartContainerEx imple pattern.setCombine(this.combine ? 1:0); pattern.setInputs(collectInventory(craftingSlots)); pattern.setOutputs(collectInventory(outputSlots)); - pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0); +// pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0); patternSlotOUT.putStack(pattern.writeToStack()); } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java index 5dc65c2d..e6611ddb 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java @@ -140,7 +140,7 @@ public class PartFluidPatternTerminal extends FCBasePart { if(newStack != null){ NBTTagCompound data = newStack.getTagCompound(); this.setCombineMode(data.getInteger("combine") == 1); - this.setBeSubstitute(data.getBoolean("beSubstitute")); +// this.setBeSubstitute(data.getBoolean("beSubstitute")); } for (int i = 0; i < this.crafting.getSizeInventory(); i++) { this.crafting.setInventorySlotContents(i, null); diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java index 8f4ccbb6..47fdee81 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java @@ -165,7 +165,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart { if(newStack != null){ NBTTagCompound data = newStack.getTagCompound(); this.setCombineMode(data.getInteger("combine") == 1); - this.setBeSubstitute(data.getBoolean("beSubstitute")); +// this.setBeSubstitute(data.getBoolean("beSubstitute")); } this.setInverted(inputsCount <= 8 && outputCount > 8); this.setActivePage(0); diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java index bf1a2f72..48a687d0 100644 --- a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java +++ b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java @@ -73,7 +73,7 @@ public final class ModAndClassUtil { } try { Field d = ButtonToolTips.class.getDeclaredField("BeSubstitutionsDescEnabled"); - isBeSubstitutionsButton = true; +// isBeSubstitutionsButton = true; } catch (NoSuchFieldException e) { isBeSubstitutionsButton = false; }