Make recipe placing from recipe book working with custom ingredients

src/main/java/org/spongepowered/common/bridge/world/item/crafting/PlacementInfoBridge.java

@@ -0,0 +1,37 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.bridge.world.item.crafting;
+
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.List;
+
+public interface PlacementInfoBridge {
+
+    boolean bridge$hasCustomIngredients();
+
+    List<StackedContents.IngredientInfo<ItemStack>> bridge$getStackIngredientInfos();
+}

src/main/java/org/spongepowered/common/item/recipe/crafting/SpongeStackedItemContents.java

@@ -0,0 +1,127 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.item.recipe.crafting;
+
+import it.unimi.dsi.fastutil.Hash;
+import it.unimi.dsi.fastutil.objects.Object2ReferenceMap;
+import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenCustomHashMap;
+import net.minecraft.core.Holder;
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.entity.player.StackedItemContents;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.PlacementInfo;
+import net.minecraft.world.item.crafting.Recipe;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.common.bridge.world.item.crafting.PlacementInfoBridge;
+
+import java.util.function.Function;
+
+public final class SpongeStackedItemContents extends StackedItemContents {
+
+    private static final Hash.Strategy<ItemStack> STACK_HASH_STRATEGY = new Hash.Strategy<>() {
+        @Override
+        public int hashCode(final ItemStack o) {
+            return ItemStack.hashItemAndComponents(o);
+        }
+
+        @Override
+        public boolean equals(final @Nullable ItemStack a, final @Nullable ItemStack b) {
+            return (a == b) || (a != null && b != null && ItemStack.isSameItemSameComponents(a, b));
+        }
+    };
+
+    private final Object2ReferenceMap<ItemStack, ItemStack> stackInterner =
+        new Object2ReferenceOpenCustomHashMap<>(SpongeStackedItemContents.STACK_HASH_STRATEGY);
+    private final StackedContents<ItemStack> stackedContents = new StackedContents<>();
+
+    private final StackedContents.Output<ItemStack> addCallback;
+    private final Runnable clearCallback;
+
+    public SpongeStackedItemContents(
+        final StackedContents.Output<ItemStack> addCallback, final Runnable clearCallback
+    ) {
+        this.addCallback = addCallback;
+        this.clearCallback = clearCallback;
+    }
+
+    @Override
+    public void accountStack(final ItemStack stack, final int maxStackSize) {
+        // Account to parent contents because it's used in
+        // #canCraft(List<StackedContents.IngredientInfo<Holder<Item>>>, StackedContents.Output<Holder<Item>>)
+        // and we can't safely override it to use StackedContents<ItemStack>
+        super.accountStack(stack, maxStackSize);
+
+        if (!stack.isEmpty()) {
+            // StackedContents works on Reference2IntMap, so if we meet stack which "same" copy
+            // has already been accounted we would need to provide the stack that was met first.
+            final ItemStack stackToAccount = this.stackInterner.computeIfAbsent(stack, Function.identity());
+            this.stackedContents.account(stackToAccount, Math.min(stack.getCount(), maxStackSize));
+        }
+    }
+
+    @Override
+    public boolean canCraft(
+        final Recipe<?> recipe, final int amount,
+        final StackedContents.@Nullable Output<Holder<Item>> output
+    ) {
+        final PlacementInfo placement = recipe.placementInfo();
+        return !placement.isImpossibleToPlace()
+            && this.stackedContents.tryPick(
+                ((PlacementInfoBridge) placement).bridge$getStackIngredientInfos(),
+                amount, this.createStackOutput(output));
+    }
+
+    @Override
+    public int getBiggestCraftableStack(
+        final Recipe<?> recipe, final int maxCount,
+        final StackedContents.@Nullable Output<Holder<Item>> output
+    ) {
+        return this.stackedContents.tryPickAll(
+            ((PlacementInfoBridge) recipe.placementInfo()).bridge$getStackIngredientInfos(),
+            maxCount, this.createStackOutput(output));
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+        this.stackInterner.clear();
+        this.stackedContents.clear();
+    }
+
+    private StackedContents.@Nullable Output<ItemStack> createStackOutput(
+        final StackedContents.@Nullable Output<Holder<Item>> output
+    ) {
+        if (output == null) {
+            return null;
+        }
+
+        this.clearCallback.run();
+        return stack -> {
+            output.accept(stack.getItemHolder());
+            this.addCallback.accept(stack);
+        };
+    }
+}

