Merge remote-tracking branch 'architectury/1.18.2' into 1.19

# Conflicts:
#	gradle.properties

common/src/main/java/dev/architectury/event/events/client/ClientGuiEvent.java

@@ -28,6 +28,7 @@ import dev.architectury.hooks.client.screen.ScreenAccess;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 
 import java.util.List;
 
@@ -58,6 +59,14 @@ public interface ClientGuiEvent {
      * @see ScreenRenderPost#render(Screen, PoseStack, int, int, float)
      */
     Event<ScreenRenderPost> RENDER_POST = EventFactory.createLoop();
+    /**
+     * @see ContainerScreenRenderBackground#render(AbstractContainerScreen, PoseStack, int, int, float)
+     */
+    Event<ContainerScreenRenderBackground> RENDER_CONTAINER_BACKGROUND = EventFactory.createLoop();
+    /**
+     * @see ContainerScreenRenderForeground#render(AbstractContainerScreen, PoseStack, int, int, float)
+     */
+    Event<ContainerScreenRenderForeground> RENDER_CONTAINER_FOREGROUND = EventFactory.createLoop();
     /**
      * @see SetScreen#modifyScreen(Screen)
      */
@@ -145,6 +154,36 @@ public interface ClientGuiEvent {
         void render(Screen screen, PoseStack matrices, int mouseX, int mouseY, float delta);
     }
     
+    @Environment(EnvType.CLIENT)
+    interface ContainerScreenRenderBackground {
+        /**
+         * Invoked after a container screen's background are rendered.
+         * Equivalent to Forge's {@code ContainerScreenEvent.DrawBackground} event.
+         *
+         * @param screen   The screen.
+         * @param matrices The pose stack.
+         * @param mouseX   The scaled x-coordinate of the mouse cursor.
+         * @param mouseY   The scaled y-coordinate of the mouse cursor.
+         * @param delta    The current tick delta.
+         */
+        void render(AbstractContainerScreen<?> screen, PoseStack matrices, int mouseX, int mouseY, float delta);
+    }
+    
+    @Environment(EnvType.CLIENT)
+    interface ContainerScreenRenderForeground {
+        /**
+         * Invoked after a screen has finished rendering most of the foreground, but before any floating widgets are rendered.
+         * Equivalent to Forge's {@code ContainerScreenEvent.DrawForeground} event.
+         *
+         * @param screen   The screen.
+         * @param matrices The pose stack.
+         * @param mouseX   The scaled x-coordinate of the mouse cursor.
+         * @param mouseY   The scaled y-coordinate of the mouse cursor.
+         * @param delta    The current tick delta.
+         */
+        void render(AbstractContainerScreen<?> screen, PoseStack matrices, int mouseX, int mouseY, float delta);
+    }
+    
     @Environment(EnvType.CLIENT)
     interface SetScreen {
         /**

common/src/main/java/dev/architectury/hooks/fluid/FluidBucketHooks.java

@@ -0,0 +1,38 @@
+/*
+ * 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.fluid;
+
+import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.level.material.Fluid;
+
+public final class FluidBucketHooks {
+    /**
+     * Returns the fluid contained in the bucket.
+     * This requires special handling since forge defers the fiuid.
+     *
+     * @param item the bucket item
+     * @return the fluid contained in the bucket
+     */
+    @ExpectPlatform
+    public static Fluid getFluid(BucketItem item) {
+        throw new AssertionError();
+    }
+}

common/src/main/java/dev/architectury/registry/menu/MenuRegistry.java

@@ -97,7 +97,9 @@ public final class MenuRegistry {
      * @param factory A functional interface to create the {@link MenuType} from an id (Integer) and inventory
      * @param <T>     The type of {@link AbstractContainerMenu} that handles the logic for the {@link MenuType}
      * @return The {@link MenuType} for your {@link AbstractContainerMenu}
+     * @deprecated Use the constructor directly.
      */
+    @Deprecated(forRemoval = true)
     @ExpectPlatform
     public static <T extends AbstractContainerMenu> MenuType<T> of(SimpleMenuTypeFactory<T> factory) {
         throw new AssertionError();
@@ -154,6 +156,7 @@ public final class MenuRegistry {
      *
      * @param <T> The {@link AbstractContainerMenu} type
      */
+    @Deprecated(forRemoval = true)
     @FunctionalInterface
     public interface SimpleMenuTypeFactory<T extends AbstractContainerMenu> {
         /**