From 98a7725acb4aa7dba2b647f8305c7d677beb9b8c Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 27 Aug 2023 16:53:48 +0200 Subject: [PATCH] Fix shadow remaps on ingredient mixins --- .../kubejs/core/mixin/fabric/CombinedIngredientMixin.java | 2 +- .../kubejs/core/mixin/fabric/DifferenceIngredientMixin.java | 4 ++-- .../mods/kubejs/core/mixin/fabric/NbtIngredientMixin.java | 2 +- .../kubejs/core/mixin/forge/DifferenceIngredientMixin.java | 4 ++-- .../kubejs/core/mixin/forge/IngredientsWithChildrenMixin.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/CombinedIngredientMixin.java b/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/CombinedIngredientMixin.java index 412919587..59990972b 100644 --- a/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/CombinedIngredientMixin.java +++ b/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/CombinedIngredientMixin.java @@ -8,7 +8,7 @@ @Mixin(targets = "net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient") public abstract class CombinedIngredientMixin implements CustomIngredientKJS { - @Shadow + @Shadow(remap = false) @Final protected Ingredient[] ingredients; diff --git a/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/DifferenceIngredientMixin.java b/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/DifferenceIngredientMixin.java index 386ce49a5..7f257f956 100644 --- a/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/DifferenceIngredientMixin.java +++ b/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/DifferenceIngredientMixin.java @@ -9,11 +9,11 @@ @Mixin(DifferenceIngredient.class) public abstract class DifferenceIngredientMixin implements CustomIngredientKJS { - @Shadow + @Shadow(remap = false) @Final private Ingredient base; - @Shadow + @Shadow(remap = false) @Final private Ingredient subtracted; diff --git a/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/NbtIngredientMixin.java b/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/NbtIngredientMixin.java index 437bdfc73..584fa3bb9 100644 --- a/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/NbtIngredientMixin.java +++ b/fabric/src/main/java/dev/latvian/mods/kubejs/core/mixin/fabric/NbtIngredientMixin.java @@ -9,7 +9,7 @@ @Mixin(NbtIngredient.class) public abstract class NbtIngredientMixin implements CustomIngredientKJS { - @Shadow + @Shadow(remap = false) @Final private Ingredient base; diff --git a/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/DifferenceIngredientMixin.java b/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/DifferenceIngredientMixin.java index 19a2460ed..aac89d1f9 100644 --- a/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/DifferenceIngredientMixin.java +++ b/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/DifferenceIngredientMixin.java @@ -9,11 +9,11 @@ @Mixin(DifferenceIngredient.class) public abstract class DifferenceIngredientMixin extends AbstractIngredient { - @Shadow + @Shadow(remap = false) @Final private Ingredient base; - @Shadow + @Shadow(remap = false) @Final private Ingredient subtracted; diff --git a/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/IngredientsWithChildrenMixin.java b/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/IngredientsWithChildrenMixin.java index a6914c1e6..c19a0c9de 100644 --- a/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/IngredientsWithChildrenMixin.java +++ b/forge/src/main/java/dev/latvian/mods/kubejs/core/mixin/forge/IngredientsWithChildrenMixin.java @@ -11,7 +11,7 @@ @Mixin({CompoundIngredient.class, IntersectionIngredient.class}) public abstract class IngredientsWithChildrenMixin extends AbstractIngredient { - @Shadow + @Shadow(remap = false) private List children; @Override