From 663b10ddd3d090ec5cdd5787788e52f278393177 Mon Sep 17 00:00:00 2001 From: GaLi <3096147684@qq.com> Date: Sat, 28 Mar 2026 15:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=94=B9=E7=94=A8=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatternEncodingTermScaleButtonsMixin.java | 205 ----------------- .../gui/ProcessingEncodingPanelMixin.java | 215 +++++++++++++++++- .../encoding/eaep_pattern_terminals.json | 37 --- .../terminals/pattern_encoding_terminal.json | 118 ---------- .../resources/extendedae_plus.mixins.json | 1 - 5 files changed, 213 insertions(+), 363 deletions(-) delete mode 100644 src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternEncodingTermScaleButtonsMixin.java delete mode 100644 src/main/resources/assets/ae2/screens/terminals/encoding/eaep_pattern_terminals.json delete mode 100644 src/main/resources/assets/ae2/screens/terminals/pattern_encoding_terminal.json diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternEncodingTermScaleButtonsMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternEncodingTermScaleButtonsMixin.java deleted file mode 100644 index 762d1b0..0000000 --- a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternEncodingTermScaleButtonsMixin.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.extendedae_plus.mixin.ae2.client.gui; - -import appeng.client.gui.AEBaseScreen; -import appeng.client.gui.me.items.PatternEncodingTermScreen; -import appeng.client.gui.style.ScreenStyle; -import appeng.client.gui.style.WidgetStyle; -import appeng.menu.AEBaseMenu; -import appeng.parts.encoding.EncodingMode; -import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.client.gui.widgets.ScaledTextureButton; -import com.extendedae_plus.mixin.accessor.AbstractContainerScreenAccessor; -import com.extendedae_plus.mixin.accessor.ScreenAccessor; -import com.extendedae_plus.mixin.ae2.accessor.AEBaseScreenAccessor; -import com.extendedae_plus.network.ScaleEncodingPatternC2SPacket; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.client.renderer.Rect2i; -import net.neoforged.neoforge.network.PacketDistributor; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(value = AEBaseScreen.class, remap = false) -public abstract class PatternEncodingTermScaleButtonsMixin { - @Unique - private static final ResourceLocation EAP$SCALE_BUTTON_TEXTURE = - ResourceLocation.fromNamespaceAndPath(ExtendedAEPlus.MODID, "textures/gui/beizeng.png"); - @Unique - private static final ResourceLocation EAP$SWAP_OUTPUT_TEXTURE = - ResourceLocation.fromNamespaceAndPath(ExtendedAEPlus.MODID, "textures/gui/zhu_fu_qie_huan.png"); - @Unique - private static final ResourceLocation EAP$RESTORE_RATIO_TEXTURE = - ResourceLocation.fromNamespaceAndPath(ExtendedAEPlus.MODID, "textures/gui/huanyuan.png"); - - @Unique - private ScaledTextureButton eap$mul2Button; - @Unique - private ScaledTextureButton eap$mul3Button; - @Unique - private ScaledTextureButton eap$mul5Button; - @Unique - private ScaledTextureButton eap$div2Button; - @Unique - private ScaledTextureButton eap$div3Button; - @Unique - private ScaledTextureButton eap$div5Button; - @Unique - private ScaledTextureButton eap$swapOutputsButton; - @Unique - private ScaledTextureButton eap$restoreRatioButton; - - @Inject(method = "init", at = @At("TAIL"), remap = false) - private void eap$initScaleButtons(CallbackInfo ci) { - if (!(((Object) this) instanceof PatternEncodingTermScreen)) { - return; - } - - if (this.eap$mul2Button == null) { - this.eap$mul2Button = eap$createScaleButton(0, 0, "x2", - ScaleEncodingPatternC2SPacket.Operation.MUL2); - this.eap$mul3Button = eap$createScaleButton(16, 0, "x3", - ScaleEncodingPatternC2SPacket.Operation.MUL3); - this.eap$mul5Button = eap$createScaleButton(32, 0, "x5", - ScaleEncodingPatternC2SPacket.Operation.MUL5); - this.eap$div2Button = eap$createScaleButton(0, 16, "/2", - ScaleEncodingPatternC2SPacket.Operation.DIV2); - this.eap$div3Button = eap$createScaleButton(16, 16, "/3", - ScaleEncodingPatternC2SPacket.Operation.DIV3); - this.eap$div5Button = eap$createScaleButton(32, 16, "/5", - ScaleEncodingPatternC2SPacket.Operation.DIV5); - this.eap$swapOutputsButton = eap$createStandaloneButton( - EAP$SWAP_OUTPUT_TEXTURE, - Component.translatable("extendedae_plus.tooltip.swap_processing_outputs"), - ScaleEncodingPatternC2SPacket.Operation.SWAP_OUTPUTS - ); - this.eap$restoreRatioButton = eap$createStandaloneButton( - EAP$RESTORE_RATIO_TEXTURE, - Component.translatable("extendedae_plus.tooltip.restore_processing_ratio"), - ScaleEncodingPatternC2SPacket.Operation.RESTORE_RATIO - ); - } - - eap$ensureAdded(this.eap$mul2Button); - eap$ensureAdded(this.eap$mul3Button); - eap$ensureAdded(this.eap$mul5Button); - eap$ensureAdded(this.eap$div2Button); - eap$ensureAdded(this.eap$div3Button); - eap$ensureAdded(this.eap$div5Button); - eap$ensureAdded(this.eap$swapOutputsButton); - eap$ensureAdded(this.eap$restoreRatioButton); - } - - @Inject(method = "containerTick", at = @At("TAIL"), remap = false) - private void eap$updateScaleButtons(CallbackInfo ci) { - if (!(((Object) this) instanceof PatternEncodingTermScreen screen)) { - return; - } - if (this.eap$mul2Button == null) { - return; - } - - eap$ensureAdded(this.eap$mul2Button); - eap$ensureAdded(this.eap$mul3Button); - eap$ensureAdded(this.eap$mul5Button); - eap$ensureAdded(this.eap$div2Button); - eap$ensureAdded(this.eap$div3Button); - eap$ensureAdded(this.eap$div5Button); - eap$ensureAdded(this.eap$swapOutputsButton); - eap$ensureAdded(this.eap$restoreRatioButton); - - boolean visible = screen.getMenu().getMode() == EncodingMode.PROCESSING; - this.eap$mul2Button.setVisibility(visible); - this.eap$mul3Button.setVisibility(visible); - this.eap$mul5Button.setVisibility(visible); - this.eap$div2Button.setVisibility(visible); - this.eap$div3Button.setVisibility(visible); - this.eap$div5Button.setVisibility(visible); - this.eap$swapOutputsButton.setVisibility(visible); - this.eap$restoreRatioButton.setVisibility(visible); - - if (!visible) { - return; - } - - Rect2i bounds = eap$getScreenBounds(); - if (bounds == null) { - return; - } - eap$placeButton(this.eap$div2Button, "chu_2", bounds); - eap$placeButton(this.eap$div3Button, "chu_3", bounds); - eap$placeButton(this.eap$div5Button, "chu_5", bounds); - eap$placeButton(this.eap$mul2Button, "cheng_2", bounds); - eap$placeButton(this.eap$mul3Button, "cheng_3", bounds); - eap$placeButton(this.eap$mul5Button, "cheng_5", bounds); - eap$placeButton(this.eap$swapOutputsButton, "zhu_fu_qie_huan", bounds); - eap$placeButton(this.eap$restoreRatioButton, "huan_yuan_mo_ren", bounds); - } - - @Unique - private ScaledTextureButton eap$createScaleButton(int srcX, int srcY, String tooltipText, - ScaleEncodingPatternC2SPacket.Operation op) { - return new ScaledTextureButton( - EAP$SCALE_BUTTON_TEXTURE, - 48, - 32, - srcX, - srcY, - 16, - 16, - 0.375f, - Component.literal(tooltipText), - btn -> PacketDistributor.sendToServer(new ScaleEncodingPatternC2SPacket(op)) - ); - } - - @Unique - private ScaledTextureButton eap$createStandaloneButton(ResourceLocation texture, Component tooltipText, - ScaleEncodingPatternC2SPacket.Operation op) { - return new ScaledTextureButton( - texture, - 16, - 16, - 0, - 0, - 16, - 16, - 0.375f, - tooltipText, - btn -> PacketDistributor.sendToServer(new ScaleEncodingPatternC2SPacket(op)) - ); - } - - @Unique - private void eap$ensureAdded(ScaledTextureButton button) { - var accessor = (ScreenAccessor) (Object) this; - var renderables = accessor.eap$getRenderables(); - var children = accessor.eap$getChildren(); - if (!renderables.contains(button)) { - renderables.add(button); - } - if (!children.contains(button)) { - children.add(button); - } - } - - @Unique - private Rect2i eap$getScreenBounds() { - int leftPos = ((AbstractContainerScreenAccessor) (Object) this).eap$getLeftPos(); - int topPos = ((AbstractContainerScreenAccessor) (Object) this).eap$getTopPos(); - int imageWidth = ((AbstractContainerScreenAccessor) (Object) this).eap$getImageWidth(); - int imageHeight = ((AbstractContainerScreenAccessor) (Object) this).eap$getImageHeight(); - return new Rect2i(leftPos, topPos, imageWidth, imageHeight); - } - - @Unique - private void eap$placeButton(ScaledTextureButton button, String widgetId, Rect2i bounds) { - ScreenStyle style = ((AEBaseScreenAccessor) (Object) this).eap$getStyle(); - WidgetStyle widgetStyle = style.getWidget(widgetId); - var pos = widgetStyle.resolve(bounds); - button.setX(pos.getX()); - button.setY(pos.getY()); - } -} diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/ProcessingEncodingPanelMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/ProcessingEncodingPanelMixin.java index f75c504..15f34e2 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/ProcessingEncodingPanelMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/ProcessingEncodingPanelMixin.java @@ -1,22 +1,233 @@ package com.extendedae_plus.mixin.ae2.client.gui; +import appeng.client.gui.WidgetContainer; +import appeng.client.gui.me.items.EncodingModePanel; +import appeng.client.gui.me.items.PatternEncodingTermScreen; import appeng.client.gui.me.items.ProcessingEncodingPanel; import appeng.client.gui.widgets.ActionButton; +import com.extendedae_plus.ExtendedAEPlus; +import com.extendedae_plus.client.gui.widgets.ScaledTextureButton; +import com.extendedae_plus.mixin.accessor.AbstractContainerScreenAccessor; +import com.extendedae_plus.mixin.accessor.ScreenAccessor; +import com.extendedae_plus.network.ScaleEncodingPatternC2SPacket; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.neoforged.neoforge.network.PacketDistributor; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(value = ProcessingEncodingPanel.class, remap = false) -public abstract class ProcessingEncodingPanelMixin { +public abstract class ProcessingEncodingPanelMixin extends EncodingModePanel { + @Unique + private static final ResourceLocation EAP$SCALE_BUTTON_TEXTURE = + ResourceLocation.fromNamespaceAndPath(ExtendedAEPlus.MODID, "textures/gui/beizeng.png"); + @Unique + private static final ResourceLocation EAP$SWAP_OUTPUT_TEXTURE = + ResourceLocation.fromNamespaceAndPath(ExtendedAEPlus.MODID, "textures/gui/zhu_fu_qie_huan.png"); + @Unique + private static final ResourceLocation EAP$RESTORE_RATIO_TEXTURE = + ResourceLocation.fromNamespaceAndPath(ExtendedAEPlus.MODID, "textures/gui/huanyuan.png"); + + @Unique + private static final int EAP$SWAP_OUTPUT_LEFT = 125; + @Unique + private static final int EAP$SWAP_OUTPUT_BOTTOM = 159; + @Unique + private static final int EAP$RESTORE_RATIO_LEFT = 100; + @Unique + private static final int EAP$RESTORE_RATIO_BOTTOM = 159; + @Unique + private static final int EAP$MUL2_LEFT = 125; + @Unique + private static final int EAP$MUL2_BOTTOM = 149; + @Unique + private static final int EAP$MUL3_LEFT = 125; + @Unique + private static final int EAP$MUL3_BOTTOM = 138; + @Unique + private static final int EAP$MUL5_LEFT = 125; + @Unique + private static final int EAP$MUL5_BOTTOM = 127; + @Unique + private static final int EAP$DIV2_LEFT = 100; + @Unique + private static final int EAP$DIV2_BOTTOM = 149; + @Unique + private static final int EAP$DIV3_LEFT = 100; + @Unique + private static final int EAP$DIV3_BOTTOM = 138; + @Unique + private static final int EAP$DIV5_LEFT = 100; + @Unique + private static final int EAP$DIV5_BOTTOM = 127; + @Shadow @Final private ActionButton cycleOutputBtn; + @Unique + private ScaledTextureButton eap$mul2Button; + @Unique + private ScaledTextureButton eap$mul3Button; + @Unique + private ScaledTextureButton eap$mul5Button; + @Unique + private ScaledTextureButton eap$div2Button; + @Unique + private ScaledTextureButton eap$div3Button; + @Unique + private ScaledTextureButton eap$div5Button; + @Unique + private ScaledTextureButton eap$swapOutputsButton; + @Unique + private ScaledTextureButton eap$restoreRatioButton; + + protected ProcessingEncodingPanelMixin(PatternEncodingTermScreen screen, WidgetContainer widgets) { + super(screen, widgets); + } + + @Inject(method = "", at = @At("TAIL"), remap = false) + private void eap$initButtons(PatternEncodingTermScreen screen, WidgetContainer widgets, CallbackInfo ci) { + if (this.eap$mul2Button != null) { + return; + } + + this.eap$mul2Button = eap$createScaleButton(0, 0, "x2", + ScaleEncodingPatternC2SPacket.Operation.MUL2); + this.eap$mul3Button = eap$createScaleButton(16, 0, "x3", + ScaleEncodingPatternC2SPacket.Operation.MUL3); + this.eap$mul5Button = eap$createScaleButton(32, 0, "x5", + ScaleEncodingPatternC2SPacket.Operation.MUL5); + this.eap$div2Button = eap$createScaleButton(0, 16, "/2", + ScaleEncodingPatternC2SPacket.Operation.DIV2); + this.eap$div3Button = eap$createScaleButton(16, 16, "/3", + ScaleEncodingPatternC2SPacket.Operation.DIV3); + this.eap$div5Button = eap$createScaleButton(32, 16, "/5", + ScaleEncodingPatternC2SPacket.Operation.DIV5); + this.eap$swapOutputsButton = eap$createStandaloneButton( + EAP$SWAP_OUTPUT_TEXTURE, + Component.translatable("extendedae_plus.tooltip.swap_processing_outputs"), + ScaleEncodingPatternC2SPacket.Operation.SWAP_OUTPUTS); + this.eap$restoreRatioButton = eap$createStandaloneButton( + EAP$RESTORE_RATIO_TEXTURE, + Component.translatable("extendedae_plus.tooltip.restore_processing_ratio"), + ScaleEncodingPatternC2SPacket.Operation.RESTORE_RATIO); + + this.eap$mul2Button.setVisibility(false); + this.eap$mul3Button.setVisibility(false); + this.eap$mul5Button.setVisibility(false); + this.eap$div2Button.setVisibility(false); + this.eap$div3Button.setVisibility(false); + this.eap$div5Button.setVisibility(false); + this.eap$swapOutputsButton.setVisibility(false); + this.eap$restoreRatioButton.setVisibility(false); + + eap$ensureAdded(this.eap$mul2Button); + eap$ensureAdded(this.eap$mul3Button); + eap$ensureAdded(this.eap$mul5Button); + eap$ensureAdded(this.eap$div2Button); + eap$ensureAdded(this.eap$div3Button); + eap$ensureAdded(this.eap$div5Button); + eap$ensureAdded(this.eap$swapOutputsButton); + eap$ensureAdded(this.eap$restoreRatioButton); + } + @Inject(method = "setVisible", at = @At("TAIL"), remap = false) - private void eap$hideVanillaCycleOutputButton(boolean visible, CallbackInfo ci) { + private void eap$updateInjectedButtons(boolean visible, CallbackInfo ci) { this.cycleOutputBtn.setVisibility(false); + + if (this.eap$mul2Button == null) { + return; + } + + eap$ensureAdded(this.eap$mul2Button); + eap$ensureAdded(this.eap$mul3Button); + eap$ensureAdded(this.eap$mul5Button); + eap$ensureAdded(this.eap$div2Button); + eap$ensureAdded(this.eap$div3Button); + eap$ensureAdded(this.eap$div5Button); + eap$ensureAdded(this.eap$swapOutputsButton); + eap$ensureAdded(this.eap$restoreRatioButton); + + this.eap$mul2Button.setVisibility(visible); + this.eap$mul3Button.setVisibility(visible); + this.eap$mul5Button.setVisibility(visible); + this.eap$div2Button.setVisibility(visible); + this.eap$div3Button.setVisibility(visible); + this.eap$div5Button.setVisibility(visible); + this.eap$swapOutputsButton.setVisibility(visible); + this.eap$restoreRatioButton.setVisibility(visible); + + if (!visible) { + return; + } + + eap$placeButton(this.eap$swapOutputsButton, EAP$SWAP_OUTPUT_LEFT, EAP$SWAP_OUTPUT_BOTTOM); + eap$placeButton(this.eap$restoreRatioButton, EAP$RESTORE_RATIO_LEFT, EAP$RESTORE_RATIO_BOTTOM); + eap$placeButton(this.eap$mul2Button, EAP$MUL2_LEFT, EAP$MUL2_BOTTOM); + eap$placeButton(this.eap$mul3Button, EAP$MUL3_LEFT, EAP$MUL3_BOTTOM); + eap$placeButton(this.eap$mul5Button, EAP$MUL5_LEFT, EAP$MUL5_BOTTOM); + eap$placeButton(this.eap$div2Button, EAP$DIV2_LEFT, EAP$DIV2_BOTTOM); + eap$placeButton(this.eap$div3Button, EAP$DIV3_LEFT, EAP$DIV3_BOTTOM); + eap$placeButton(this.eap$div5Button, EAP$DIV5_LEFT, EAP$DIV5_BOTTOM); + } + + @Unique + private ScaledTextureButton eap$createScaleButton(int srcX, int srcY, String tooltipText, + ScaleEncodingPatternC2SPacket.Operation op) { + return new ScaledTextureButton( + EAP$SCALE_BUTTON_TEXTURE, + 48, + 32, + srcX, + srcY, + 16, + 16, + 0.375f, + Component.literal(tooltipText), + btn -> PacketDistributor.sendToServer(new ScaleEncodingPatternC2SPacket(op))); + } + + @Unique + private ScaledTextureButton eap$createStandaloneButton(ResourceLocation texture, Component tooltipText, + ScaleEncodingPatternC2SPacket.Operation op) { + return new ScaledTextureButton( + texture, + 16, + 16, + 0, + 0, + 16, + 16, + 0.375f, + tooltipText, + btn -> PacketDistributor.sendToServer(new ScaleEncodingPatternC2SPacket(op))); + } + + @Unique + private void eap$ensureAdded(ScaledTextureButton button) { + var accessor = (ScreenAccessor) (Object) this.screen; + var renderables = accessor.eap$getRenderables(); + var children = accessor.eap$getChildren(); + if (!renderables.contains(button)) { + renderables.add(button); + } + if (!children.contains(button)) { + children.add(button); + } + } + + @Unique + private void eap$placeButton(ScaledTextureButton button, int left, int bottom) { + int leftPos = ((AbstractContainerScreenAccessor) (Object) this.screen).eap$getLeftPos(); + int topPos = ((AbstractContainerScreenAccessor) (Object) this.screen).eap$getTopPos(); + int imageHeight = ((AbstractContainerScreenAccessor) (Object) this.screen).eap$getImageHeight(); + button.setX(leftPos + left + 1); + button.setY(topPos + imageHeight - bottom); } } diff --git a/src/main/resources/assets/ae2/screens/terminals/encoding/eaep_pattern_terminals.json b/src/main/resources/assets/ae2/screens/terminals/encoding/eaep_pattern_terminals.json deleted file mode 100644 index ce56a4e..0000000 --- a/src/main/resources/assets/ae2/screens/terminals/encoding/eaep_pattern_terminals.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "../../schema.json", - "widgets": { - "zhu_fu_qie_huan": { - "left": 125, - "bottom": 159 - }, - "huan_yuan_mo_ren": { - "left": 101, - "bottom": 159 - }, - "cheng_2": { - "left": 125, - "bottom": 149 - }, - "cheng_3": { - "left": 125, - "bottom": 138 - }, - "cheng_5": { - "left": 125, - "bottom": 127 - }, - "chu_2": { - "left": 101, - "bottom": 149 - }, - "chu_3": { - "left": 101, - "bottom": 138 - }, - "chu_5": { - "left": 101, - "bottom": 127 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ae2/screens/terminals/pattern_encoding_terminal.json b/src/main/resources/assets/ae2/screens/terminals/pattern_encoding_terminal.json deleted file mode 100644 index 4c18cf1..0000000 --- a/src/main/resources/assets/ae2/screens/terminals/pattern_encoding_terminal.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "$schema": "../schema.json", - "includes": [ - "terminal.json", - "encoding/crafting.json", - "encoding/processing.json", - "encoding/smithing_table.json", - "encoding/stonecutting.json", - "encoding/eaep_pattern_terminals.json" - ], - "helpTopic": "items-blocks-machines/terminals.md#pattern-encoding-terminal-ui", - "slots": { - "BLANK_PATTERN": { - "left": 147, - "bottom": 165 - }, - "ENCODED_PATTERN": { - "left": 147, - "bottom": 118 - } - }, - "text": { - "dialog_title": { - "text": { - "translate": "gui.ae2.Terminal" - }, - "position": { - "left": 8, - "top": 6 - } - }, - "crafting_grid_title": { - "text": { - "translate": "gui.ae2.PatternEncoding" - }, - "position": { - "left": 8, - "bottom": 177 - } - } - }, - "terminalStyle": { - "header": { - "texture": "guis/pattern.png", - "srcRect": [0, 0, 195, 17] - }, - "firstRow": { - "texture": "guis/pattern.png", - "srcRect": [0, 17, 195, 18] - }, - "row": { - "texture": "guis/pattern.png", - "srcRect": [0, 35, 195, 18] - }, - "lastRow": { - "texture": "guis/pattern.png", - "srcRect": [0, 53, 195, 18] - }, - "bottom": { - "texture": "guis/pattern.png", - "srcRect": [0, 71, 195, 180] - } - }, - "widgets": { - "modeTabButton0": { - "left": 173, - "bottom": 174, - "width": 22, - "height": 22 - }, - "modeTabButton1": { - "left": 173, - "bottom": 153, - "width": 22, - "height": 22 - }, - "modeTabButton2": { - "left": 173, - "bottom": 132, - "width": 22, - "height": 22 - }, - "modeTabButton3": { - "left": 173, - "bottom": 111, - "width": 22, - "height": 22 - }, - "modePanel0": { - "left": 9, - "bottom": 166 - }, - "modePanel1": { - "left": 9, - "bottom": 166 - }, - "modePanel2": { - "left": 9, - "bottom": 166 - }, - "modePanel3": { - "left": 9, - "bottom": 166 - }, - "modePanel4": { - "left": 9, - "bottom": 166 - }, - "modePanel5": { - "left": 9, - "bottom": 166 - }, - "encodePattern": { - "left": 147, - "bottom": 145 - } - } -} diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index 380a941..bc18530 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -81,7 +81,6 @@ "ae2.client.gui.InterfaceScreenMixin", "ae2.client.gui.ProcessingEncodingPanelMixin", "ae2.client.gui.PatternEncodingTermScreenMixin", - "ae2.client.gui.PatternEncodingTermScaleButtonsMixin", "ae2.client.gui.PatternEncodingTermUploadMixin", "ae2.client.gui.PatternProviderCloseMixin", "ae2.client.gui.PatternProviderScreenUpgradesMixin",