From a95622e749844c8a476e30b5f7954f94acd9dd41 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:52:01 +0100 Subject: [PATCH] 22w04a --- gradle.properties | 4 ++-- src/main/java/carpet/mixins/RecipeManager_scarpetMixin.java | 2 +- src/main/java/carpet/script/api/Inventories.java | 2 +- src/main/java/carpet/script/utils/ShapesRenderer.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index ec9b8ddf..74169a14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=23w03a + minecraft_version=23w04a loader_version=0.14.13 - fabric_version=0.72.0+1.19.3 + fabric_version=0.73.1+1.19.4 # Mod Properties mod_version = 1.4.94 diff --git a/src/main/java/carpet/mixins/RecipeManager_scarpetMixin.java b/src/main/java/carpet/mixins/RecipeManager_scarpetMixin.java index 39ae1591..217e8aef 100644 --- a/src/main/java/carpet/mixins/RecipeManager_scarpetMixin.java +++ b/src/main/java/carpet/mixins/RecipeManager_scarpetMixin.java @@ -34,6 +34,6 @@ public class RecipeManager_scarpetMixin implements RecipeManagerInterface if (typeRecipes.containsKey(output)) return Collections.singletonList(typeRecipes.get(output)); final Registry regs = registryAccess.registryOrThrow(Registries.ITEM); return Lists.newArrayList(typeRecipes.values().stream().filter( - r -> regs.getKey(r.getResultItem().getItem()).equals(output)).collect(Collectors.toList())); + r -> regs.getKey(r.getResultItem(registryAccess).getItem()).equals(output)).collect(Collectors.toList())); } } diff --git a/src/main/java/carpet/script/api/Inventories.java b/src/main/java/carpet/script/api/Inventories.java index f03bb6e7..055f2ae2 100644 --- a/src/main/java/carpet/script/api/Inventories.java +++ b/src/main/java/carpet/script/api/Inventories.java @@ -134,7 +134,7 @@ public class Inventories { RegistryAccess regs = cc.registryAccess(); for (Recipe recipe: recipes) { - ItemStack result = recipe.getResultItem(); + ItemStack result = recipe.getResultItem(regs); List ingredientValue = new ArrayList<>(); recipe.getIngredients().forEach( ingredient -> diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java index 33ff5cf3..574803ad 100644 --- a/src/main/java/carpet/script/utils/ShapesRenderer.java +++ b/src/main/java/carpet/script/utils/ShapesRenderer.java @@ -363,7 +363,7 @@ public class ShapesRenderer { // draw the item client.getItemRenderer().renderStatic(shape.item, transformType, light, - OverlayTexture.NO_OVERLAY, matrices, immediate, (int) shape.key(client.level.registryAccess())); + OverlayTexture.NO_OVERLAY, matrices, immediate, client.level, (int) shape.key(client.level.registryAccess())); } } matrices.popPose();