1.21.5 moment

CaelTheColher · CaelTheColher · commit ecd3cc3dcd17 · 2025-03-25T15:34:03.000-03:00
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false
     id "org.ajoberstar.grgit" version "5.0.0" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "com.modrinth.minotaur" version "2.+" apply false
-    id "org.jetbrains.kotlin.jvm" version "1.9.23" apply false
+    id "org.jetbrains.kotlin.jvm" version "2.1.20" apply false
 }
 
 architectury {
diff --git a/common/src/main/kotlin/me/cael/capes/handler/PlayerHandler.kt b/common/src/main/kotlin/me/cael/capes/handler/PlayerHandler.kt
@@ -20,6 +20,7 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.util.*
 import java.util.concurrent.Executors
+import java.util.function.Supplier
 
 class PlayerHandler(var profile: GameProfile) {
     val uuid: UUID = profile.id
@@ -145,7 +146,7 @@ class PlayerHandler(var profile: GameProfile) {
                     val animatedCapeFrames = parseAnimatedCape(cape)
                     animatedCapeFrames.forEach { (frame, texture) ->
                         MinecraftClient.getInstance().textureManager.registerTexture(
-                            identifier("$uuid/$frame"), NativeImageBackedTexture(texture)
+                            identifier("$uuid/$frame"), NativeImageBackedTexture({"$uuid/$frame"}, texture)
                         )
                     }
                     this.maxFrames = animatedCapeFrames.size
@@ -154,7 +155,7 @@ class PlayerHandler(var profile: GameProfile) {
                 } else {
                     this.hasElytraTexture = cape.width.floorDiv(cape.height) == 2
                     MinecraftClient.getInstance().textureManager.registerTexture(
-                        identifier(uuid.toString()), NativeImageBackedTexture(parseCape(cape))
+                        identifier(uuid.toString()), NativeImageBackedTexture({uuid.toString()}, parseCape(cape))
                     )
                     this.hasCape = true
                 }
diff --git a/common/src/main/kotlin/me/cael/capes/menu/SelectorMenu.kt b/common/src/main/kotlin/me/cael/capes/menu/SelectorMenu.kt
@@ -85,7 +85,7 @@ class SelectorMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent,
         val quaternion = RotationAxis.POSITIVE_Z.rotationDegrees(180.0f)
         matrixStack2.multiply(quaternion)
 
-        DiffuseLighting.method_34742()
+        DiffuseLighting.enableGuiShaderLighting()
         val entityRenderDispatcher = MinecraftClient.getInstance().entityRenderDispatcher
         entityRenderDispatcher.setRenderShadows(false)
         val immediate = MinecraftClient.getInstance().bufferBuilders.entityVertexConsumers
diff --git a/common/src/main/kotlin/me/cael/capes/render/DisplayPlayerEntityRenderer.kt b/common/src/main/kotlin/me/cael/capes/render/DisplayPlayerEntityRenderer.kt
@@ -80,10 +80,10 @@ class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim:
 
     fun setAngles(f: Float, g: Float) {
         model.body.yaw = 0.0f
-        model.rightArm.pivotZ = 0.0f
-        model.rightArm.pivotX = -5.0f
-        model.leftArm.pivotZ = 0.0f
-        model.leftArm.pivotX = 5.0f
+        model.rightArm.originZ = 0.0f
+        model.rightArm.originX = -5.0f
+        model.leftArm.originZ = 0.0f
+        model.leftArm.originX = 5.0f
 
         model.rightArm.pitch = MathHelper.cos(f * 0.6662f + 3.1415927f) * 2.0f * g * 0.5f
         model.leftArm.pitch = MathHelper.cos(f * 0.6662f) * 2.0f * g * 0.5f
@@ -100,14 +100,14 @@ class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim:
         model.leftArm.yaw = 0.0f
 
         model.body.pitch = 0.0f
-        model.rightLeg.pivotZ = 0.1f
-        model.leftLeg.pivotZ = 0.1f
-        model.rightLeg.pivotY = 12.0f
-        model.leftLeg.pivotY = 12.0f
-        model.head.pivotY = 0.0f
-        model.body.pivotY = 0.0f
-        model.leftArm.pivotY = 2.0f
-        model.rightArm.pivotY = 2.0f
+        model.rightLeg.originZ = 0.1f
+        model.leftLeg.originZ = 0.1f
+        model.rightLeg.originY = 12.0f
+        model.leftLeg.originY = 12.0f
+        model.head.originY = 0.0f
+        model.body.originY = 0.0f
+        model.leftArm.originY = 2.0f
+        model.rightArm.originY = 2.0f
     }
     
     private fun setModelPose() {
diff --git a/fabric/src/main/kotlin/me/cael/capes/fabric/FabricCapes.kt b/fabric/src/main/kotlin/me/cael/capes/fabric/FabricCapes.kt
@@ -59,8 +59,8 @@ object FabricCapes : ClientModInitializer {
             .append("URL: ${handler.capeType?.getURL(profile)}")
 
         val text = Text.literal("Click here to copy debug info for player ${profile.name}.")
-        val clickEvent = ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, infoText.string)
-        val hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, infoText)
+        val clickEvent = ClickEvent.CopyToClipboard(infoText.string)
+        val hoverEvent = HoverEvent.ShowText(infoText)
         val style = Style.EMPTY
             .withClickEvent(clickEvent)
             .withHoverEvent(hoverEvent)
diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,22 @@
 org.gradle.jvmargs=-Xmx8G
+loom.ignoreDependencyLoomVersionValidation=true
 
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.1
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 neoforge_yarn_mappings=1.21+build.4
 enabled_platforms=fabric
 
 archives_base_name=capes
-mod_version=1.5.5+1.21.4
+mod_version=1.5.5+1.21.5
 maven_group=me.capes
 
-fabric_loader_version=0.16.9
-fabric_api_version=0.110.5+1.21.4
+fabric_loader_version=0.16.10
+fabric_api_version=0.119.5+1.21.5
 
 forge_version=21.2.0-beta
 
 # Other APIs
-fabric_kotlin_version=1.12.3+kotlin.2.0.21
+fabric_kotlin_version=1.13.2+kotlin.2.1.20
 forge_kotlin_version=5.+
 modmenu_version=12.+
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import java.net.HttpURLConnection`
`20`	`20`	`import java.net.URL`
`21`	`21`	`import java.util.*`
`22`	`22`	`import java.util.concurrent.Executors`
	`23`	`+import java.util.function.Supplier`
`23`	`24`
`24`	`25`	`class PlayerHandler(var profile: GameProfile) {`
`25`	`26`	`val uuid: UUID = profile.id`
`@@ -145,7 +146,7 @@ class PlayerHandler(var profile: GameProfile) {`
`145`	`146`	`val animatedCapeFrames = parseAnimatedCape(cape)`
`146`	`147`	`animatedCapeFrames.forEach { (frame, texture) ->`
`147`	`148`	`MinecraftClient.getInstance().textureManager.registerTexture(`
`148`		`- identifier("$uuid/$frame"), NativeImageBackedTexture(texture)`
	`149`	`+ identifier("$uuid/$frame"), NativeImageBackedTexture({"$uuid/$frame"}, texture)`
`149`	`150`	`)`
`150`	`151`	`}`
`151`	`152`	`this.maxFrames = animatedCapeFrames.size`
`@@ -154,7 +155,7 @@ class PlayerHandler(var profile: GameProfile) {`
`154`	`155`	`} else {`
`155`	`156`	`this.hasElytraTexture = cape.width.floorDiv(cape.height) == 2`
`156`	`157`	`MinecraftClient.getInstance().textureManager.registerTexture(`
`157`		`- identifier(uuid.toString()), NativeImageBackedTexture(parseCape(cape))`
	`158`	`+ identifier(uuid.toString()), NativeImageBackedTexture({uuid.toString()}, parseCape(cape))`
`158`	`159`	`)`
`159`	`160`	`this.hasCape = true`
`160`	`161`	`}`