Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Isolate Wildfire Female Gender Mod Support

Browse Source 
[no changelog]
This commit is contained in:
Linnea Gräf
2024-10-26 18:37:15 +02:00
parent 4308a09f89
commit 928f6a4501
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -183,6 +183,7 @@ val sodiumSourceSet = createIsolatedSourceSet("sodium")
val citResewnSourceSet = createIsolatedSourceSet("citresewn") val citResewnSourceSet = createIsolatedSourceSet("citresewn")
val yaclSourceSet = createIsolatedSourceSet("yacl") val yaclSourceSet = createIsolatedSourceSet("yacl")
val explosiveEnhancementSourceSet = createIsolatedSourceSet("explosiveEnhancement") val explosiveEnhancementSourceSet = createIsolatedSourceSet("explosiveEnhancement")
val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender")
dependencies { dependencies {
// Minecraft dependencies // Minecraft dependencies
@@ -222,7 +223,7 @@ dependencies {
modCompileOnly(libs.jarvis.api) modCompileOnly(libs.jarvis.api)
include(libs.jarvis.fabric) include(libs.jarvis.fabric)
modCompileOnly(libs.femalegender) (wildfireGenderSourceSet.modImplementationConfigurationName)(libs.femalegender)
(configuredSourceSet.modImplementationConfigurationName)(libs.configured) (configuredSourceSet.modImplementationConfigurationName)(libs.configured)
(sodiumSourceSet.modImplementationConfigurationName)(libs.sodium) (sodiumSourceSet.modImplementationConfigurationName)(libs.sodium)
@@ -239,7 +240,6 @@ dependencies {
nonModImplentation(libs.repoparser) nonModImplentation(libs.repoparser)
shadowMe(libs.repoparser) shadowMe(libs.repoparser)
fun ktor(mod: String) = "io.ktor:ktor-$mod-jvm:${libs.versions.ktor.get()}" 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-core"))!!)
transInclude(nonModImplentation(ktor("client-java"))!!) transInclude(nonModImplentation(ktor("client-java"))!!)
transInclude(nonModImplentation(ktor("serialization-kotlinx-json"))!!) transInclude(nonModImplentation(ktor("serialization-kotlinx-json"))!!)

2
docs/Texture Pack Format.md
View File

@@ -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 `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 /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 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. the hash of the old skin.
## Armor Skull Models ## Armor Skull Models

3
src/main/java/moe/nea/firmament/mixins/custommodels/PatchArmorTexturesInGenderMod.java → src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java
View File

@@ -1,5 +1,4 @@
package moe.nea.firmament.mixins.compat.wildfiregender;
package moe.nea.firmament.mixins.custommodels;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

3
src/main/kotlin/Firmament.kt
View File

@@ -28,6 +28,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.plus import kotlinx.coroutines.plus
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream import kotlinx.serialization.json.decodeFromStream
import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.EmptyCoroutineContext
@@ -59,9 +60,11 @@ object Firmament {
} }
val version: Version by lazy { metadata.version } val version: Version by lazy { metadata.version }
@OptIn(ExperimentalSerializationApi::class)
val json = Json { val json = Json {
prettyPrint = DEBUG prettyPrint = DEBUG
isLenient = true isLenient = true
allowTrailingComma = true
ignoreUnknownKeys = true ignoreUnknownKeys = true
encodeDefaults = true encodeDefaults = true
} }