Merge remote-tracking branch 'origin/1.20.2' into 1.20.3

forge/src/main/java/dev/architectury/core/fluid/forge/imitator/ArchitecturyFluidAttributesForge.java

@@ -24,6 +24,7 @@
 import dev.architectury.hooks.fluid.forge.FluidStackHooksForge;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
@@ -40,7 +41,6 @@
 import net.minecraftforge.common.SoundAction;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidType;
-import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
@@ -55,7 +55,7 @@ class ArchitecturyFluidAttributesForge extends FluidType {
     public ArchitecturyFluidAttributesForge(Properties builder, Fluid fluid, ArchitecturyFluidAttributes attributes) {
         super(addArchIntoBuilder(builder, attributes));
         this.attributes = attributes;
-        this.defaultTranslationKey = Util.makeDescriptionId("fluid", ForgeRegistries.FLUIDS.getKey(fluid));
+        this.defaultTranslationKey = Util.makeDescriptionId("fluid", BuiltInRegistries.FLUID.getKey(fluid));
     }
 
     private static Properties addArchIntoBuilder(Properties builder, ArchitecturyFluidAttributes attributes) {

forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java

@@ -19,10 +19,10 @@
 
 package dev.architectury.fluid.forge;
 
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.function.Function;
@@ -54,7 +54,7 @@ public FluidStack create(Supplier<Fluid> fluid, long amount, CompoundTag tag) {
 
     @Override
     public Supplier<Fluid> getRawFluidSupplier(FluidStack object) {
-        return ForgeRegistries.FLUIDS.getDelegateOrThrow(object.getRawFluid());
+        return BuiltInRegistries.FLUID.getHolderOrThrow(BuiltInRegistries.FLUID.getResourceKey(object.getRawFluid()).orElseThrow());
     }
 
     @Override

neoforge/src/main/java/dev/architectury/registry/menu/forge/MenuRegistryImpl.java

@@ -0,0 +1,55 @@
+/*
+ * 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.registry.menu.forge;
+
+import dev.architectury.registry.menu.ExtendedMenuProvider;
+import dev.architectury.registry.menu.MenuRegistry.ExtendedMenuTypeFactory;
+import dev.architectury.registry.menu.MenuRegistry.ScreenFactory;
+import dev.architectury.registry.menu.MenuRegistry.SimpleMenuTypeFactory;
+import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.MenuAccess;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.flag.FeatureFlags;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
+import net.neoforged.neoforge.common.extensions.IMenuTypeExtension;
+import net.neoforged.neoforge.network.NetworkHooks;
+
+public class MenuRegistryImpl {
+    public static void openExtendedMenu(ServerPlayer player, ExtendedMenuProvider provider) {
+        NetworkHooks.openScreen(player, provider, provider::saveExtraData);
+    }
+
+    public static <T extends AbstractContainerMenu> MenuType<T> of(SimpleMenuTypeFactory<T> factory) {
+        return new MenuType<>(factory::create, FeatureFlags.VANILLA_SET);
+    }
+
+    public static <T extends AbstractContainerMenu> MenuType<T> ofExtended(ExtendedMenuTypeFactory<T> factory) {
+        return IMenuTypeExtension.create(factory::create);
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static <H extends AbstractContainerMenu, S extends Screen & MenuAccess<H>> void registerScreenFactory(MenuType<? extends H> type, ScreenFactory<H, S> factory) {
+        MenuScreens.register(type, factory::create);
+    }
+}