NeoForge 1.21

- Added new method to get Modloader/Platform name in common classes

common/src/main/java/eu/midnightdust/core/config/MidnightConfigExample.java

@@ -1,67 +0,0 @@
-package eu.midnightdust.core.config;
-
-import com.google.common.collect.Lists;
-import eu.midnightdust.lib.config.MidnightConfig;
-
-import java.util.List;
-
-/** MidnightConfig documentation & examples:
- * Thanks for choosing MidnightConfig - the fancy, tiny and lightweight config library.
- * If you want to use the lib in your mod, here are some examples and hints:
- * Every option in a MidnightConfig class has to be public and static, so we can access it from other classes.
- * The config class also has to extend MidnightConfig*/
-
-public class MidnightConfigExample extends MidnightConfig {
-
-    @Comment(category = "text") public static Comment text1;                                    // Comments are rendered like an option without a button and are excluded from the config file
-    @Comment(category = "text", centered = true) public static Comment text2;                   // Centered comments are the same as normal ones - just centered!
-    @Comment(category = "text") public static Comment spacer1;                                  // Comments containing the word "spacer" will just appear as a blank line
-    @Entry(category = "text") public static boolean showInfo = true;                            // Example for a boolean option
-    @Entry(category = "text") public static String name = "Hello World!";                       // Example for a string option, which is in a category!
-    @Entry(category = "text") public static TestEnum testEnum = TestEnum.FABRIC;                // Example for an enum option
-    public enum TestEnum {                                                                      // Enums allow the user to cycle through predefined options
-        QUILT, FABRIC, FORGE
-    }
-    @Entry(category = "numbers") public static int fabric = 16777215;                           // Example for an int option
-    @Entry(category = "numbers") public static double world = 1.4D;                             // Example for a double option
-    @Entry(category = "numbers", min=69,max=420) public static int hello = 420;                 // - The entered number has to be larger than 69 and smaller than 420
-    @Entry(category = "text", isColor = true) public static String titleColor = "#ffffff";      // The isColor property adds a preview box for a hexadecimal color
-    @Entry(category = "text") public static List<String> arrayList = Lists.newArrayList();      // Array String Lists are also supported
-    @Entry(isSlider = true, min = 0, max = 100) public static int intSlider = 35;               // Int fields can also be displayed as a Slider
-    @Entry(isSlider = true, min = 0f, max = 1f) public static float floatSlider = 0.24f;        // And so can floats! Precision defines the amount of decimal places
-    // The name field can be used to specify a custom translation string or plain text
-
-    public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored
-
-    /*
-    The .json language file for your config class could look similar to this:
-    {
-	    "modid.midnightconfig.title":"I am a title",        // "*.midnightconfig.title" defines the title of the screen
-	    "modid.midnightconfig.text1":"I am a comment *u*",  // Translation for the comment "text1" defined in the example config
-	    "modid.midnightconfig.text2":"I am a centered comment (╯°□°）╯︵ ┻━┻",
-	    "modid.midnightconfig.name":"I am a string!",             // Translation for the field "name" defined in the example config
-	    "modid.midnightconfig.name.tooltip":"I am a tooltip uwu \nI am a new line",
-	    // When hovering over the option "showInfo",
-	    // this text will appear as a tooltip.
-	    // "\n" inserts a line break.
-	    "modid.midnightconfig.fabric":"I am an int",
-	    "modid.midnightconfig.world":"I am a double",
-	    "modid.midnightconfig.showInfo":"I am a boolean",
-	    "modid.midnightconfig.hello":"I am a limited int!",
-	    "modid.midnightconfig.testEnum":"I am an enum!",
-	    "modid.midnightconfig.enum.TestEnum.FORGE":"Slow",
-	    "modid.midnightconfig.enum.TestEnum.FABRIC":"Fancy",
-	    "modid.midnightconfig.enum.TestEnum.QUILT":"Fabulous",
-	    "modid.midnightconfig.category.numbers": "Numbers",
-	    "modid.midnightconfig.category.text": "Text",
-	    "modid.midnightconfig.category.sliders": "Sliders"
-    }
-    To initialize the config you have to call "MidnightConfig.init("modid", MidnightConfigExample.class)" in your ModInitializer
-    To get an instance of the config screen you have to call "MidnightConfig.getScreen(parent, "modid");"
-    If you don't use the whole library and therefore not the automatic ModMenu integration, the code in your ModMenu integration class would look something like this:
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> MidnightConfig.getScreen(parent, "modid");
-    }
-    */
-}

