Working 1.21.9 support

- Reduce min loader version back to 0.15.0
- Fix some whitespace
- Fix `InputUtil_isKeyPressed_1` missing the return type
- Use `Common.IS_SYSTEM_MAC` instead of `Util.getOperatingSystem() `
- Fix some mixins on older versions where the remapping no longer works due to updated mappings
- Use java nio in ModOptions consistently

Author: hamarb123

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/develop
 	minecraft_version=1.21.9
 	yarn_mappings=1.21.9+build.1
-	loader_version=0.17.2
+	loader_version=0.15.0
 	loom_version=1.11-SNAPSHOT
 
 # Mod Properties

settings.gradle

@@ -1,13 +1,13 @@
 pluginManagement
 {
-    repositories
-    {
-        maven
-        {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
+	repositories
+	{
+		maven
+		{
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
 }

src/client/java/com/hamarb123/macos_input_fixes/client/FabricReflectionHelper.java

@@ -731,7 +731,7 @@ public static String NbtCompound_getString_1(NbtCompound instance, String key)
 	 */
 	public static boolean InputUtil_isKeyPressed_1(long handle, int code)
 	{
-		if (_InputUtil_isKeyPressed_1Method == null) _InputUtil_isKeyPressed_1Method = lookupMethod("net.minecraft.class_3675", "method_15987", "(JI)Z", true, false, InputUtil.class, "isKeyPressed", long.class, int.class);
+		if (_InputUtil_isKeyPressed_1Method == null) _InputUtil_isKeyPressed_1Method = lookupMethod("net.minecraft.class_3675", "method_15987", "(JI)Z", true, false, InputUtil.class, "isKeyPressed", boolean.class, long.class, int.class);
 		return (boolean)invokeMethod("isKeyPressed", _InputUtil_isKeyPressed_1Method, handle, code);
 	}
 	private static MethodHandle _InputUtil_isKeyPressed_1Method;

src/client/java/com/hamarb123/macos_input_fixes/client/MacOSInputFixesClientMod.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import net.fabricmc.api.ClientModInitializer;
-import net.minecraft.util.Util;
 
 public class MacOSInputFixesClientMod implements ClientModInitializer
 {
@@ -20,7 +19,7 @@ public void onInitializeClient()
 
 	static
 	{
-		if (Util.getOperatingSystem() == Util.OperatingSystem.OSX)
+		if (Common.IS_SYSTEM_MAC)
 		{
 			try
 			{

src/client/java/com/hamarb123/macos_input_fixes/client/MixinPlugin.java

@@ -125,47 +125,47 @@ public List<String> getMixins()
 
 	private static boolean isClassPresent(String className)
 	{
-        try
+		try
 		{
-            MixinService.getService().getBytecodeProvider().getClassNode(className);
-            return true;
-        }
+			MixinService.getService().getBytecodeProvider().getClassNode(className);
+			return true;
+		}
 		catch (ClassNotFoundException ignored)
 		{
-            // Class isn't present, skip this mixin.
-            return false;
-        }
+			// Class isn't present, skip this mixin.
+			return false;
+		}
 		catch (Exception e)
 		{
-            // Something else went wrong which might be more serious.
-            e.printStackTrace();
-            return false;
-        }
-    }
+			// Something else went wrong which might be more serious.
+			e.printStackTrace();
+			return false;
+		}
+	}
 
 	private static boolean isMethodPresent(String className, String methodName, String descriptor)
 	{
-        try
+		try
 		{
-            ClassNode classNode = MixinService.getService().getBytecodeProvider().getClassNode(className);
+			ClassNode classNode = MixinService.getService().getBytecodeProvider().getClassNode(className);
 			for (MethodNode methodNode : classNode.methods)
 			{
 				if (methodNode.name.equals(methodName) && methodNode.desc.equals(descriptor)) return true;
 			}
-            return false;
-        }
+			return false;
+		}
 		catch (ClassNotFoundException ignored)
 		{
-            // Class isn't present, skip this mixin.
-            return false;
-        }
+			// Class isn't present, skip this mixin.
+			return false;
+		}
 		catch (Exception e)
 		{
-            // Something else went wrong which might be more serious.
-            e.printStackTrace();
-            return false;
-        }
-    }
+			// Something else went wrong which might be more serious.
+			e.printStackTrace();
+			return false;
+		}
+	}
 
 	@Override
 	public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo)

