tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

fix: autocrafting with legacy terminals

This commit is contained in:
Timo Ley 2022-12-31 15:50:08 +01:00
parent 54a0ed7d09
commit 9ff95486f5
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
View File

@ -42,6 +42,8 @@ import appeng.helpers.WirelessTerminalGuiObject;
import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartCraftingTerminal;
import appeng.parts.reporting.PartPatternTerminal; import appeng.parts.reporting.PartPatternTerminal;
import appeng.parts.reporting.PartTerminal; import appeng.parts.reporting.PartTerminal;
import appeng.tile.legacy.TileCraftTerminal;
import appeng.tile.legacy.TileTerminal;
import appeng.util.Platform; import appeng.util.Platform;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
@ -86,11 +88,11 @@ public class GuiCraftConfirm extends AEBaseGui {
this.OriginalGui = GuiBridge.GUI_WIRELESS_TERM; this.OriginalGui = GuiBridge.GUI_WIRELESS_TERM;
} }
if (te instanceof PartTerminal) { if (te instanceof PartTerminal || te instanceof TileTerminal) {
this.OriginalGui = GuiBridge.GUI_ME; this.OriginalGui = GuiBridge.GUI_ME;
} }
if (te instanceof PartCraftingTerminal) { if (te instanceof PartCraftingTerminal || te instanceof TileCraftTerminal) {
this.OriginalGui = GuiBridge.GUI_CRAFTING_TERMINAL; this.OriginalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
} }
@ -138,9 +140,9 @@ public class GuiCraftConfirm extends AEBaseGui {
20, 20,
GuiText.Cancel.getLocal() GuiText.Cancel.getLocal()
); );
this.buttonList.add(this.cancel);
} }
this.buttonList.add(this.cancel);
} }
@Override @Override

6
src/main/java/appeng/container/implementations/ContainerCraftConfirm.java
View File

@ -51,6 +51,8 @@ import appeng.helpers.WirelessTerminalGuiObject;
import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartCraftingTerminal;
import appeng.parts.reporting.PartPatternTerminal; import appeng.parts.reporting.PartPatternTerminal;
import appeng.parts.reporting.PartTerminal; import appeng.parts.reporting.PartTerminal;
import appeng.tile.legacy.TileCraftTerminal;
import appeng.tile.legacy.TileTerminal;
import appeng.util.Platform; import appeng.util.Platform;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -285,11 +287,11 @@ public class ContainerCraftConfirm extends AEBaseContainer {
originalGui = GuiBridge.GUI_WIRELESS_TERM; originalGui = GuiBridge.GUI_WIRELESS_TERM;
} }
if (ah instanceof PartTerminal) { if (ah instanceof PartTerminal || ah instanceof TileTerminal) {
originalGui = GuiBridge.GUI_ME; originalGui = GuiBridge.GUI_ME;
} }
if (ah instanceof PartCraftingTerminal) { if (ah instanceof PartCraftingTerminal || ah instanceof TileCraftTerminal) {
originalGui = GuiBridge.GUI_CRAFTING_TERMINAL; originalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
} }

1
src/main/java/appeng/core/api/definitions/ApiBlocks.java
View File

@ -31,6 +31,7 @@ import appeng.block.grindstone.BlockCrank;
import appeng.block.grindstone.BlockGrinder; import appeng.block.grindstone.BlockGrinder;
import appeng.block.legacy.BlockCraftMonitor; import appeng.block.legacy.BlockCraftMonitor;
import appeng.block.legacy.BlockCraftTerminal; import appeng.block.legacy.BlockCraftTerminal;
import appeng.block.legacy.BlockLegacyChest;
import appeng.block.legacy.BlockLegacyController; import appeng.block.legacy.BlockLegacyController;
import appeng.block.legacy.BlockPatternEncoder; import appeng.block.legacy.BlockPatternEncoder;
import appeng.block.legacy.BlockStorageMonitor; import appeng.block.legacy.BlockStorageMonitor;