src/main/java/org/spongepowered/common/item/recipe/crafting/shapeless/SpongeShapelessRecipe.java

@@ -33,7 +33,7 @@
 import net.minecraft.world.item.crafting.ShapelessRecipe;
 import net.minecraft.world.level.Level;
 import org.spongepowered.common.accessor.world.item.crafting.ShapelessRecipeAccessor;
-import org.spongepowered.common.item.recipe.ingredient.SpongeIngredient;
+import org.spongepowered.common.bridge.world.item.crafting.PlacementInfoBridge;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -50,8 +50,6 @@
  */
 public class SpongeShapelessRecipe extends ShapelessRecipe {
 
-    private final boolean onlyVanillaIngredients;
-
     private final Function<CraftingInput, ItemStack> resultFunction;
     private final Function<CraftingInput, NonNullList<net.minecraft.world.item.ItemStack>> remainingItemsFunction;
 
@@ -62,14 +60,13 @@ public SpongeShapelessRecipe(final String groupIn,
             final Function<CraftingInput, net.minecraft.world.item.ItemStack> resultFunction,
             final Function<CraftingInput, NonNullList<ItemStack>> remainingItemsFunction) {
         super(groupIn, category, spongeResultStack, recipeItemsIn);
-        this.onlyVanillaIngredients = recipeItemsIn.stream().noneMatch(i -> i instanceof SpongeIngredient);
         this.resultFunction = resultFunction;
         this.remainingItemsFunction = remainingItemsFunction;
     }
 
     @Override
     public boolean matches(final CraftingInput $$0, final Level $$1) {
-        if (this.onlyVanillaIngredients) {
+        if (!((PlacementInfoBridge) this.placementInfo()).bridge$hasCustomIngredients()) {
             return super.matches($$0, $$1);
         }
         return SpongeShapelessRecipe.matches($$0.items(), ((ShapelessRecipeAccessor) this).accessor$ingredients());

src/main/java/org/spongepowered/common/item/recipe/ingredient/IngredientUtil.java

@@ -79,6 +79,7 @@ public static org.spongepowered.api.item.recipe.crafting.Ingredient of(ResourceK
         return IngredientUtil.fromNative(ingredient);
     }
 
-
-
+    public static boolean isCustom(final @Nullable Ingredient ingredient) {
+        return ingredient instanceof SpongeIngredient;
+    }
 }

src/mixins/java/org/spongepowered/common/mixin/core/recipebook/ServerPlaceRecipeMixin.java

@@ -0,0 +1,87 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.core.recipebook;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.recipebook.ServerPlaceRecipe;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.StackedItemContents;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.RecipeHolder;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.common.bridge.world.item.crafting.PlacementInfoBridge;
+import org.spongepowered.common.item.recipe.crafting.SpongeStackedItemContents;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+
+/**
+ * Makes recipe placing to work with sponge custom ingredients.
+ * Fallbacks to the original logic if recipe does not have any custom ingredient.
+ */
+@Mixin(ServerPlaceRecipe.class)
+public abstract class ServerPlaceRecipeMixin {
+
+    private Deque<ItemStack> impl$stackList = new ArrayDeque<>();
+
+    @WrapOperation(
+        method = "placeRecipe(Lnet/minecraft/recipebook/ServerPlaceRecipe$CraftingMenuAccess;IILjava/util/List;Ljava/util/List;Lnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/item/crafting/RecipeHolder;ZZ)Lnet/minecraft/world/inventory/RecipeBookMenu$PostPlaceAction;",
+        at = @At(
+            value = "NEW",
+            target = "()Lnet/minecraft/world/entity/player/StackedItemContents;"
+        )
+    )
+    private static StackedItemContents impl$useCustomStackedItemContents(
+        final Operation<StackedItemContents> original,
+        final ServerPlaceRecipe.CraftingMenuAccess<?> menu,
+        final int gridWidth, final int gridHeight,
+        final List<Slot> inputGridSlots, final List<Slot> slotsToClear,
+        final Inventory inventory, final RecipeHolder<?> recipe,
+        final boolean useMaxItems, final boolean isCreative,
+        final @Local ServerPlaceRecipe<?> placeRecipe
+    ) {
+        final ServerPlaceRecipeMixin mixed = (ServerPlaceRecipeMixin) (Object) placeRecipe;
+        return ((PlacementInfoBridge) recipe.value().placementInfo()).bridge$hasCustomIngredients()
+            ? new SpongeStackedItemContents(mixed.impl$stackList::add, mixed.impl$stackList::clear)
+            : original.call();
+    }
+
+    @ModifyArg(
+        method = "moveItemToGrid",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/player/Inventory;findSlotMatchingCraftingIngredient(Lnet/minecraft/core/Holder;Lnet/minecraft/world/item/ItemStack;)I"
+        )
+    )
+    private ItemStack impl$adjustMatchingSlotFinder(final ItemStack craftInputStack) {
+        return this.impl$stackList.isEmpty() ? craftInputStack : this.impl$stackList.poll();
+    }
+}

src/mixins/java/org/spongepowered/common/mixin/core/world/item/crafting/PlacementInfoMixin.java

@@ -0,0 +1,69 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.core.world.item.crafting;
+
+import net.minecraft.world.entity.player.StackedContents;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.PlacementInfo;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.common.bridge.world.item.crafting.PlacementInfoBridge;
+import org.spongepowered.common.item.recipe.ingredient.IngredientUtil;
+
+import java.util.List;
+
+@Mixin(PlacementInfo.class)
+public abstract class PlacementInfoMixin implements PlacementInfoBridge {
+
+    @Shadow @Final private List<Ingredient> ingredients;
+
+    private boolean impl$hasCustomIngredients;
+    private List<StackedContents.IngredientInfo<ItemStack>> impl$stackIngredientInfos;
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void impl$setSpongeData(final CallbackInfo ci) {
+        this.impl$hasCustomIngredients = this.ingredients.stream()
+            .anyMatch(IngredientUtil::isCustom);
+
+        this.impl$stackIngredientInfos = this.ingredients.stream()
+            .<StackedContents.IngredientInfo<ItemStack>>map(ingredient -> ingredient::test)
+            .toList();
+    }
+
+    @Override
+    public boolean bridge$hasCustomIngredients() {
+        return this.impl$hasCustomIngredients;
+    }
+
+    @Override
+    public List<StackedContents.IngredientInfo<ItemStack>> bridge$getStackIngredientInfos() {
+        return this.impl$stackIngredientInfos;
+    }
+}

src/mixins/resources/mixins.sponge.core.json

@@ -52,6 +52,7 @@
     "network.syncher.EntityDataAccessorMixin",
     "network.syncher.SynchedEntityData_BuilderMixin",
     "network.syncher.SynchedEntityDataMixin",
+    "recipebook.ServerPlaceRecipeMixin",
     "resources.RegistryDataLoader_LoaderMixin",
     "resources.RegistryDataLoaderMixin",
     "server.MinecraftServerMixin",
@@ -211,6 +212,7 @@
     "world.item.TeleportRandomlyConsumeEffectMixin",
     "world.item.crafting.AbstractCookingRecipeMixin",
     "world.item.crafting.IngredientMixin",
+    "world.item.crafting.PlacementInfoMixin",
     "world.item.crafting.RecipeManagerMixin",
     "world.item.crafting.ShapedRecipeMixin",
     "world.item.crafting.ShapelessRecipeMixin",