Fix some bugs

CHANGELOG.md

@@ -1,4 +1,4 @@
-# v2.5.0.70
+# v2.5.0.71
 - Removed mouseScrolled Override in mixins
 - Added spectator mode in gamemode switcher
 - Gamemodes & Weather are now translatable: [#47](https://github.com/shedaniel/RoughlyEnoughItems/issues/47)

gradle.properties

@@ -1,4 +1,4 @@
-mod_version=2.5.0.70
+mod_version=2.5.0.71
 minecraft_version=19w12a
 yarn_version=19w12a.2
 fabric_version=0.2.4.113

src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java

@@ -102,13 +102,13 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer, ModInitiali
             System.exit(0);
         }
         
-        if (!FabricLoader.getInstance().isModLoaded("modmenu")) {
+        if (FabricLoader.getInstance().isModLoaded("modmenu")) {
             try {
-                Class<?> modMenuApi_ = Class.forName("io.github.prospector.modmenu.api.ModMenuApi");
-                Method addConfigOverride_ = modMenuApi_.getMethod("addConfigOverride", String.class, Runnable.class);
-                addConfigOverride_.invoke(null, "roughlyenoughitems", (Runnable) () -> getConfigManager().openConfigScreen(MinecraftClient.getInstance().currentScreen));
+                Class<?> clazz = Class.forName("io.github.prospector.modmenu.api.ModMenuApi");
+                Method method = clazz.getMethod("addConfigOverride", String.class, Runnable.class);
+                method.invoke(null, "roughlyenoughitems", (Runnable) () -> getConfigManager().openConfigScreen(MinecraftClient.getInstance().currentScreen));
             } catch (Exception e) {
-                RoughlyEnoughItemsCore.LOGGER.error("Error enabling the Mod Menu config button for Hwyla", e);
+                RoughlyEnoughItemsCore.LOGGER.error("[REI] Failed to add config override for ModMenu!", e);
             }
         }
     }

src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java

@@ -54,7 +54,7 @@ public class MixinContainerScreen extends Screen implements ContainerScreenHooks
         return focusedSlot;
     }
     
-    @Inject(method = "keyPressed(III)Z", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "keyPressed(III)Z", at = @At("HEAD"), cancellable = true, remap = false)
     public void keyPressed(int int_1, int int_2, int int_3, CallbackInfoReturnable<Boolean> ci) {
         if (MinecraftClient.getInstance().currentScreen instanceof CreativePlayerInventoryScreen) {
             TabGetter tabGetter = (TabGetter) MinecraftClient.getInstance().currentScreen;

src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java

@@ -30,7 +30,7 @@ public abstract class MixinCraftingTableScreen extends ContainerScreen {
         return super.getFocused();
     }
     
-    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true, remap = false)
     public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> ci) {
         if (recipeBookGui.mouseClicked(mouseX, mouseY, button)) {
             focusOn(recipeBookGui);

src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java

@@ -28,7 +28,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
     @Shadow
     protected abstract boolean doRenderScrollBar();
     
-    @Inject(method = "mouseScrolled", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "mouseScrolled", at = @At("HEAD"), cancellable = true, remap = false)
     public void mouseScrolled(double i, double j, double amount, CallbackInfoReturnable<Boolean> ci) {
         if (!doRenderScrollBar() && selectedTab == ItemGroup.INVENTORY.getIndex())
             if (ScreenHelper.isOverlayVisible() && ScreenHelper.getLastOverlay().getRectangle().contains(ClientUtils.getMouseLocation()) && ScreenHelper.getLastOverlay().mouseScrolled(i, j, amount)) {
@@ -37,7 +37,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
             }
     }
     
-    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true, remap = false)
     public void keyPressed(int int_1, int int_2, int int_3, CallbackInfoReturnable<Boolean> ci) {
         if (selectedTab == ItemGroup.INVENTORY.getIndex())
             if (ScreenHelper.getLastOverlay().keyPressed(int_1, int_2, int_3)) {
@@ -46,7 +46,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
             }
     }
     
-    @Inject(method = "charTyped", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "charTyped", at = @At("HEAD"), cancellable = true, remap = false)
     public void charTyped(char char_1, int int_1, CallbackInfoReturnable<Boolean> ci) {
         if (!this.field_2888 && selectedTab == ItemGroup.INVENTORY.getIndex())
             if (ScreenHelper.isOverlayVisible() && ScreenHelper.getLastOverlay().charTyped(char_1, int_1)) {
@@ -55,7 +55,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
             }
     }
     
-    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true, remap = false)
     public void mouseClicked(double i, double j, int k, CallbackInfoReturnable<Boolean> ci) {
         if (selectedTab == ItemGroup.INVENTORY.getIndex())
             if (ScreenHelper.isOverlayVisible() && ScreenHelper.getLastOverlay().mouseClicked(i, j, k)) {

src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java

@@ -31,7 +31,7 @@ public abstract class MixinPlayerInventoryScreen extends AbstractPlayerInventory
         return super.getFocused();
     }
     
-    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true, remap = false)
     public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> ci) {
         if (recipeBook.mouseClicked(mouseX, mouseY, button)) {
             focusOn(recipeBook);