From f6f8ac20e82d76b9fdd20686c1db945548c9bdd2 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Tue, 16 Jun 2020 17:35:47 +0200 Subject: [PATCH] Fix the pattern terminal's processing output / crafting result slots not being disabled when switching modes by putting back the old code that simply moves them offscreen. --- .../appeng/client/gui/implementations/GuiPatternTerm.java | 3 +-- .../container/implementations/ContainerPatternTerm.java | 8 ++++---- src/main/resources/META-INF/accesstransformer.cfg | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 2f6e413ed..f38762ccc 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -20,9 +20,7 @@ package appeng.client.gui.implementations; import appeng.api.config.ActionItems; -import appeng.api.config.Settings; import appeng.client.gui.widgets.GuiActionButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; import appeng.client.gui.widgets.GuiTabButton; import appeng.container.implementations.ContainerPatternTerm; import appeng.container.slot.AppEngSlot; @@ -151,4 +149,5 @@ public class GuiPatternTerm extends GuiMEMonitorable s.yPos = s.getY() + this.ySize - 78 - offsetPlayerSide; } + } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 0c562c792..da5d06c67 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -147,20 +147,20 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( !this.isCraftingMode() ) { - // FIXME this.craftSlot.xPos = -9000; + this.craftSlot.xPos = -9000; for( int y = 0; y < 3; y++ ) { - // FIXME this.outputSlots[y].xPos = this.outputSlots[y].getX(); + this.outputSlots[y].xPos = this.outputSlots[y].getX(); } } else { - // FIXME this.craftSlot.xPos = this.craftSlot.getX(); + this.craftSlot.xPos = this.craftSlot.getX(); for( int y = 0; y < 3; y++ ) { - // FIXME this.outputSlots[y].xPos = -9000; + this.outputSlots[y].xPos = -9000; } } } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 4fe271e0e..69da5a62b 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -9,6 +9,7 @@ protected net.minecraft.inventory.container.Container field_75149_d # listeners protected net.minecraft.client.particle.RedstoneParticle (Lnet/minecraft/world/World;DDDDDDLnet/minecraft/particles/RedstoneParticleData;Lnet/minecraft/client/particle/IAnimatedSprite;)V # We need to change yPos of existing slots to resize the container +public-f net.minecraft.inventory.container.Slot field_75223_e # xPos public-f net.minecraft.inventory.container.Slot field_75221_f # yPos # For JEI registration