src/client/java/com/hamarb123/macos_input_fixes/client/ModOptions.java

@@ -1,15 +1,14 @@
 package com.hamarb123.macos_input_fixes.client;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.ParameterizedType;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -31,7 +30,6 @@
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.Text;
-import net.minecraft.util.Util;
 
 @Environment(EnvType.CLIENT)
 public class ModOptions
@@ -522,41 +520,41 @@ private static String getStringHelper(NbtCompound instance, String key)
 		}
 	}
 
-	public static File optionsFile;
+	public static Path optionsFile;
 
 	@SuppressWarnings("resource")
 	public static void loadOptions()
 	{
 		//locate options file
-		optionsFile = new File(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString(), "macos_input_fixes.txt");
+		optionsFile = FabricLoader.getInstance().getConfigDir().resolve("macos_input_fixes.txt");
 
 		//check if we need to migrate from the old path
-		if (!optionsFile.exists())
+		if (!Files.exists(optionsFile))
 		{
-			File oldFile = new File(MinecraftClient.getInstance().runDirectory, "options_macos_input_fixes.txt");
-			if (oldFile.exists())
+			Path oldFile = Paths.get(MinecraftClient.getInstance().runDirectory.getAbsolutePath(), "options_macos_input_fixes.txt");
+			if (Files.exists(oldFile))
 			{
-				optionsFile.getParentFile().mkdir();
 				try
 				{
-					Files.copy(oldFile.toPath(), optionsFile.toPath());
+					Files.createDirectories(optionsFile.getParent());
+					Files.copy(oldFile, optionsFile);
+					Files.deleteIfExists(oldFile);
 				}
 				catch (IOException e)
 				{
-					throw new RuntimeException("Failed to migrate old macos input fixes options file from " + oldFile.toPath() + " to " + optionsFile.toPath(), e);
+					throw new RuntimeException("Failed to migrate old macos input fixes options file from " + oldFile + " to " + optionsFile, e);
 				}
-				oldFile.delete();
 			}
 		}
 
 		//load options similarly to how minecraft does
 		try
 		{
-			if (!optionsFile.exists())
+			if (!Files.exists(optionsFile))
 			{
 				return;
 			}
-			List<String> lines = IOUtils.readLines(new FileInputStream(optionsFile), StandardCharsets.UTF_8); //split by lines
+			List<String> lines = IOUtils.readLines(Files.newInputStream(optionsFile), StandardCharsets.UTF_8); //split by lines
 			NbtCompound compoundTag = new NbtCompound();
 			for (String line : lines) //read the lines into a tag
 			{
@@ -666,7 +664,7 @@ public static void loadOptions()
 	public static void saveOptions()
 	{
 		//write the options to the file in a similar way to minecraft
-		try (PrintWriter printWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(optionsFile), StandardCharsets.UTF_8)))
+		try (PrintWriter printWriter = new PrintWriter(new OutputStreamWriter(Files.newOutputStream(optionsFile), StandardCharsets.UTF_8)))
 		{
 			printWriter.println("trackpadSensitivity:" + trackpadSensitivity);
 			printWriter.println("reverseHotbarScrolling:" + reverseHotbarScrolling);
@@ -690,7 +688,7 @@ public static void saveOptions()
 	public static void setTrackpadSensitivity(double value)
 	{
 		trackpadSensitivity = value;
-		if (Util.getOperatingSystem() != Util.OperatingSystem.OSX) return;
+		if (!Common.IS_SYSTEM_MAC) return;
 
 		//set the value in the native library also, ensure the value is clamped here
 		if (value < 0) value = 0.0;
@@ -714,7 +712,7 @@ public static void setTrackpadSensitivity(double value)
 	public static void setMomentumScrolling(boolean value)
 	{
 		momentumScrolling = value;
-		if (Util.getOperatingSystem() != Util.OperatingSystem.OSX) return;
+		if (!Common.IS_SYSTEM_MAC) return;
 
 		//set the value in the native library also
 		MacOSInputFixesClientMod.setMomentumScrolling(value);
@@ -726,7 +724,7 @@ public static void setMomentumScrolling(boolean value)
 	public static void setInterfaceSmoothScroll(boolean value)
 	{
 		interfaceSmoothScroll = value;
-		if (Util.getOperatingSystem() != Util.OperatingSystem.OSX) return;
+		if (!Common.IS_SYSTEM_MAC) return;
 
 		//set the value in the native library also
 		MacOSInputFixesClientMod.setInterfaceSmoothScroll(value);

src/client/java/com/hamarb123/macos_input_fixes/client/mixin/HandledScreenMixin13.java

@@ -14,12 +14,12 @@
 public class HandledScreenMixin13
 {
 	@ModifyExpressionValue(method = "keyPressed(Lnet/minecraft/client/input/KeyInput;)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/KeyInput;hasCtrl()Z"))
-    private boolean keyPressedHasCtrlAdjustment(boolean result, @Local(argsOnly = true) KeyInput input)
+	private boolean keyPressedHasCtrlAdjustment(boolean result, @Local(argsOnly = true) KeyInput input)
 	{
 		if (!result && Common.IS_SYSTEM_MAC)
 		{
 			result = (((AbstractInput)Common.asObject(input)).modifiers() & 2) != 0;
 		}
 		return result;
-    }
+	}
 }

src/client/java/com/hamarb123/macos_input_fixes/client/mixin/KeyboardMixin12.java

@@ -13,7 +13,8 @@
 @Mixin(Keyboard.class)
 public class KeyboardMixin12
 {
-	@Inject(at = @At("HEAD"), method = "onKey(JIIII)V", cancellable = true)
+	//@Inject(at = @At("HEAD"), method = "onKey(JIIII)V", cancellable = true)
+	@Inject(at = @At("HEAD"), method = "method_1466(JIIII)V", cancellable = true, remap = false)
 	public void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo info)
 	{
 		if (Common.IS_SYSTEM_MAC)

src/client/java/com/hamarb123/macos_input_fixes/client/mixin/PlayerInventoryMixin10.java

@@ -11,7 +11,8 @@
 @Mixin(PlayerInventory.class)
 public class PlayerInventoryMixin10
 {
-	@ModifyVariable(method = "scrollInHotbar(D)V", at = @At("HEAD"), ordinal = 0)
+	//@ModifyVariable(method = "scrollInHotbar(D)V", at = @At("HEAD"), ordinal = 0)
+	@ModifyVariable(method = "method_7373(D)V", at = @At("HEAD"), ordinal = 0)
 	private double fixHotbarScrollDirection(double d)
 	{
 		//if the reverse hotbar scrolling option is enabled, reverse the scroll value

src/client/java/com/hamarb123/macos_input_fixes/client/mixin/gui/MouseOptionsScreenMixin5.java

@@ -16,7 +16,7 @@
 @Mixin(MouseOptionsScreen.class)
 public abstract class MouseOptionsScreenMixin5
 {
-    @Shadow
+	@Shadow(aliases = "field_19246", remap = false)
 	private OptionListWidget buttonList;
 
 	@Inject(method = "method_25394(Lnet/minecraft/class_4587;IIF)V", at = @At("RETURN"), cancellable = true, remap = false)