diff --git a/build.gradle b/build.gradle index 9140f31..529df2f 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ tasks.withType(ProcessResources).configureEach { ] inputs.properties replaceProperties - filesMatching(['META-INF/mods.toml']) { + filesMatching(['META-INF/neoforge.mods.toml']) { expand replaceProperties + [project: project] } } diff --git a/gradle.properties b/gradle.properties index 56657a0..3b7ef08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ neogradle.subsystems.parchment.mappingsVersion=2024.06.02 minecraft_version=1.21 minecraft_version_range=[1.21,1.22) -neo_version=21.0.30-beta +neo_version=21.0.38-beta neo_version_range=[21.0,) loader_version_range=[2,) @@ -18,7 +18,7 @@ loader_version_range=[2,) mod_id=l2core mod_name=L2Core mod_license=LGPL-2.1 -mod_version=3.0.1 +mod_version=3.0.2-pre3 mod_group_id=dev.xkmc mod_authors=lcy0x1 mod_description=Core Library mod for all L2 mods diff --git a/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerMenu.java b/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerMenu.java index 083ca20..6a9f04f 100644 --- a/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerMenu.java +++ b/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerMenu.java @@ -2,6 +2,7 @@ package dev.xkmc.l2core.base.menu.base; import dev.xkmc.l2serial.util.Wrappers; import net.minecraft.core.RegistryAccess; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; @@ -127,6 +128,10 @@ public class BaseContainerMenu> extends AbstractC return sprite.get(access); } + ResourceLocation getLayoutId() { + return sprite.id(); + } + /** * Binds player inventory. Should not be called by others, but permits override. */ diff --git a/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerScreen.java b/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerScreen.java index da62ffc..ca529e7 100644 --- a/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerScreen.java +++ b/src/main/java/dev/xkmc/l2core/base/menu/base/BaseContainerScreen.java @@ -20,6 +20,10 @@ public abstract class BaseContainerScreen> extend renderTooltip(g, mx, my); } + protected MenuLayoutConfig.ScreenRenderer getRenderer() { + return menu.getLayout().getRenderer(menu.getLayoutId(), this); + } + protected boolean click(int btn) { if (menu.clickMenuButton(menu.player, btn) && Minecraft.getInstance().gameMode != null) { Minecraft.getInstance().gameMode.handleInventoryButtonClick(this.menu.containerId, btn); diff --git a/src/main/java/dev/xkmc/l2core/base/menu/base/MenuLayoutConfig.java b/src/main/java/dev/xkmc/l2core/base/menu/base/MenuLayoutConfig.java index ec65938..d0cadab 100644 --- a/src/main/java/dev/xkmc/l2core/base/menu/base/MenuLayoutConfig.java +++ b/src/main/java/dev/xkmc/l2core/base/menu/base/MenuLayoutConfig.java @@ -207,7 +207,6 @@ public record MenuLayoutConfig(int height, HashMap side, HashMap