More port! (merge ours pls kthnx)

enjarai · Apr 30, 2024 · 31b052b · 31b052b
1 parent 9dcb1a6
commit 31b052b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,2 @@
-- 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.
+- Moved out of world entity rendering code to CICADA for easier maintenance.
+- Updated to 1.20.5-1.20.6.
diff --git a/gradle.properties b/gradle.properties
@@ -5,15 +5,15 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/develop
 minecraft_version=1.20.5
 yarn_mappings=1.20.5+build.1
-loader_version=0.15.2
+loader_version=0.15.10
 
 # Mod Properties
 mod_version = 1.10.0
 maven_group = nl.enjarai
 archives_base_name = show-me-your-skin
 
 publish_target_min=1.20.5
-publish_target_max=1.20.5
+publish_target_max=1.20.6
 mod_modrinth=bD7YqcA3
 mod_curseforge=622010
 mod_github=enjarai/show-me-your-skin
@@ -23,6 +23,6 @@ git_branch=master
 fabric_version=0.97.8+1.20.5
 # https://modrinth.com/mod/modmenu/versions
 modmenu_version=10.0.0-beta.1
-cicada_version=0.7.0+1.20.2-and-above
+cicada_version=0.7.1+1.20.5-and-above
 # https://github.com/OnyxStudios/Cardinal-Components-API/releases
 cardinal_components_version=6.0.0-beta.3
diff --git a/src/main/java/nl/enjarai/showmeyourskin/mixin/shield/BannerBlockEntityRendererMixin.java b/src/main/java/nl/enjarai/showmeyourskin/mixin/shield/BannerBlockEntityRendererMixin.java
@@ -1,6 +1,6 @@
 package nl.enjarai.showmeyourskin.mixin.shield;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.block.entity.BannerPattern;
 import net.minecraft.client.model.ModelPart;
@@ -10,6 +10,7 @@
 import net.minecraft.client.render.block.entity.BannerBlockEntityRenderer;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.type.BannerPatternsComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.DyeColor;
@@ -31,11 +32,11 @@ public abstract class BannerBlockEntityRendererMixin {
     private static final ThreadLocal<Boolean> showmeyourskin$isShield = ThreadLocal.withInitial(() -> false);
 
     @Inject(
-            method = "renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLjava/util/List;Z)V",
+            method = "renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/component/type/BannerPatternsComponent;Z)V",
             at = @At("HEAD"),
             cancellable = true
     )
-    private static void showmeyourskin$captureBannerCanvasContext(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, ModelPart canvas, SpriteIdentifier baseSprite, boolean isBanner, List<Pair<RegistryEntry<BannerPattern>, DyeColor>> patterns, boolean glint, CallbackInfo ci) {
+    private static void showmeyourskin$captureBannerCanvasContext(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, ModelPart canvas, SpriteIdentifier baseSprite, boolean isBanner, DyeColor color, BannerPatternsComponent patterns, boolean glint, CallbackInfo ci) {
         showmeyourskin$isShield.set(!isBanner);
 
         if (!isBanner) {
@@ -52,7 +53,7 @@ public abstract class BannerBlockEntityRendererMixin {
     }
 
     @ModifyArg(
-            method = "renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLjava/util/List;Z)V",
+            method = "renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/component/type/BannerPatternsComponent;Z)V",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/util/SpriteIdentifier;getVertexConsumer(Lnet/minecraft/client/render/VertexConsumerProvider;Ljava/util/function/Function;Z)Lnet/minecraft/client/render/VertexConsumer;"
@@ -76,7 +77,7 @@ public abstract class BannerBlockEntityRendererMixin {
     }
 
     @WrapWithCondition(
-            method = "renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLjava/util/List;Z)V",
+            method = "renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/component/type/BannerPatternsComponent;Z)V",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/model/ModelPart;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;II)V"
@@ -107,7 +108,7 @@ public abstract class BannerBlockEntityRendererMixin {
     }
 
     @ModifyArg(
-            method = "method_43789",
+            method = "renderLayer",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/util/SpriteIdentifier;getVertexConsumer(Lnet/minecraft/client/render/VertexConsumerProvider;Ljava/util/function/Function;)Lnet/minecraft/client/render/VertexConsumer;"
@@ -131,7 +132,7 @@ public abstract class BannerBlockEntityRendererMixin {
     }
 
     @ModifyArg(
-            method = "method_43789",
+            method = "renderLayer",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/model/ModelPart;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;IIFFFF)V"

diff --git a/src/main/java/nl/enjarai/showmeyourskin/mixin/shield/BuiltinModelItemRendererMixin.java b/src/main/java/nl/enjarai/showmeyourskin/mixin/shield/BuiltinModelItemRendererMixin.java
@@ -49,9 +49,9 @@ public abstract class BuiltinModelItemRendererMixin {
             method = "render",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/render/block/entity/BannerBlockEntityRenderer;renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLjava/util/List;Z)V"
+                    target = "Lnet/minecraft/client/render/block/entity/BannerBlockEntityRenderer;renderCanvas(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/util/SpriteIdentifier;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/component/type/BannerPatternsComponent;Z)V"
             ),
-            index = 8
+            index = 9
     )
     private boolean showmeyourskin$modifyGlint2(boolean original) {
         return original && showmeyourskin$getShieldGlint();
@@ -61,7 +61,7 @@ public abstract class BuiltinModelItemRendererMixin {
             method = "render",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/item/BlockItem;getBlockEntityNbt(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/nbt/NbtCompound;"
+                    target = "Lnet/minecraft/item/ItemStack;getOrDefault(Lnet/minecraft/component/DataComponentType;Ljava/lang/Object;)Ljava/lang/Object;"
             ),
             cancellable = true
     )