merg

Nolij · Apr 30, 2024 · de915a4 · de915a4
1 parent 3c8faec
commit de915a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/buildSrc/src/main/kotlin/dev/nolij/zumegradle/JarCompressing.kt b/buildSrc/src/main/kotlin/dev/nolij/zumegradle/JarCompressing.kt
@@ -39,8 +39,8 @@ enum class ClassShrinkingType {
 	STRIP_ALL,
 	;
 
-	fun shouldStripLVTs() = this.ordinal % 2 == 1
-	fun shouldStripSourceFiles() = this.ordinal >= 2
+	fun shouldStripLVTs() = this == STRIP_LVTS || this == STRIP_ALL
+	fun shouldStripSourceFiles() = this == STRIP_SOURCE_FILES || this == STRIP_ALL
 	fun shouldRun() = this != STRIP_NONE
 }
 

diff --git a/proguard.pro b/proguard.pro
@@ -14,19 +14,24 @@
 -keep,allowoptimization class dev.nolij.zume.ZumeMixinPlugin # dont rename mixin plugin
 -keep class dev.nolij.zume.mixin.** { *; } # dont touch mixins
 
--keep,allowobfuscation,allowoptimization @*.*.fml.common.Mod class dev.nolij.zume.** { # Forge entrypoints
+-keep,allowobfuscation @*.*.fml.common.Mod class dev.nolij.zume.** { # Forge entrypoints
 	public <init>(...);
+}
+-keep,allowobfuscation class dev.nolij.zume.** implements dev.nolij.zume.api.platform.v0.IZumeImplementation { # Platform implementations
 	@*.*.fml.common.Mod$EventHandler <methods>;
 	@*.*.fml.common.eventhandler.SubscribeEvent <methods>;
 }
--keep,allowoptimization class dev.nolij.zume.** implements *.*.fml.client.IModGuiFactory # Legacy Forge config providers
 
--keepclassmembers,allowoptimization class dev.nolij.zume.** { # screens
-	public void render(int,int,float);
-	public void tick();
-	public void init();
+-keepclassmembers class dev.nolij.zume.** { # screens
+	void render(int,int,float);
+	void tick();
+	void init();
+}
+-keep,allowoptimization class dev.nolij.zume.** implements *.*.fml.client.IModGuiFactory # Legacy Forge config providers
+-keep,allowoptimization class dev.nolij.zume.** extends *.*.fml.client.config.GuiConfig { *; } # Legacy Forge config providers
+-keepclassmembers,allowoptimization class dev.nolij.zume.** extends net.minecraft.client.gui.screens.Screen {
+	public *; 
 }
--keepclassmembers,allowoptimization class dev.nolij.zume.** extends net.minecraft.client.gui.screens.Screen { public *; }
 
 -keep,allowoptimization class io.github.prospector.modmenu.** { *; } # ugly classloader hack