Remove accessors for overloaded method, they dont work

(ref SpongePowered/Mixin#522)
VazkiiMods · Aug 28, 2024 · 97f60d5 · 97f60d5
1 parent 963ba20
commit 97f60d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/Xplat/src/main/java/vazkii/botania/data/recipes/CraftingRecipeProvider.java b/Xplat/src/main/java/vazkii/botania/data/recipes/CraftingRecipeProvider.java
@@ -85,7 +85,7 @@ public void buildRecipes(RecipeOutput recipeOutput) {
 	}
 
 	public static Criterion<InventoryChangeTrigger.TriggerInstance> conditionsFromItem(ItemLike item) {
-		return RecipeProviderAccessor.botania_has(item);
+		return RecipeProviderAccessor.botania_inventoryTrigger(ItemPredicate.Builder.item().of(item));
 	}
 
 	private static Criterion<InventoryChangeTrigger.TriggerInstance> conditionsFromItems(ItemLike... items) {
@@ -98,7 +98,7 @@ private static Criterion<InventoryChangeTrigger.TriggerInstance> conditionsFromI
 	}
 
 	public static Criterion<InventoryChangeTrigger.TriggerInstance> conditionsFromTag(TagKey<Item> tag) {
-		return RecipeProviderAccessor.botania_has(tag);
+		return RecipeProviderAccessor.botania_inventoryTrigger(ItemPredicate.Builder.item().of(tag));
 	}
 
 	/** Addons: override this to return your modid */

diff --git a/Xplat/src/main/java/vazkii/botania/mixin/RecipeProviderAccessor.java b/Xplat/src/main/java/vazkii/botania/mixin/RecipeProviderAccessor.java
@@ -21,16 +21,6 @@
 
 @Mixin(RecipeProvider.class)
 public interface RecipeProviderAccessor {
-	@Invoker("has")
-	static Criterion<InventoryChangeTrigger.TriggerInstance> botania_has(ItemLike itemLike) {
-		throw new IllegalStateException("Direct call to invoker method");
-	}
-
-	@Invoker("has")
-	static Criterion<InventoryChangeTrigger.TriggerInstance> botania_has(TagKey<Item> tag) {
-		throw new IllegalStateException("Direct call to invoker method");
-	}
-
 	@Invoker("inventoryTrigger")
 	static Criterion<InventoryChangeTrigger.TriggerInstance> botania_inventoryTrigger(ItemPredicate.Builder... $$0) {
 		throw new IllegalStateException("Direct call to invoker method");