Merge branch 'Nolij:dev' into dev

CHANGELOG.md

@@ -1 +1,2 @@
-- made jar smaller (thanks @rdh)
+- made jar smaller (thanks @rdh)
+- fixed zoom scrolling on LexForge 20.2+

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=false
 
-mod_version = 0.13.1-dev.1
+mod_version = 0.13.1-dev.2
 maven_group = dev.nolij
 archives_base_name = zume
 mod_name = Zume

lexforge/src/main/java/dev/nolij/zume/lexforge/LexZume.java

@@ -20,6 +20,9 @@
 import net.minecraftforge.fml.loading.FMLPaths;
 
 import java.io.File;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
 
 @Mod(Zume.MOD_ID)
 @OnlyIn(Dist.CLIENT)
@@ -85,9 +88,36 @@ private void calculateFOV(ViewportEvent.ComputeFov event) {
 		}
 	}
 
+	private static final MethodHandle getScrollDelta;
+
+	static {
+		final MethodHandles.Lookup lookup = MethodHandles.lookup();
+		Method method;
+        try {
+            method = InputEvent.MouseScrollingEvent.class.getMethod("getScrollDelta");
+        } catch (NoSuchMethodException ignored) {
+            try {
+	            //noinspection JavaReflectionMemberAccess
+	            method = InputEvent.MouseScrollingEvent.class.getMethod("getDeltaY");
+            } catch (NoSuchMethodException e) {
+                throw new AssertionError(e);
+            }
+        }
+        try {
+            getScrollDelta = lookup.unreflect(method);
+        } catch (IllegalAccessException e) {
+            throw new AssertionError(e);
+        }
+    }
+
 	private void onMouseScroll(InputEvent.MouseScrollingEvent event) {
-		final int scrollAmount = (int) event.getScrollDelta();
-		if (scrollAmount != 0 &&
+        final int scrollAmount;
+        try {
+            scrollAmount = (int) (double) getScrollDelta.invokeExact(event);
+        } catch (Throwable e) {
+            throw new AssertionError(e);
+        }
+        if (scrollAmount != 0 &&
 			Zume.interceptScroll(scrollAmount)) {
 			event.setCanceled(true);
 		}

modern/src/main/java/dev/nolij/zume/modern/integration/ZumeModMenuIntegration.java

@@ -60,7 +60,7 @@ public String getModId() {
 	public Function<Screen, ? extends Screen> getConfigScreenFactory() {
 		return (parent) -> {
             try {
-                return new ModernZumeConfigScreen((Text) LITERALTEXT_INIT.invoke(""), parent, true);
+                return new ModernZumeConfigScreen((Text) LITERALTEXT_INIT.invokeExact(""), parent, true);
             } catch (Throwable e) {
 				Zume.LOGGER.error("Error opening config screen: ", e);
 				return null;