feat: support NeoForge on 1.21.9

`@Environment` annotations had to be removed because NeoForge doesn't like them. Also, this brings down file size :)
2025-12-15 17:05:09 +01:00 · 2025-10-01 17:50:18 +02:00
parent 72a403080c
commit 98859fbc28
10 changed files with 12 additions and 28 deletions
--- a/common/src/main/java/eu/midnightdust/core/MidnightLib.java
+++ b/common/src/main/java/eu/midnightdust/core/MidnightLib.java
@@ -3,8 +3,6 @@ package eu.midnightdust.core;
 import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.config.AutoCommand;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +17,6 @@ public class MidnightLib {
    public static final String MOD_ID = "midnightlib";
    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);

-    @Environment(EnvType.CLIENT)
    public static void onInitializeClient() {
        try {
            if (Util.getOperatingSystem() != Util.OperatingSystem.OSX) {
--- a/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java
+++ b/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java
@@ -2,8 +2,6 @@ package eu.midnightdust.core.screen;

 import eu.midnightdust.core.MidnightLib;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -17,7 +15,6 @@ import java.util.Objects;

 import eu.midnightdust.lib.config.MidnightConfigListWidget;

-@Environment(EnvType.CLIENT)
 public class MidnightConfigOverviewScreen extends Screen {

    public MidnightConfigOverviewScreen(Screen parent) {
--- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
+++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
@@ -3,8 +3,6 @@ package eu.midnightdust.lib.config;
 import com.google.gson.*;
 import com.google.gson.stream.*;
 import eu.midnightdust.lib.util.PlatformFunctions;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.client.resource.language.I18n;
@@ -83,7 +81,6 @@ public abstract class MidnightConfig {
        instance.loadValuesFromJson();
    }

-    @Environment(EnvType.CLIENT)
    public void addClientEntry(Field field, EntryInfo info) {
        Entry e = info.entry;
        if (e != null && info.dataType != null) {
@@ -215,11 +212,9 @@ public abstract class MidnightConfig {
    public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
    }

-    @Environment(EnvType.CLIENT)
    public static Screen getScreen(Screen parent, String modid) {
        return configInstances.get(modid).getScreen(parent);
    }
-    @Environment(EnvType.CLIENT)
    public Screen getScreen(Screen parent) {
        return new MidnightConfigScreen(parent, modid);
    }
--- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java
+++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java
@@ -1,7 +1,5 @@
 package eu.midnightdust.lib.config;

-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
@@ -12,7 +10,6 @@ import net.minecraft.text.Text;

 import java.util.List;

-@Environment(EnvType.CLIENT)
 public class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
    public boolean renderHeaderSeparator = true;

--- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfigScreen.java
+++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfigScreen.java
@@ -1,8 +1,6 @@
 package eu.midnightdust.lib.config;

 import com.google.common.collect.Lists;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.tab.GridScreenTab;
@@ -28,7 +26,6 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;

-@Environment(EnvType.CLIENT)
 public class MidnightConfigScreen extends Screen {
    public MidnightConfig instance;
    public final String translationPrefix, modid;
--- a/fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibFabric.java
+++ b/fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibFabric.java
@@ -1,10 +1,11 @@
 package eu.midnightdust.fabric.core;

 import eu.midnightdust.core.MidnightLib;
-import net.fabricmc.api.*;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.DedicatedServerModInitializer;

 public class MidnightLibFabric implements DedicatedServerModInitializer, ClientModInitializer {
-    @Override @Environment(EnvType.CLIENT)
+    @Override
    public void onInitializeClient() {
        MidnightLib.onInitializeClient();
        MidnightLib.registerAutoCommand();
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx3172M

-minecraft_version=1.21.9-rc1
+minecraft_version=1.21.9
 supported_versions=
-yarn_mappings=1.21.9-rc1+build.2
+yarn_mappings=1.21.9+build.1
 enabled_platforms=fabric,neoforge

 archives_base_name=midnightlib
@@ -13,9 +13,9 @@ curseforge_id=488090
 modrinth_id=codAaoxh

 fabric_loader_version=0.17.2
-fabric_api_version=0.133.13+1.21.9
+fabric_api_version=0.133.14+1.21.9

-neoforge_version=21.6.0-beta
+neoforge_version=21.9.3-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4

 mod_menu_version = 9.0.0
--- a/neoforge/src/main/java/eu/midnightdust/lib/util/neoforge/PlatformFunctionsImpl.java
+++ b/neoforge/src/main/java/eu/midnightdust/lib/util/neoforge/PlatformFunctionsImpl.java
@@ -22,7 +22,7 @@ public class PlatformFunctionsImpl {
        return FMLPaths.CONFIGDIR.get();
    }
    public static boolean isClientEnv() {
-        return FMLEnvironment.dist.isClient();
+        return FMLEnvironment.getDist().isClient();
    }
    public static boolean isModLoaded(String modid) {
        return ModList.get().isLoaded(modid);
--- a/neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java
+++ b/neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java
@@ -23,15 +23,15 @@ public class MidnightLibNeoForge {
    public static List<LiteralArgumentBuilder<ServerCommandSource>> commands = new ArrayList<>();

    public MidnightLibNeoForge() {
-        if (FMLEnvironment.dist == Dist.CLIENT) MidnightLib.onInitializeClient();
+        if (FMLEnvironment.getDist() == Dist.CLIENT) MidnightLib.onInitializeClient();
    }

-    @EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+    @EventBusSubscriber(modid = "midnightlib", value = Dist.CLIENT)
    public static class MidnightLibBusEvents {
        @SubscribeEvent
        public static void onPostInit(FMLClientSetupEvent event) {
            ModList.get().forEachModContainer((modid, modContainer) -> {
-                if (MidnightConfig.configClass.containsKey(modid) && !MidnightLib.hiddenMods.contains(modid)) {
+                if (MidnightConfig.configInstances.containsKey(modid) && !MidnightLib.hiddenMods.contains(modid)) {
                    modContainer.registerExtensionPoint(IConfigScreenFactory.class, (minecraftClient, screen) -> MidnightConfig.getScreen(screen, modid));
                }
            });
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,7 @@ pluginManagement {

 include("common")
 include("fabric")
-//include("neoforge")
+include("neoforge")
 //include("quilt")

 rootProject.name = "midnightlib"