fix a bunch of stuff

slightly increases jar size but at least it's correct now
Nolij · Jun 10, 2024 · 3035160 · 3035160
1 parent 63bc07d
commit 3035160
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/buildSrc/src/main/kotlin/dev/nolij/zumegradle/JarCompressing.kt b/buildSrc/src/main/kotlin/dev/nolij/zumegradle/JarCompressing.kt
@@ -209,9 +209,10 @@ fun applyProguard(jar: File, minecraftConfigs: List<MinecraftConfig>, configDir:
 	}
 
 	val debug = Properties().apply {
-		val gradleproperties = configDir.resolve("gradle.properties")
-		if (gradleproperties.exists()) {
-			load(gradleproperties.inputStream())
+		configDir.resolve("gradle.properties").also {
+			if (it.exists()) {
+				load(it.inputStream())
+			}
 		}
 	}.getProperty("zumegradle.proguard.keepAttrs").toBoolean()
 

diff --git a/lexforge/src/main/java/dev/nolij/zume/lexforge/LexZume.java b/lexforge/src/main/java/dev/nolij/zume/lexforge/LexZume.java
@@ -90,8 +90,8 @@ private void calculateFOV(ViewportEvent.ComputeFov event) {
 	);
 
 	private void onMouseScroll(InputEvent.MouseScrollingEvent event) {
-        final int scrollAmount = (int) (double) GET_SCROLL_DELTA.invokeExact(event);
-        if (Zume.mouseScrollHook(scrollAmount)) {
+		//noinspection DataFlowIssue
+		if (Zume.mouseScrollHook((int) (double) GET_SCROLL_DELTA.invokeExact(event))) {
 			event.setCanceled(true);
 		}
 	}

diff --git a/modern/src/main/java/dev/nolij/zume/modern/integration/modmenu/ZumeModMenuIntegration.java b/modern/src/main/java/dev/nolij/zume/modern/integration/modmenu/ZumeModMenuIntegration.java
@@ -3,6 +3,7 @@
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import dev.nolij.zume.api.util.v1.MethodHandleHelper;
 import dev.nolij.zume.impl.Zume;
+import dev.nolij.zumegradle.proguard.ProGuardKeep;
 import io.github.prospector.modmenu.api.ModMenuApi;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -13,6 +14,7 @@
 
 import static dev.nolij.zume.impl.ZumeConstants.MOD_ID;
 
+@ProGuardKeep.WithObfuscation
 public class ZumeModMenuIntegration implements ModMenuApi {
 
 	private static final MethodHandle LITERALTEXT_INIT = MethodHandleHelper.PUBLIC.getConstructorOrNull(

diff --git a/proguard/1.pro b/proguard/1.pro
@@ -34,9 +34,4 @@
 }
 -keepclassmembers,allowoptimization class dev.nolij.zume.** extends *.*.fml.client.config.GuiConfig {
 	public <methods>;
-}
-
-# Fabric entrypoints
--keep,allowoptimization,allowobfuscation class dev.nolij.zume.FabricZumeBootstrapper
--keep,allowoptimization,allowobfuscation class dev.nolij.zume.modern.integration.modmenu.ZumeModMenuIntegration
--keep,allowoptimization,allowobfuscation class dev.nolij.zume.primitive.event.KeyBindingRegistrar { public *; }
+}
diff --git a/proguard/common.pro b/proguard/common.pro
@@ -10,5 +10,9 @@
 -keepattributes Runtime*Annotations # keep annotations
 -adaptclassstrings
 -adaptresourcefilecontents fabric.mod.json
+
 -keep @dev.nolij.zumegradle.proguard.ProGuardKeep class * { *; }
--keepclassmembers class * { @dev.nolij.zumegradle.proguard.ProGuardKeep *; }
+-keepclassmembers class * { @dev.nolij.zumegradle.proguard.ProGuardKeep *; }
+
+-keep,allowoptimization,allowobfuscation @dev.nolij.zumegradle.proguard.ProGuardKeep$WithObfuscation class * { *; }
+-keepclassmembers,allowoptimization,allowobfuscation class * { @dev.nolij.zumegradle.proguard.ProGuardKeep$WithObfuscation *; }
diff --git a/src/main/java/dev/nolij/zume/FabricZumeBootstrapper.java b/src/main/java/dev/nolij/zume/FabricZumeBootstrapper.java
@@ -1,11 +1,13 @@
 package dev.nolij.zume;
 
 import dev.nolij.zume.impl.Zume;
+import dev.nolij.zumegradle.proguard.ProGuardKeep;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 import net.fabricmc.loader.impl.gui.FabricGuiEntry;
 import net.fabricmc.loader.impl.gui.FabricStatusTree;
 
+@ProGuardKeep.WithObfuscation
 public class FabricZumeBootstrapper implements ClientModInitializer, PreLaunchEntrypoint {
 
 	private static final String MISSING_DEPENDENCY_MESSAGE = """