fix setValue of finalizeOnRead being implemented wrong

unimined · Dec 1, 2023 · 28a01ca · 28a01ca
1 parent bbd593a
commit 28a01ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ unified minecraft modding environment with support for legacy environments.
 * Bukkit Derrivitives (at least paper)
 * LiteLoader
 * Sponge
+* NilLoader
 
 ## Custom Loaders
 yes, this is possible, see [PrcraftExampleMod](https://github.com/prcraft-minecraft/PrcraftExampleMod) and it's buildsrc dir.

diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/util/FinalizeOnRead.kt b/src/api/kotlin/xyz/wagyourtail/unimined/util/FinalizeOnRead.kt
@@ -24,14 +24,12 @@ class FinalizeOnRead<T>(value: T) : ReadWriteProperty<Any?, T> {
         if (finalized) {
             throw IllegalStateException("Cannot set finalized property")
         }
-        setValueIntl(value)
-    }
-
-    fun setValueIntl(value: T) {
-        if (finalized) {
-            throw IllegalStateException("Cannot set finalized property")
+        finalized = true
+        if (value is ReadWriteProperty<*, *>) {
+            (value as ReadWriteProperty<Any?, T>).setValue(thisRef, property, value)
+        } else {
+            this.value = value
         }
-        this.value = value
     }
 
     fun setValueIntl(value: ReadWriteProperty<Any?, T>) {

diff --git a/...yz/wagyourtail/unimined/internal/minecraft/patch/fabric/FabricLikeMinecraftTransformer.kt b/...yz/wagyourtail/unimined/internal/minecraft/patch/fabric/FabricLikeMinecraftTransformer.kt
@@ -304,6 +304,7 @@ abstract class FabricLikeMinecraftTransformer(
                             innerjson.addProperty("name", dep.name)
                             val custom = JsonObject()
                             custom.addProperty("fabric-loom:generated", true)
+                            custom.addProperty("unimined:generated", true)
                             innerjson.add("custom", custom)
                             Files.write(
                                 innermod,