From cb2989488c3db96f221f82f0513ff8a27477fa1f Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 4 Nov 2025 23:07:54 +0100 Subject: [PATCH] stonecutter: support MC 1.21.5 --- .../java/eu/midnightdust/core/MidnightLib.java | 4 ++++ .../lib/config/MidnightConfigListWidget.java | 15 +++++++++++++-- .../midnightdust/lib/util/PlatformFunctions.java | 8 ++++---- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/midnightdust/core/MidnightLib.java b/src/main/java/eu/midnightdust/core/MidnightLib.java index efe0eaa..a1daf61 100644 --- a/src/main/java/eu/midnightdust/core/MidnightLib.java +++ b/src/main/java/eu/midnightdust/core/MidnightLib.java @@ -98,7 +98,11 @@ public class MidnightLib { if (PlatformFunctions.isClientEnv()) this.onInitializeClient(); } + //? if >= 1.21.6 { @EventBusSubscriber(modid = "midnightlib", value = Dist.CLIENT) + //?} else { + /^@EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) + ^///?} public static class MidnightLibBusEvents { @SubscribeEvent public static void onPostInit(FMLClientSetupEvent event) { diff --git a/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java b/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java index 8455062..421fad2 100644 --- a/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java +++ b/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java @@ -6,8 +6,13 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; +//? if >= 1.21.6 { +import net.minecraft.client.renderer.RenderPipelines; +//?} else { +/*import net.minecraft.client.renderer.RenderType; +*///?} + public class MidnightConfigListWidget extends ContainerObjectSelectionList { public boolean renderHeaderSeparator = true; @@ -26,7 +31,13 @@ public class MidnightConfigListWidget extends ContainerObjectSelectionList= 1.21.6 { + RenderPipelines.GUI_TEXTURED + //?} else { + /*RenderType::guiTextured + *///?} + , this.minecraft.level == null ? Screen.FOOTER_SEPARATOR : Screen.INWORLD_FOOTER_SEPARATOR, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2); } public void addButton(List buttons, Component text, EntryInfo info) { diff --git a/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java b/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java index 9bbe73e..2a36d01 100644 --- a/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java +++ b/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java @@ -43,10 +43,10 @@ public class PlatformFunctions { } public static boolean isClientEnv() { //? if >= 1.21.9 { - /^return FMLEnvironment.getDist().isClient(); - ^///?} else { - return FMLEnvironment.dist.isClient(); - //?} + return FMLEnvironment.getDist().isClient(); + //?} else { + /^return FMLEnvironment.dist.isClient(); + ^///?} } public static boolean isModLoaded(String modid) { return ModList.get().isLoaded(modid);