From b8bf6732ba56ca677cb46a04fbc3f9b9602f07bf Mon Sep 17 00:00:00 2001 From: Patbox <39821509+Patbox@users.noreply.github.com> Date: Wed, 22 Mar 2023 22:24:33 +0100 Subject: [PATCH] Update client jar, fix wrong targets on ItemRendererMixin --- gradle.properties | 2 +- .../java/eu/pb4/polymer/common/api/PolymerCommonUtils.java | 2 +- .../main/java/eu/pb4/polymer/core/api/item/PolymerRecipe.java | 2 +- .../core/mixin/client/rendering/ItemRendererMixin.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 79132e9d..a8d3800a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ fabric_version=0.74.2+1.19.4 maven_group = eu.pb4 -mod_version = 0.4.0 +mod_version = 0.4.1 minecraft_version_supported = ">=1.19.4-" diff --git a/polymer-common/src/main/java/eu/pb4/polymer/common/api/PolymerCommonUtils.java b/polymer-common/src/main/java/eu/pb4/polymer/common/api/PolymerCommonUtils.java index ab37dddb..909d09a9 100644 --- a/polymer-common/src/main/java/eu/pb4/polymer/common/api/PolymerCommonUtils.java +++ b/polymer-common/src/main/java/eu/pb4/polymer/common/api/PolymerCommonUtils.java @@ -23,7 +23,7 @@ private PolymerCommonUtils(){} public static final SimpleEvent ON_RESOURCE_PACK_STATUS_CHANGE = new SimpleEvent<>(); - private final static String SAFE_CLIENT_SHA1 = "1da03ea094c11b77e6784e6a816b73f5f5dc57b7"; + private final static String SAFE_CLIENT_SHA1 = "958928a560c9167687bea0cefeb7375da1e552a8"; private final static String SAFE_CLIENT_URL = "https://piston-data.mojang.com/v1/objects/" + SAFE_CLIENT_SHA1 + "/client.jar"; @Nullable public static Path getClientJar() { diff --git a/polymer-core/src/main/java/eu/pb4/polymer/core/api/item/PolymerRecipe.java b/polymer-core/src/main/java/eu/pb4/polymer/core/api/item/PolymerRecipe.java index 26e2d3e4..83ee057b 100644 --- a/polymer-core/src/main/java/eu/pb4/polymer/core/api/item/PolymerRecipe.java +++ b/polymer-core/src/main/java/eu/pb4/polymer/core/api/item/PolymerRecipe.java @@ -83,7 +83,7 @@ static Recipe createSmeltingRecipe(Recipe input) { * @return the Vanilla recipe */ static Recipe createSmithingRecipe(Recipe input) { - return new LegacySmithingRecipe(input.getId(), Ingredient.EMPTY, Ingredient.EMPTY, input.getOutput(null)); + return new SmithingTransformRecipe(input.getId(), Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, input.getOutput(null)); } /** diff --git a/polymer-core/src/main/java/eu/pb4/polymer/core/mixin/client/rendering/ItemRendererMixin.java b/polymer-core/src/main/java/eu/pb4/polymer/core/mixin/client/rendering/ItemRendererMixin.java index 8615c9f0..a35360ca 100644 --- a/polymer-core/src/main/java/eu/pb4/polymer/core/mixin/client/rendering/ItemRendererMixin.java +++ b/polymer-core/src/main/java/eu/pb4/polymer/core/mixin/client/rendering/ItemRendererMixin.java @@ -13,9 +13,9 @@ @Mixin(ItemRenderer.class) public class ItemRendererMixin { @ModifyVariable(method = { - "renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/world/World;III)V", + "renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/world/World;III)V", "renderGuiItemModel", - "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V" + "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V" }, at = @At("HEAD"), require = 0) private ItemStack polymer$replaceItemStack(ItemStack stack) { return CoreClientUtils.getRenderingStack(stack);