🐛 Fix compile errors from cherry picking

Author: MrCrayfish

common/src/main/java/com/mrcrayfish/controllable/client/gui/screens/SettingsScreen.java

@@ -17,6 +17,7 @@
 import com.mrcrayfish.framework.api.config.AbstractProperty;
 import com.mrcrayfish.framework.config.FrameworkConfigManager;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.ClientRecipeBook;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -28,8 +29,11 @@
 import net.minecraft.client.gui.layouts.GridLayout;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.crafting.RecipeHolder;
 import org.lwjgl.glfw.GLFW;
 
 import org.jetbrains.annotations.Nullable;
@@ -287,8 +291,13 @@ public SettingsTab()
                 mc.options.save();
             }));
             optionsList.addEntry(new TabOptionToggleItem(Config.CLIENT.options.quickCraft).setChangeCallback(value -> {
-                if(mc.player != null) {
-                    mc.player.getRecipeBook().rebuildCollections();
+                if(mc.player != null && mc.level != null) {
+                    // Rebuild the client recipe book
+                    ClientRecipeBook book = mc.player.getRecipeBook();
+                    Iterable<RecipeHolder<?>> holders = book.getCollections().stream().flatMap(c -> c.getRecipes().stream()).toList();
+                    RegistryAccess access = mc.level.registryAccess();
+                    book.setupCollections(holders, access);
+                    book.getCollections().forEach(c -> c.updateKnownRecipes(book));
                 }
             }));
             optionsList.addEntry(new TabOptionEnumItem<>(Config.CLIENT.options.radialThumbstick));

common/src/main/java/com/mrcrayfish/controllable/client/util/MouseHooks.java

@@ -26,7 +26,8 @@ private static double getScreenMouseX()
             return Controllable.getCursor().getScreenX();
         }
         Window window = Minecraft.getInstance().getWindow();
-        return Minecraft.getInstance().mouseHandler.getScaledXPos(window);
+        double x = Minecraft.getInstance().mouseHandler.xpos();
+        return x * window.getGuiScaledWidth() / window.getScreenWidth();
     }
 
     /**
@@ -38,8 +39,10 @@ private static double getScreenMouseY()
         {
             return Controllable.getCursor().getScreenY();
         }
+        // TODO TEST
         Window window = Minecraft.getInstance().getWindow();
-        return Minecraft.getInstance().mouseHandler.getScaledYPos(window);
+        double y = Minecraft.getInstance().mouseHandler.ypos();
+        return y * window.getGuiScaledHeight() / window.getScreenHeight();
     }
 
     /**

common/src/main/java/com/mrcrayfish/controllable/mixin/client/ClientRecipeBookMixin.java

@@ -15,7 +15,7 @@ public class ClientRecipeBookMixin
      * feels a lot better. If quick craft option is toggled on or off during runtime, it will
      * automatically group/ungroup the recipes.
      */
-    @ModifyExpressionValue(method = "categorizeAndGroupRecipes", at = @At(value = "INVOKE", target = "Ljava/util/OptionalInt;isEmpty()Z"))
+    @ModifyExpressionValue(method = "categorizeAndGroupRecipes", at = @At(value = "INVOKE", target = "Ljava/lang/String;isEmpty()Z"))
     private static boolean test(boolean original)
     {
         return original || Config.CLIENT.options.quickCraft.get();