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

embeddedt · embeddedt · commit d23b38f1be96 · 2025-06-05T19:06:16.000-04:00
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java
@@ -22,7 +22,7 @@ public boolean equals(Ingredient.ItemValue a, Ingredient.ItemValue b) {
     });
 
     public static Ingredient.Value deduplicate(Ingredient.Value value) {
-        if (value instanceof Ingredient.ItemValue) {
+        if (value.getClass() == Ingredient.ItemValue.class) {
             synchronized (VALUES) {
                 return VALUES.addOrGet((Ingredient.ItemValue)value);
             }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public boolean equals(Ingredient.ItemValue a, Ingredient.ItemValue b) {`
`22`	`22`	`});`
`23`	`23`
`24`	`24`	`public static Ingredient.Value deduplicate(Ingredient.Value value) {`
`25`		`- if (value instanceof Ingredient.ItemValue) {`
	`25`	`+ if (value.getClass() == Ingredient.ItemValue.class) {`
`26`	`26`	`synchronized (VALUES) {`
`27`	`27`	`return VALUES.addOrGet((Ingredient.ItemValue)value);`
`28`	`28`	`}`