Merge branch '1.18.2' into 1.19

build.gradle

@@ -10,6 +10,7 @@ plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
     id "org.cadixdev.licenser" version "0.6.1"
+    id "io.github.juuxel.loom-quiltflower" version "1.7.2" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id "maven-publish"
 }
@@ -20,6 +21,7 @@ architectury {
 
 subprojects {
     apply plugin: "dev.architectury.loom"
+    apply plugin: "io.github.juuxel.loom-quiltflower"
 
     loom {
         silentMojangMappingsLicense()

common/src/main/java/dev/architectury/hooks/item/ItemStackHooks.java

@@ -19,6 +19,7 @@
 
 package dev.architectury.hooks.item;
 
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -53,4 +54,28 @@ public final class ItemStackHooks {
             }
         }
     }
+    
+    /**
+     * Returns whether the given item stack has a remaining item after crafting.
+     * This method is stack-aware only on Forge.
+     *
+     * @param stack the item stack
+     * @return whether the given item stack has a remaining item after crafting
+     */
+    @ExpectPlatform
+    public static boolean hasCraftingRemainingItem(ItemStack stack) {
+        throw new AssertionError();
+    }
+    
+    /**
+     * Returns the remaining item for a given item stack after crafting.
+     * This method is stack-aware only on Forge.
+     *
+     * @param stack the item stack
+     * @return the remaining item for a given item stack after crafting
+     */
+    @ExpectPlatform
+    public static ItemStack getCraftingRemainingItem(ItemStack stack) {
+        throw new AssertionError();
+    }
 }

fabric/src/main/java/dev/architectury/hooks/item/fabric/ItemStackHooksImpl.java

@@ -0,0 +1,36 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.hooks.item.fabric;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+
+public class ItemStackHooksImpl {
+    public static boolean hasCraftingRemainingItem(ItemStack stack) {
+        return stack.getItem().hasCraftingRemainingItem();
+    }
+    
+    public static ItemStack getCraftingRemainingItem(ItemStack stack) {
+        if (!hasCraftingRemainingItem(stack)) return ItemStack.EMPTY;
+        Item item = stack.getItem().getCraftingRemainingItem();
+        return item == null || item == Items.AIR ? ItemStack.EMPTY : item.getDefaultInstance();
+    }
+}

forge/src/main/java/dev/architectury/hooks/item/forge/ItemStackHooksImpl.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.hooks.item.forge;
+
+import net.minecraft.world.item.ItemStack;
+
+public class ItemStackHooksImpl {
+    public static boolean hasCraftingRemainingItem(ItemStack stack) {
+        return stack.hasContainerItem();
+    }
+    
+    public static ItemStack getCraftingRemainingItem(ItemStack stack) {
+        return stack.getContainerItem();
+    }
+}

gradle.properties

@@ -10,7 +10,7 @@ artifact_type=release
 
 archives_base_name=architectury
 archives_base_name_snapshot=architectury-snapshot
-base_version=5.6
+base_version=5.7
 maven_group=dev.architectury
 
 fabric_loader_version=0.14.6

settings.gradle

@@ -3,7 +3,6 @@ pluginManagement {
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
         maven { url "https://files.minecraftforge.net/maven/" }
-        maven { url "https://server.bbkr.space/artifactory/libs-release/" }
         gradlePluginPortal()
     }
 }