From e28f43db8739cfed46083d1797ac19c05c24b5dc Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 13 Jan 2021 20:39:26 +0800 Subject: [PATCH] Fix MenuRegistry crash, thanks @OroArmor --- build.gradle | 2 +- .../architectury/registry/fabric/MenuRegistryImpl.java | 2 +- .../architectury/registry/forge/MenuRegistryImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 3d3517c5..ee692f25 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "1.3.47" - id "forgified-fabric-loom" version "0.5.29" apply false + id "forgified-fabric-loom" version "0.5.30" apply false id "org.cadixdev.licenser" version "0.5.0" id "com.jfrog.bintray" version "1.8.4" id "com.matthewprenger.cursegradle" version "1.4.0" apply false diff --git a/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/MenuRegistryImpl.java b/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/MenuRegistryImpl.java index 066954a2..2b66236a 100644 --- a/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/MenuRegistryImpl.java +++ b/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/MenuRegistryImpl.java @@ -40,7 +40,7 @@ import net.minecraft.world.inventory.MenuType; import org.jetbrains.annotations.Nullable; public class MenuRegistryImpl { - public static void openMenu(ServerPlayer player, ExtendedMenuProvider provider) { + public static void openExtendedMenu(ServerPlayer player, ExtendedMenuProvider provider) { player.openMenu(new ExtendedScreenHandlerFactory() { @Override public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) { diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/MenuRegistryImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/MenuRegistryImpl.java index 019cd51d..dc04742a 100644 --- a/forge/src/main/java/me/shedaniel/architectury/registry/forge/MenuRegistryImpl.java +++ b/forge/src/main/java/me/shedaniel/architectury/registry/forge/MenuRegistryImpl.java @@ -35,15 +35,15 @@ import net.minecraftforge.common.extensions.IForgeContainerType; import net.minecraftforge.fml.network.NetworkHooks; public class MenuRegistryImpl { - public static void openMenu(ServerPlayer player, ExtendedMenuProvider provider) { + public static void openExtendedMenu(ServerPlayer player, ExtendedMenuProvider provider) { NetworkHooks.openGui(player, provider, provider::saveExtraData); } - public static MenuType registerMenuType(SimpleMenuTypeFactory factory) { + public static MenuType of(SimpleMenuTypeFactory factory) { return new MenuType<>(factory::create); } - public static MenuType registerExtendedMenuType(ExtendedMenuTypeFactory factory) { + public static MenuType ofExtended(ExtendedMenuTypeFactory factory) { return IForgeContainerType.create(factory::create); }