imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
shedaniel
2022-04-14 02:14:58 +08:00
parent bfb456f1b4 8d142d6a20
commit a2e2c2f603
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fabric/src/main/java/dev/architectury/registry/menu/fabric/MenuRegistryImpl.java
View File

@@ -25,9 +25,9 @@ import dev.architectury.registry.menu.MenuRegistry.ScreenFactory;
import dev.architectury.registry.menu.MenuRegistry.SimpleMenuTypeFactory;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
import net.fabricmc.fabric.impl.screenhandler.ExtendedScreenHandlerType;
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
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.network.FriendlyByteBuf;
@@ -70,6 +70,6 @@ public class MenuRegistryImpl {
@Environment(EnvType.CLIENT)
public static <H extends AbstractContainerMenu, S extends Screen & MenuAccess<H>> void registerScreenFactory(MenuType<? extends H> type, ScreenFactory<H, S> factory) {
ScreenRegistry.register(type, factory::create);
MenuScreens.register(type, factory::create);
}
}

2
fabric/src/main/resources/fabric.mod.json
View File

@@ -36,7 +36,7 @@
"depends": {
"minecraft": "~1.19-",
"fabricloader": ">=0.13.0",
"fabric": ">=0.44.0"
"fabric": ">=0.50.0"
},
"breaks": {
"optifabric": "<1.13.0"