attempt to fix forge (i hate mixins)

not-coded · Nov 2, 2024 · 9fd4c88 · 9fd4c88
1 parent a3c8526
commit 9fd4c88
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 14 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `kotlin-dsl`
-    kotlin("jvm") version "2.0.20"
+    kotlin("jvm") version "1.9.24"
 }
 
 repositories {

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -64,6 +64,11 @@ loom {
         }
     }
 
+    forge.mixinConfigs(
+        "wayfix-forge.mixins.json",
+        "wayfix-common.mixins.json"
+    )
+
     runConfigs.all {
         isIdeConfigGenerated = true
         runDir = "../../../run"
@@ -90,7 +95,7 @@ tasks.processResources {
 tasks.shadowJar {
     configurations = listOf(shadowBundle)
     archiveClassifier = "dev-shadow"
-    exclude("fabric.mod.json")
+    exclude("fabric.mod.json", "assets/wayfix/icon.png")
 }
 
 tasks.remapJar {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -9,7 +9,7 @@ version = "${version}"
 displayName = "WayFix"
 authors = "NotCoded"
 description = "Fixes multiple issues regarding Wayland compatibility for Minecraft."
-logoFile = "assets/wayfix/icon.png"
+logoFile = "icon.png"
 logoBlur = false
 
 [["dependencies.wayfix"]]

diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.caching.debug=false

diff --git a/neoforge/src/main/resources/icon.png b/neoforge/src/main/resources/icon.png
diff --git a/src/main/java/net/notcoded/wayfix/common/mixin/MinecraftClientMixin.java b/src/main/java/net/notcoded/wayfix/common/mixin/MinecraftClientMixin.java
@@ -14,10 +14,12 @@
 
 @Mixin(MinecraftClient.class)
 public abstract class MinecraftClientMixin {
+    // broken in forge
     @Shadow @Final private Window window;
 
     @Shadow @Final public GameOptions options;
 
+    // broken in forge
     @Shadow public abstract boolean forcesUnicodeFont();
 
     @ModifyArg(method = "onResolutionChanged", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;setScaleFactor(D)V"))
@@ -29,14 +31,19 @@ private double fixHiDPIScaling(double d) {
         /*guiScale = this.options.guiScale;
         *///?}
 
+
         // "Auto" or Gui Scale 0 already auto-scales it
-        return guiScale != 0 && WayFix.config.autoScaleGUI ? window.calculateScaleFactor(Math.round(guiScale * getScaleFactor()), this.forcesUnicodeFont()) : d;
+
+        // this.forcesUnicodeFont() doesn't work on forge & neoforge
+        // TODO: this.options.getForceUnicodeFont().getValue();
+
+        return guiScale != 0 && WayFix.config.autoScaleGUI ? window.calculateScaleFactor(Math.round(guiScale * wayFix$getScaleFactor()), this.forcesUnicodeFont()) : d;
     }
 
     @Unique
-    private float getScaleFactor() {
+    private float wayFix$getScaleFactor() {
         float[] pos = new float[1];
-        GLFW.glfwGetWindowContentScale(this.window.getHandle(), pos, pos);
+         GLFW.glfwGetWindowContentScale(this.window.getHandle(), pos, pos);
 
         return pos[0]; // using x or y doesn't matter
     }

diff --git a/src/main/java/net/notcoded/wayfix/common/mixin/MonitorTrackerMixin.java b/src/main/java/net/notcoded/wayfix/common/mixin/MonitorTrackerMixin.java
@@ -21,11 +21,11 @@ public class MonitorTrackerMixin {
 
     @Inject(method = {"handleMonitorEvent", "<init>"}, at = @At("TAIL"))
     private void handleConfigAdditions(CallbackInfo ci) {
-        this.refreshMonitors();
+        this.wayFix$refreshMonitors();
     }
 
     @Unique
-    private void refreshMonitors() {
+    private void wayFix$refreshMonitors() {
         ArrayList<Monitor> monitors = new ArrayList<>();
         this.pointerToMonitorMap.forEach((aLong, monitor1) -> monitors.add(monitor1));
 

diff --git a/src/main/java/net/notcoded/wayfix/common/mixin/TextFieldWidgetMixin.java b/src/main/java/net/notcoded/wayfix/common/mixin/TextFieldWidgetMixin.java
@@ -18,11 +18,11 @@
 public class TextFieldWidgetMixin {
     @Inject(method = "charTyped", at = @At("HEAD"), cancellable = true)
     private void charTyped(char chr, int modifiers, CallbackInfoReturnable<Boolean> cir) {
-        if (WayFix.config.keyModifiersFix && WayFix.isWayland() && isSpecialChar(chr) && Screen.hasControlDown()) cir.setReturnValue(false);
+        if (WayFix.config.keyModifiersFix && WayFix.isWayland() && wayFix$isSpecialChar(chr) && Screen.hasControlDown()) cir.setReturnValue(false);
     }
 
     @Unique
-    private boolean isSpecialChar(char chr) {
+    private boolean wayFix$isSpecialChar(char chr) {
         return chr == 'a' // CTRL + A (select all)
                 || chr == 'v' // CTRL + V (paste)
                 || chr == 'c' // CTRL + C (copy)

diff --git a/src/main/java/net/notcoded/wayfix/common/mixin/WindowMixin.java b/src/main/java/net/notcoded/wayfix/common/mixin/WindowMixin.java
@@ -1,7 +1,5 @@
 package net.notcoded.wayfix.common.mixin;
 
-import net.minecraft.client.WindowEventHandler;
-import net.minecraft.client.WindowSettings;
 import net.minecraft.client.util.Monitor;
 import net.minecraft.client.util.MonitorTracker;
 import net.minecraft.client.util.Window;
@@ -41,7 +39,7 @@
 @Mixin(Window.class)
 public class WindowMixin {
     @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwDefaultWindowHints()V", shift = At.Shift.AFTER, remap = false))
-    private void onWindowHints(WindowEventHandler windowEventHandler, MonitorTracker monitorTracker, WindowSettings windowSettings, String string, String string2, CallbackInfo ci) {
+    private void onWindowHints(CallbackInfo ci) {
         if (isWayland()) {
             GLFW.glfwWindowHint(GLFW.GLFW_FOCUS_ON_SHOW, GLFW.GLFW_FALSE);