Merge remote-tracking branch 'origin/1.20' into 1.21.1

Author: embeddedt

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/faster_ingredients/IngredientMixin.java

@@ -162,9 +162,7 @@ public ItemStack[] getItems() {
     private ItemStack[] computeItemsArray() {
         // Fast path for case with one item
         if (this.values.length == 1) {
-            if (this.values[0] instanceof Ingredient.ItemValue itemValue) {
-                return new ItemStack[] { itemValue.item() };
-            } else if (this.values[0] instanceof Ingredient.TagValue tagValue && mfix$areTagsAvailable()) {
+            if (this.values[0] instanceof Ingredient.TagValue tagValue && mfix$areTagsAvailable()) {
                 var tag = BuiltInRegistries.ITEM.getTag(tagValue.tag());
                 if (tag.isPresent() && tag.get().size() > 0) {
                     var holderSet = tag.get();