Merge branch 'api-12' into api-14

# Conflicts:
#	neoforge/src/main/resource-templates/META-INF/neoforge.mods.toml
#	src/main/java/org/spongepowered/common/item/recipe/crafting/shapeless/SpongeShapelessRecipe.java
#	src/mixins/java/org/spongepowered/common/mixin/tracker/server/level/ServerPlayerGameModeMixin_Tracker.java

Author: Yeregorix

neoforge/src/main/resource-templates/META-INF/neoforge.mods.toml

@@ -16,17 +16,15 @@ description = "{{ description }}"
 
 [[dependencies.spongeneo]]
 modId="neoforge"
-mandatory=true
+type="required"
 versionRange="[{{ neoForgeVersion }},)"
 ordering="AFTER"
-side="BOTH"
 
 [[dependencies.spongeneo]]
 modId="sponge"
-mandatory=true
+type="required"
 versionRange="[{{ version }}]"
 ordering="AFTER"
-side="BOTH"
 
 
 [[mods]]
@@ -40,10 +38,9 @@ description="The SpongeAPI implementation targeting vanilla Minecraft and 3rd pa
 
 [[dependencies.sponge]]
 modId="spongeapi"
-mandatory=true
+type="required"
 versionRange="[{{ apiVersion }},)"
 ordering="AFTER"
-side="BOTH"
 
 
 [[mods]]
@@ -55,6 +52,11 @@ credits="SpongePowered and Contributors"
 authors="SpongePowered"
 description="A Minecraft plugin API"
 
+
 ["lithium:options"]
 "mixin.world.tick_scheduler"=false
 "mixin.collections.entity_filtering"=false
+
+[[dependencies.spongeneo]]
+modId="adventure_platform_neoforge"
+type="incompatible"

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

@@ -72,7 +72,7 @@ public boolean matches(final CraftingInput $$0, final Level $$1) {
         if (this.onlyVanillaIngredients) {
             return super.matches($$0, $$1);
         }
-        return SpongeShapelessRecipe.matches($$0.items(), ((ShapelessRecipeAccessor) this).accessor$ingredients());
+        return SpongeShapelessRecipe.matches($$0, ((ShapelessRecipeAccessor) this).accessor$ingredients());
     }
 
     @Override
@@ -93,19 +93,22 @@ public ItemStack assemble(final CraftingInput $$0, final HolderLookup.Provider $
     }
 
     private static boolean
-    matches(List<ItemStack> stacks, List<Ingredient> ingredients) {
+    matches(CraftingInput input, List<Ingredient> ingredients) {
         final int elements = ingredients.size();
-        if (stacks.size() < elements) {
+        if (input.ingredientCount() != elements) {
+            // The amount of non-empty stacks doesn't match the amount of ingredients
             return false;
         }
 
+        final List<ItemStack> stacks = input.items();
         // find matched stack -> ingredient list
         final Map<Integer, List<Integer>> matchesMap = new HashMap<>();
         for (int i = 0; i < ingredients.size(); i++) {
             Ingredient ingredient = ingredients.get(i);
             boolean noMatch = true;
             for (int j = 0; j < stacks.size(); j++) {
-                if (ingredient.test(stacks.get(j))) {
+                final ItemStack stack = stacks.get(j);
+                if (!stack.isEmpty() && ingredient.test(stack)) {
                     matchesMap.computeIfAbsent(j, k -> new ArrayList<>()).add(i);;
                     noMatch = false;
                 }
@@ -116,7 +119,8 @@ public ItemStack assemble(final CraftingInput $$0, final HolderLookup.Provider $
             }
         }
 
-        if (matchesMap.isEmpty()) {
+        if (matchesMap.size() != elements) {
+            // At least one stack had no matching ingredient
             return false;
         }
 

src/mixins/java/org/spongepowered/common/mixin/tracker/server/level/ServerPlayerGameModeMixin_Tracker.java

@@ -31,12 +31,14 @@
 import com.llamalad7.mixinextras.sugar.Share;
 import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
+import net.minecraft.network.protocol.game.ClientboundSetHealthPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.food.FoodData;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.UseOnContext;
@@ -105,6 +107,9 @@ public abstract class ServerPlayerGameModeMixin_Tracker {
         ((ServerPlayerGameModeBridge) this).bridge$setInteractBlockRightClickCancelled(event.isCancelled());
         if (event.isCancelled()) {
             this.player.inventoryMenu.sendAllDataToRemote();
+            // Eating a cake increases the food level on client-side
+            final FoodData foodData = player.getFoodData();
+            this.player.connection.send(new ClientboundSetHealthPacket(player.getHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel()));
             return InteractionResult.FAIL;
         }