Эх сурвалжийг харах

Fix MenuRegistry crash, thanks @OroArmor

shedaniel 4 жил өмнө
parent
commit
e28f43db87

+ 1 - 1
build.gradle

@@ -1,6 +1,6 @@
 plugins {
 plugins {
     id "architectury-plugin" version "1.3.47"
     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 "org.cadixdev.licenser" version "0.5.0"
     id "com.jfrog.bintray" version "1.8.4"
     id "com.jfrog.bintray" version "1.8.4"
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false

+ 1 - 1
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;
 import org.jetbrains.annotations.Nullable;
 
 
 public class MenuRegistryImpl {
 public class MenuRegistryImpl {
-    public static void openMenu(ServerPlayer player, ExtendedMenuProvider provider) {
+    public static void openExtendedMenu(ServerPlayer player, ExtendedMenuProvider provider) {
         player.openMenu(new ExtendedScreenHandlerFactory() {
         player.openMenu(new ExtendedScreenHandlerFactory() {
             @Override
             @Override
             public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) {
             public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) {

+ 3 - 3
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;
 import net.minecraftforge.fml.network.NetworkHooks;
 
 
 public class MenuRegistryImpl {
 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);
         NetworkHooks.openGui(player, provider, provider::saveExtraData);
     }
     }
     
     
-    public static <T extends AbstractContainerMenu> MenuType<T> registerMenuType(SimpleMenuTypeFactory<T> factory) {
+    public static <T extends AbstractContainerMenu> MenuType<T> of(SimpleMenuTypeFactory<T> factory) {
         return new MenuType<>(factory::create);
         return new MenuType<>(factory::create);
     }
     }
     
     
-    public static <T extends AbstractContainerMenu> MenuType<T> registerExtendedMenuType(ExtendedMenuTypeFactory<T> factory) {
+    public static <T extends AbstractContainerMenu> MenuType<T> ofExtended(ExtendedMenuTypeFactory<T> factory) {
         return IForgeContainerType.create(factory::create);
         return IForgeContainerType.create(factory::create);
     }
     }