Isolate Wildfire Female Gender Mod Support

[no changelog]

4 files changed, 7 insertions, 5 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index cca7fda..31952d6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -183,6 +183,7 @@ val sodiumSourceSet = createIsolatedSourceSet("sodium")
 val citResewnSourceSet = createIsolatedSourceSet("citresewn")
 val yaclSourceSet = createIsolatedSourceSet("yacl")
 val explosiveEnhancementSourceSet = createIsolatedSourceSet("explosiveEnhancement")
+val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender")
 
 dependencies {
 	// Minecraft dependencies
@@ -222,7 +223,7 @@ dependencies {
 	modCompileOnly(libs.jarvis.api)
 	include(libs.jarvis.fabric)
 
-	modCompileOnly(libs.femalegender)
+	(wildfireGenderSourceSet.modImplementationConfigurationName)(libs.femalegender)
 	(configuredSourceSet.modImplementationConfigurationName)(libs.configured)
 	(sodiumSourceSet.modImplementationConfigurationName)(libs.sodium)
 
@@ -239,7 +240,6 @@ dependencies {
 	nonModImplentation(libs.repoparser)
 	shadowMe(libs.repoparser)
 	fun ktor(mod: String) = "io.ktor:ktor-$mod-jvm:${libs.versions.ktor.get()}"
-	modCompileOnly(libs.citresewn)
 	transInclude(nonModImplentation(ktor("client-core"))!!)
 	transInclude(nonModImplentation(ktor("client-java"))!!)
 	transInclude(nonModImplentation(ktor("serialization-kotlinx-json"))!!)
diff --git a/docs/Texture Pack Format.md b/docs/Texture Pack Format.md
index 9d61ce0..23dd7a1 100644
--- a/docs/Texture Pack Format.md
+++ b/docs/Texture Pack Format.md
@@ -21,7 +21,7 @@ Find the texture id of a skull. This is the hash part of an url like
 `https://textures.minecraft.net/texture/bc8ea1f51f253ff5142ca11ae45193a4ad8c3ab5e9c6eec8ba7a4fcb7bac40` (so after the
 /texture/). You can find it in game for placed skulls using the keybinding in the Power User Config. Then place the
 replacement texture at `firmskyblock:textures/placedskulls/<thathash>.png`. Keep in mind that you will probably replace
-the texture with another skin texture, meaning that skin texture has it's own hash. Do not mix those up, you need to use
+the texture with another skin texture, meaning that skin texture has its own hash. Do not mix those up, you need to use
 the hash of the old skin.
 
 ## Armor Skull Models
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
 	}