Merge pull request #2 from WitixinForks/1.19

Add modid prefix to mixin methods

Author: jaredlll08

src/main/java/com/faux/ingredientextension/mixin/MixinIngredient.java

@@ -33,7 +33,7 @@ public class MixinIngredient {
      * vanilla game.
      */
     @Inject(method = "toNetwork", at = @At("HEAD"), cancellable = true)
-    private void toNetwork(FriendlyByteBuf buf, CallbackInfo ci) {
+    private void ingredientextensionapi_toNetwork(FriendlyByteBuf buf, CallbackInfo ci) {
 
         final Ingredient self = (Ingredient) (Object) this;
 
@@ -84,7 +84,7 @@ private void toNetwork(FriendlyByteBuf buf, CallbackInfo ci) {
      * vanilla game.
      */
     @Inject(method = "fromNetwork", at = @At("HEAD"), cancellable = true)
-    private static void fromNetwork(FriendlyByteBuf friendlyByteBuf, CallbackInfoReturnable<Ingredient> cir) {
+    private static void ingredientextensionapi_fromNetwork(FriendlyByteBuf friendlyByteBuf, CallbackInfoReturnable<Ingredient> cir) {
 
         final int marker = friendlyByteBuf.readInt();
 
@@ -138,7 +138,7 @@ else if (marker != Constants.NETWORK_MARKER_VANILLA) {
      * true}.
      */
     @Inject(method = "fromJson(Lcom/google/gson/JsonElement;)Lnet/minecraft/world/item/crafting/Ingredient;", at = @At("HEAD"), cancellable = true)
-    private static void fromJson(JsonElement jsonElement, CallbackInfoReturnable<Ingredient> callback) {
+    private static void ingredientextensionapi_fromJson(JsonElement jsonElement, CallbackInfoReturnable<Ingredient> callback) {
 
         // Only process JSON objects with a type property.
         if (jsonElement instanceof JsonObject jsonObj && jsonObj.has("type")) {

src/main/java/com/faux/ingredientextension/mixin/MixinShapelessRecipe.java

@@ -40,7 +40,7 @@ public abstract class MixinShapelessRecipe {
      * characteristics are also comparable to the vanilla implementation.
      */
     @Inject(method = "matches(Lnet/minecraft/world/inventory/CraftingContainer;Lnet/minecraft/world/level/Level;)Z", at = @At("HEAD"), cancellable = true)
-    public void matches(CraftingContainer craftingContainer, Level level, CallbackInfoReturnable<Boolean> cir) {
+    public void ingredientextensionapi_matches(CraftingContainer craftingContainer, Level level, CallbackInfoReturnable<Boolean> cir) {
 
         // Only use our custom logic if it is required.
         if (!IngredientHelper.requiresTesting(this.ingredients)) {