Fix an issue with config loading & compiling

spartacus04 · Jan 17, 2024 · 296bad0 · 296bad0
1 parent ab97ab1
commit 296bad0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -86,7 +86,10 @@ tasks {
         exclude("ScopeJVMKt.class")
         exclude("DebugProbesKt.bin")
 
-        minimize()
+
+        minimize{
+            exclude(dependency("xyz.xenondevs.invui:.*:.*"))
+        }
     }
 }
 
@@ -105,9 +108,9 @@ tasks.register<ProGuardTask>("proguardJar") {
 
     injars(tasks.shadowJar.flatMap { it.archiveFile })
 
-    outjars("build/libs/${rootProject.name}_${project.version}.jar")
-
     configuration("proguard-rules.pro")
+
+    outjars("build/libs/${rootProject.name}_${project.version}.jar")
 }
 
 tasks.processResources {

diff --git a/proguard-rules.pro b/proguard-rules.pro
@@ -50,8 +50,9 @@
 -keep class * implements com.google.gson.TypeAdapterFactory
 -keep class * implements com.google.gson.JsonSerializer
 -keep class * implements com.google.gson.JsonDeserializer
--keepclassmembers,allowobfuscation class * {
+-keepclassmembers class * {
   @com.google.gson.annotations.SerializedName <fields>;
 }
+-keepattributes *Annotation*,EventHandler
 -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
 -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
diff --git a/src/main/java/me/spartacus04/jext/config/ConfigFactory.kt b/src/main/java/me/spartacus04/jext/config/ConfigFactory.kt
@@ -180,6 +180,7 @@ object ConfigFactory {
         if(PLUGIN.dataFolder.resolve("config.json").exists()) {
             updateOldConfig()
         }
+
         return FileBind.create(Config::class.java)
     }
 }
diff --git a/src/main/java/me/spartacus04/jext/gui/GuiBuilder.kt b/src/main/java/me/spartacus04/jext/gui/GuiBuilder.kt
@@ -81,7 +81,5 @@ class GuiBuilder {
                 .addIngredient('#', border)
                 .setContent(listOf(inventory))
         }
-
-
     }
 }
diff --git a/src/main/java/me/spartacus04/jext/utils/FileBind.kt b/src/main/java/me/spartacus04/jext/utils/FileBind.kt
@@ -30,7 +30,13 @@ open class FileBind(@Transient private val filePath: String, @Transient private
             }
         }
 
-        gson.fromJson(file.readText(), typeToken)
+        val obj = gson.fromJson(file.readText(), typeToken)
+
+        obj.javaClass.declaredFields.forEach { field ->
+            field.isAccessible = true
+
+            field.set(this, field.get(obj))
+        }
     }
 
     fun save() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,5 @@ class GuiBuilder { @@
                     .addIngredient('#', border)
                     .setContent(listOf(inventory))
             }
         }
     }