common/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java

@@ -3,9 +3,11 @@ package eu.midnightdust.core.config;
 import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.lib.util.PlatformFunctions;
 
+import java.util.Objects;
+
 public class MidnightLibConfig extends MidnightConfig {
     @Entry
-    public static ConfigButton config_screen_list = PlatformFunctions.isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
+    public static ConfigButton config_screen_list = (PlatformFunctions.isModLoaded("modmenu") || Objects.equals(PlatformFunctions.getPlatformName(), "neoforge")) ? ConfigButton.MODMENU : ConfigButton.TRUE;
 
     public enum ConfigButton {
         TRUE,FALSE,MODMENU

common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java

@@ -26,7 +26,7 @@ public class MixinOptionsScreen extends Screen {
     @Unique TextIconButtonWidget button = TextIconButtonWidget.builder(Text.translatable("midnightlib.overview.title"), (
             buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), true)
             .texture(Identifier.of("midnightlib","icon/midnightlib"), 16, 16).dimension(20, 20).build();
-    @Unique boolean shouldShowButton = MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu"));
+    @Unique boolean shouldShowButton = MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu") && PlatformFunctions.getPlatformName() != "neoforge");
 
     protected MixinOptionsScreen(Text title) {super(title);}
     @Inject(at = @At("HEAD"), method = "init")

common/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java

@@ -7,6 +7,11 @@ import net.minecraft.server.command.ServerCommandSource;
 import java.nio.file.Path;
 
 public class PlatformFunctions {
+    @ExpectPlatform
+    public static String getPlatformName() {
+        // Just throw an error, the content should get replaced at runtime.
+        throw new AssertionError();
+    }
     @ExpectPlatform
     public static Path getConfigDirectory() {
         // Just throw an error, the content should get replaced at runtime.

fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java

@@ -10,6 +10,9 @@ import net.minecraft.server.command.ServerCommandSource;
 import java.nio.file.Path;
 
 public class PlatformFunctionsImpl {
+    public static String getPlatformName() {
+        return "fabric";
+    }
     /**
      * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}.
      */

gradle.properties

@@ -14,8 +14,8 @@ modrinth_id=codAaoxh
 fabric_loader_version=0.15.11
 fabric_api_version=0.100.1+1.21
 
-neoforge_version=21.0.0-beta
-yarn_mappings_patch_neoforge_version = 1.20.5+build.3
+neoforge_version=21.0.14-beta
+yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 quilt_loader_version=0.19.0-beta.18
 quilt_fabric_api_version=7.0.1+0.83.0-1.20

neoforge/src/main/java/eu/midnightdust/lib/util/neoforge/PlatformFunctionsImpl.java

@@ -10,6 +10,9 @@ import net.neoforged.fml.loading.FMLPaths;
 import java.nio.file.Path;
 
 public class PlatformFunctionsImpl {
+    public static String getPlatformName() {
+        return "neoforge";
+    }
     /**
      * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}.
      */

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -12,7 +12,9 @@ authors = "TeamMidnightDust, Motschen"
 description = '''
 Common Library for Team MidnightDust's mods.
 '''
-#logoFile = ""
+
+[[mixins]]
+config = "midnightlib.mixins.json"
 
 [[dependencies.midnightlib]]
 modId = "neoforge"

settings.gradle

@@ -11,6 +11,6 @@ include("common")
 include("fabric-like")
 include("fabric")
 //include("quilt")
-//include("neoforge")
+include("neoforge")
 
 rootProject.name = "midnightlib"