1.21.4 moment

CaelTheColher · Dec 3, 2024 · 253c768 · 253c768
1 parent 595bdbe
commit 253c768
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/common/src/main/kotlin/me/cael/capes/menu/SelectorMenu.kt b/common/src/main/kotlin/me/cael/capes/menu/SelectorMenu.kt
@@ -11,6 +11,7 @@ import net.minecraft.client.gui.widget.ButtonWidget
 import net.minecraft.client.option.GameOptions
 import net.minecraft.client.render.DiffuseLighting
 import net.minecraft.client.render.entity.EntityRendererFactory
+import net.minecraft.client.render.entity.equipment.EquipmentModelLoader
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.screen.ScreenTexts
 import net.minecraft.text.Text
@@ -90,12 +91,12 @@ class SelectorMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent,
         val immediate = MinecraftClient.getInstance().bufferBuilders.entityVertexConsumers
         val ctx = EntityRendererFactory.Context(
             MinecraftClient.getInstance().entityRenderDispatcher,
-            MinecraftClient.getInstance().itemRenderer,
+            MinecraftClient.getInstance().itemModelManager,
             MinecraftClient.getInstance().mapRenderer,
             MinecraftClient.getInstance().blockRenderManager,
             MinecraftClient.getInstance().resourceManager,
-            MinecraftClient.getInstance().entityModelLoader,
-            MinecraftClient.getInstance().equipmentModelLoader,
+            MinecraftClient.getInstance().loadedEntityModels,
+            EquipmentModelLoader(),
             MinecraftClient.getInstance().textRenderer
         )
         val displayPlayerEntityRenderer = DisplayPlayerEntityRenderer(ctx, entity.slim)

diff --git a/common/src/main/kotlin/me/cael/capes/render/DisplayPlayerEntityRenderer.kt b/common/src/main/kotlin/me/cael/capes/render/DisplayPlayerEntityRenderer.kt
@@ -28,8 +28,7 @@ class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim:
         ),
         0.5f
     ) {
-
-    val elytra = ElytraEntityModel(ctx.modelLoader.getModelPart(EntityModelLayers.ELYTRA))
+    val elytra = ElytraEntityModel(ctx.entityModels.getModelPart(EntityModelLayers.ELYTRA))
 
     fun render(livingEntity : PlaceholderEntity, tickDelta: Float, matrixStack: MatrixStack, vertexConsumerProvider: VertexConsumerProvider, light: Int) {
         setModelPose()

diff --git a/common/src/main/kotlin/me/cael/capes/render/PlaceholderEntity.kt b/common/src/main/kotlin/me/cael/capes/render/PlaceholderEntity.kt
@@ -28,7 +28,7 @@ object PlaceholderEntity {
 
     init {
         MinecraftClient.getInstance().skinProvider.fetchSkinTextures(gameProfile).thenAccept {
-            skin = it
+            skin = it.get()
             slim = skin.model == SkinTextures.Model.SLIM
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx8G
 
-minecraft_version=1.21.2
-yarn_mappings=1.21.2+build.1
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
 neoforge_yarn_mappings=1.21+build.4
 enabled_platforms=fabric
 
 archives_base_name=capes
-mod_version=1.5.4+1.21.2
+mod_version=1.5.4+1.21.4
 maven_group=me.capes
 
-fabric_loader_version=0.16.7
-fabric_api_version=0.106.1+1.21.2
+fabric_loader_version=0.16.9
+fabric_api_version=0.110.5+1.21.4
 
 forge_version=21.2.0-beta