From 5ab68ca4d61f9fe8ea92963e9f61d0b76c332edb Mon Sep 17 00:00:00 2001 From: Relentless Date: Mon, 21 Nov 2022 14:41:55 +0100 Subject: [PATCH] Revert "fix stone strata detection not being applied to ingredients" This reverts commit 3558ed2c302b262403e9bbc4300922c5e88f8d22. --- .../com/almostreliable/unified/recipe/RecipeContextImpl.java | 4 ---- .../java/com/almostreliable/unified/utils/ReplacementMap.java | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Common/src/main/java/com/almostreliable/unified/recipe/RecipeContextImpl.java b/Common/src/main/java/com/almostreliable/unified/recipe/RecipeContextImpl.java index 0a59b23..9b49c72 100644 --- a/Common/src/main/java/com/almostreliable/unified/recipe/RecipeContextImpl.java +++ b/Common/src/main/java/com/almostreliable/unified/recipe/RecipeContextImpl.java @@ -83,11 +83,7 @@ public class RecipeContextImpl implements RecipeContext { if (object.get(RecipeConstants.ITEM) instanceof JsonPrimitive primitive) { ResourceLocation item = ResourceLocation.tryParse(primitive.getAsString()); UnifyTag tag = getPreferredTagForItem(item); - if (tag != null) { - // avoid replacing input items with tags in case the stone strata matters - if (replacementMap.getStoneStrataHandler().isStoneStrataTag(tag)) return; - object.remove(RecipeConstants.ITEM); object.add(RecipeConstants.TAG, new JsonPrimitive(tag.location().toString())); } diff --git a/Common/src/main/java/com/almostreliable/unified/utils/ReplacementMap.java b/Common/src/main/java/com/almostreliable/unified/utils/ReplacementMap.java index b0f2b40..fa63d14 100644 --- a/Common/src/main/java/com/almostreliable/unified/utils/ReplacementMap.java +++ b/Common/src/main/java/com/almostreliable/unified/utils/ReplacementMap.java @@ -103,8 +103,4 @@ public class ReplacementMap { } return null; } - - public StoneStrataHandler getStoneStrataHandler() { - return stoneStrataHandler; - } }