aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java (renamed from src/main/java/moe/nea/firmament/mixins/custommodels/PatchArmorTexturesInGenderMod.java)3
-rw-r--r--src/main/kotlin/Firmament.kt3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/custommodels/PatchArmorTexturesInGenderMod.java b/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java
index 68b07c1..723af59 100644
--- a/src/main/java/moe/nea/firmament/mixins/custommodels/PatchArmorTexturesInGenderMod.java
+++ b/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java
@@ -1,5 +1,4 @@
-
-package moe.nea.firmament.mixins.custommodels;
+package moe.nea.firmament.mixins.compat.wildfiregender;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/kotlin/Firmament.kt b/src/main/kotlin/Firmament.kt
index d8a309b..e0541f1 100644
--- a/src/main/kotlin/Firmament.kt
+++ b/src/main/kotlin/Firmament.kt
@@ -28,6 +28,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.plus
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream
import kotlin.coroutines.EmptyCoroutineContext
@@ -59,9 +60,11 @@ object Firmament {
}
val version: Version by lazy { metadata.version }
+ @OptIn(ExperimentalSerializationApi::class)
val json = Json {
prettyPrint = DEBUG
isLenient = true
+ allowTrailingComma = true
ignoreUnknownKeys = true
encodeDefaults = true
}