Fix broken crafting screens and Pattern Provider in forge/1.20.1

src/main/java/lu/kolja/expandedae/mixin/cpu/MixinCraftingCPUMenu.java

@@ -35,10 +35,10 @@ public MixinCraftingCPUMenu(MenuType<?> menuType, int id, Inventory playerInvent
 
     @Inject(
             method = "<init>",
-            at = @At("TAIL")
+            at = @At("RETURN")
     )
-    private void init(MenuType<?> menuType, int id, Inventory ip, Object te, CallbackInfo ci) {
-        registerClientAction("highlightStack", AEKey.class, this::eae$highlight);
+    private void init(CallbackInfo ci) {
+        //registerClientAction("highlightStack", AEKey.class, this::eae$highlight);
     }
 
     @Unique

src/main/java/lu/kolja/expandedae/mixin/cpu/MixinCraftingCPUScreen.java

@@ -60,7 +60,7 @@ private MixinCraftingCPUScreen(T menu, Inventory playerInventory, Component titl
 
     @Inject(
             method = "<init>",
-            at = @At("TAIL")
+            at = @At("RETURN")
     )
     private void init(CallbackInfo ci) {
         this.eae$searchField = GuardedWidget
@@ -82,7 +82,7 @@ private void init(CallbackInfo ci) {
      */
     @Inject(
             method = "updateBeforeRender",
-            at = @At("TAIL")
+            at = @At("RETURN")
     )
     private void updateBeforeRender(CallbackInfo ci) {
         this.eae$searchField.runIfPresent(w -> w.visible = !this.getVisualEntries().isEmpty());

src/main/java/lu/kolja/expandedae/mixin/crafting/MixinCraftConfirmScreen.java

@@ -55,21 +55,23 @@ private MixinCraftConfirmScreen(CraftConfirmMenu menu, Inventory playerInventory
 
     @Inject(
             method = "<init>",
-            at = @At("TAIL")
+            at = @At("RETURN")
     )
     private void init(CraftConfirmMenu menu, Inventory playerInventory, Component title, ScreenStyle style, CallbackInfo ci) {
         this.eae$searchField = GuardedWidget
                 .guardedWidget("searchField", ((AccessorScreenStyle) style).getWidgets(), this.widgets::addTextField)
                 .runIfPresent(w -> w.setPlaceholder(GuiText.SearchPlaceholder.text()));
 
         this.eae$sortByToggle = this.addToLeftToolbar(new SettingToggleButton<>(Settings.SORT_BY, SortOrder.AMOUNT, ISearchScreen::eae$toggleButton));
+
         this.eae$sortDirToggle = this.addToLeftToolbar(new SettingToggleButton<>(Settings.SORT_DIRECTION, SortDir.ASCENDING, ISearchScreen::eae$toggleButton));
+
         this.eae$addMissing = this.addToLeftToolbar(new ExpActionButton(ExpActionItems.ADD_MISSING, this::eae$addMissing));
     }
 
     @Inject(
             method = "updateBeforeRender",
-            at = @At("TAIL")
+            at = @At("RETURN")
     )
     private void updateBeforeRender(CallbackInfo ci) {
         if (this.menu.getPlan() == null) return;

src/main/java/lu/kolja/expandedae/mixin/crafting/MixinCraftingStatusMenu.java

@@ -24,7 +24,7 @@ private MixinCraftingStatusMenu(MenuType<?> menuType, int id, Inventory ip, Obje
 
     @Inject(
             method = "<init>",
-            at = @At("TAIL")
+            at = @At("RETURN")
     )
     private void expandedae$init(CallbackInfo ci) {
         this.registerClientAction(ACTION_CANCEL_ALL, this::expandedae$cancelAll);

src/main/java/lu/kolja/expandedae/mixin/crafting/MixinCraftingStatusScreen.java

@@ -36,7 +36,7 @@ private MixinCraftingStatusScreen(CraftingStatusMenu menu, Inventory playerInven
 
     @Inject(
             method = "<init>",
-            at = @At("TAIL"),
+            at = @At("RETURN"),
             remap = false
     )
     private void init(CraftingStatusMenu menu, Inventory playerInventory, Component title, ScreenStyle style, CallbackInfo ci) {

src/main/java/lu/kolja/expandedae/mixin/misc/MixinStyleManager.java

@@ -7,15 +7,18 @@
 
 @Mixin(value = StyleManager.class, remap = false)
 public class MixinStyleManager {
-    @ModifyVariable(method = "loadStyleDoc", at = @At("HEAD"), argsOnly = true)
+    @ModifyVariable(
+            method = "loadStyleDoc",
+            at = @At(value = "LOAD", ordinal = 0),
+            argsOnly = true
+    )
     private static String loadStyleDocHooks(String path) {
-        return switch (path) {
-            case "/screens/wireless_pattern_encoding_terminal.json" -> "/screens/wtlib/modify_wireless_pattern_encoding_terminal.json";
-            case "/screens/pattern_encoding_terminal.json" -> "/screens/terminals/modify_pattern_encoding_terminal.json";
-            case "/screens/crafting_status.json" -> "/screens/exp_mode/modify_crafting_status.json";
-            case "/screens/craft_confirm.json" -> "/screens/exp_mode/modify_craft_confirm.json";
-            case "/screens/crafting_cpu.json" -> "/screens/exp_mode/modify_crafting_cpu.json";
-            default -> path;
-        };
+        // Only modify Terminal-related paths
+        if (path.contains("wireless_pattern_encoding_terminal.json")) {
+            return "/screens/wtlib/modify_wireless_pattern_encoding_terminal.json";
+        } else if (path.contains("pattern_encoding_terminal.json")) {
+            return "/screens/terminals/modify_pattern_encoding_terminal.json";
+        }
+        return path;
     }
 }

src/main/java/lu/kolja/expandedae/mixin/patternprovider/MixinPatternProviderMenu.java

@@ -86,7 +86,12 @@ private void initToolbox(MenuType<?> menuType, int id, Inventory playerInventory
     )
     public void tickToolbox(CallbackInfo ci) {
         this.eae_$toolbox.tick();
-        if (this.isServerSide()) eae$blockingMode = logic.getConfigManager().getSetting(ExpSettings.BLOCKING_MODE);
+        if (this.isServerSide()) {
+            var blockingMode = logic.getConfigManager().getSetting(ExpSettings.BLOCKING_MODE);
+            if (blockingMode != null) {
+                eae$blockingMode = blockingMode;
+            }
+        }
     }
 
     @Override

src/main/java/lu/kolja/expandedae/mixin/patternprovider/MixinPatternProviderScreen.java

@@ -40,7 +40,7 @@ private MixinPatternProviderScreen(C menu, Inventory playerInventory, Component
 
     @Inject(
             method = "<init>",
-            at = @At("TAIL"),
+            at = @At("RETURN"),
             remap = false
     )
     private void init(PatternProviderMenu menu, Inventory playerInventory, Component title, ScreenStyle style, CallbackInfo ci) {

src/main/java/lu/kolja/expandedae/mixin/terminal/MixinProcessingEncodingPanel.java

@@ -34,7 +34,7 @@ protected MixinProcessingEncodingPanel(PatternEncodingTermScreen<?> screen, Widg
         super(screen, widgets);
     }
 
-    @Inject(method = "<init>", at = @At("TAIL"), remap = false)
+    @Inject(method = "<init>", at = @At("RETURN"), remap = false)
     private void init(PatternEncodingTermScreen<?> screen, WidgetContainer widgets, CallbackInfo ci) {
         eae$x2 = new ModifyIconButton(b -> ((IPatternEncodingTerminalMenu) menu).eae$ModifyPattern(2),
                 MULTIPLY_2,

src/main/resources/assets/ae2/screens/exp_mode/modify_craft_confirm.json

@@ -41,7 +41,7 @@
     "cancel": {
       "left": 6,
       "bottom": 25,
-      "width": 50,q
+      "width": 50,
       "height": 20
     },
     "searchField": {

src/main/resources/assets/ae2/screens/exp_mode/modify_crafting_cpu.json

@@ -1,6 +1,4 @@
 {
-  "$schema": "schema.json",
-  "includes": ["common/common.json"],
   "background": {
     "texture": "guis/craftingcpu.png",
     "srcRect": [0, 0, 238, 184]
@@ -25,12 +23,6 @@
       "top": 19,
       "width": 12,
       "height": 137
-    },
-    "searchField": {
-      "left": 144,
-      "top": 4,
-      "width": 69,
-      "height": 12
     }
   }
 }

src/main/resources/mixins.expandedae.json

@@ -31,9 +31,7 @@
     "misc.MixinStyleManager",
     "patternprovider.MixinPatternProviderLogic",
     "patternprovider.MixinPatternProviderLogicHost",
-    "patternprovider.MixinPatternProviderMenu",
-    "terminal.MixinPatternEncodingTerminalMenu",
-    "terminal.MixinProcessingEncodingPanel"
+    "patternprovider.MixinPatternProviderMenu"
   ],
   "client": [
     "accessor.AccessorBuiltInModelHooks",
@@ -44,7 +42,9 @@
     "misc.MixinModelBakery",
     "misc.MixinSettingToggleButton",
     "patternprovider.MixinPatternProviderScreen",
-    "terminal.MixinPatternEncodingTermScreen"
+    "terminal.MixinPatternEncodingTermScreen",
+    "terminal.MixinPatternEncodingTerminalMenu",
+    "terminal.MixinProcessingEncodingPanel"
   ],
   "injectors": {
     "defaultRequire": 1