Merge branch '1.20.4' into 1.20.2

# Conflicts:
#	gradle.properties
#	src/main/resources/fabric.mod.json

CHANGELOG.md

@@ -1,3 +1,3 @@
-- Fixed compatibility with Wildfire's Female Gender Mod (Thanks @celestialfault)
-- Removed CICADA as an included jar, it must now be downloaded separately.
-  - This allows me to update it separately from any dependent mods, hopefully providing a more stable experience.
+- Added an option to make Elytras reappear while flying. (Thanks @EminGT)
+- Fixed button tooltips not appearing at all.
+- Added Mexican Spanish translations (Thanks @TheLegendofSaram)

build.gradle

@@ -1,7 +1,8 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 	id "me.modmuss50.mod-publish-plugin" version "0.4.4"
+	id 'me.fallenbreath.yamlang' version '1.3.1'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -33,23 +34,23 @@ repositories {
 
 dependencies {
 	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	minecraft "com.mojang:minecraft:${property("deps.minecraft")}"
+	mappings "net.fabricmc:yarn:${property("deps.yarn")}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${property("deps.fabricloader")}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${property("deps.fabric-api")}"
 
-	modImplementation("nl.enjarai:cicada-lib:${project.cicada_version}") {
+	modImplementation("nl.enjarai:cicada-lib:${property("deps.cicada")}") {
 		exclude group: "net.fabricmc.fabric-api"
 	}
 
 	// Mod Menu integration.
-	modImplementation "com.terraformersmc:modmenu:${modmenu_version}"
+	modImplementation "com.terraformersmc:modmenu:${property("deps.modmenu")}"
 
 	// Cardinal Components for shrimple™ server syncing.
-	include modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}")
-	include modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cardinal_components_version}")
+	include modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${property("deps.cardinal-components-api")}")
+	include modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${property("deps.cardinal-components-api")}")
 
 	// Make it easier to test skin compat.
 //	modImplementation 'com.ptsmods:devlogin:2.1'
@@ -63,7 +64,7 @@ processResources {
 	}
 }
 
-version = "$version+$minecraft_version"
+version = "$version+${property("deps.minecraft")}"
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
@@ -83,6 +84,11 @@ jar {
 	}
 }
 
+yamlang {
+	targetSourceSets = [sourceSets.main]
+	inputDir = "assets/showmeyourskin/lang"
+}
+
 // configure the maven publication
 publishing {
 	publications {
@@ -106,7 +112,7 @@ loom {
 
 publishMods {
 	file = remapJar.archiveFile
-	displayName = "${property('mod_version')} for ${property('minecraft_version')}"
+	displayName = "${property('mod_version')} for ${property('deps.minecraft')}"
 	version = project.version
 	changelog = getRootProject().file("CHANGELOG.md").text
 	type = STABLE

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.15.2
+deps.minecraft=1.20.2
+deps.yarn=1.20.2+build.4
+deps.fabricloader=0.15.10
 
 # Mod Properties
-mod_version = 1.9.0
+mod_version = 1.11.0
 maven_group = nl.enjarai
 archives_base_name = show-me-your-skin
 
@@ -20,9 +20,9 @@ mod_github=enjarai/show-me-your-skin
 git_branch=1.20.2
 
 # Dependencies
-fabric_version=0.90.0+1.20.2
+deps.fabric-api=0.91.6+1.20.2
 # https://modrinth.com/mod/modmenu/versions
-modmenu_version=8.0.0
-cicada_version=0.6.2+1.20.2-and-above
+deps.modmenu=8.0.1
+deps.cicada=0.7.2+1.20.2-1.20.4
 # https://github.com/OnyxStudios/Cardinal-Components-API/releases
-cardinal_components_version=5.3.0
+deps.cardinal-components-api=5.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/nl/enjarai/showmeyourskin/ShowMeYourSkinClient.java

@@ -11,10 +11,10 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import nl.enjarai.cicada.api.conversation.ConversationManager;
+import nl.enjarai.cicada.api.cursed.DummyClientPlayerEntity;
 import nl.enjarai.cicada.api.util.CicadaEntrypoint;
 import nl.enjarai.cicada.api.util.JsonSource;
 import nl.enjarai.showmeyourskin.client.ModKeyBindings;
-import nl.enjarai.showmeyourskin.client.cursed.DummyClientPlayerEntity;
 import nl.enjarai.showmeyourskin.config.ArmorConfig;
 import nl.enjarai.showmeyourskin.config.ModConfig;
 import nl.enjarai.showmeyourskin.config.SyncedModConfig;