Consistent NeoForge spelling, move some dependencies to the version toml

Author: onebeastchris

bootstrap/mod/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricPlatform.java

@@ -41,6 +41,7 @@
 import java.util.Optional;
 
 public class GeyserFabricPlatform implements GeyserModPlatform {
+    
     private final ModContainer mod;
 
     public GeyserFabricPlatform() {

bootstrap/mod/neoforge/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
 }
 
 application {
-    mainClass.set("org.geysermc.geyser.platform.forge.GeyserNeoforgeMain")
+    mainClass.set("org.geysermc.geyser.platform.forge.GeyserNeoForgeMain")
 }
 
 tasks {

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoforgeBootstrap.java bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeBootstrap.java

@@ -39,11 +39,12 @@
 import org.geysermc.geyser.platform.mod.GeyserModUpdateListener;
 
 @Mod(ModConstants.MOD_ID)
-public class GeyserNeoforgeBootstrap extends GeyserModBootstrap {
-    private final GeyserNeoforgePermissionHandler permissionHandler = new GeyserNeoforgePermissionHandler();
+public class GeyserNeoForgeBootstrap extends GeyserModBootstrap {
 
-    public GeyserNeoforgeBootstrap() {
-        super(new GeyserNeoforgePlatform());
+    private final GeyserNeoForgePermissionHandler permissionHandler = new GeyserNeoForgePermissionHandler();
+
+    public GeyserNeoForgeBootstrap() {
+        super(new GeyserNeoForgePlatform());
 
         if (FMLLoader.getDist() == Dist.DEDICATED_SERVER) {
             // Set as an event so we can get the proper IP and port if needed

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoforgeDumpInfo.java bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeDumpInfo.java

@@ -40,10 +40,10 @@
 import java.util.List;
 
 @Getter
-public class GeyserNeoforgeDumpInfo extends BootstrapDumpInfo {
+public class GeyserNeoForgeDumpInfo extends BootstrapDumpInfo {
 
     private final String platformName;
-    private String platformVersion;
+    private final String platformVersion;
     private final String minecraftVersion;
     private final Dist dist;
 
@@ -53,7 +53,7 @@ public class GeyserNeoforgeDumpInfo extends BootstrapDumpInfo {
     private final boolean onlineMode;
     private final List<ModInfo> mods;
 
-    public GeyserNeoforgeDumpInfo(MinecraftServer server) {
+    public GeyserNeoForgeDumpInfo(MinecraftServer server) {
         this.platformName = FMLLoader.launcherHandlerName();
         this.platformVersion = FMLLoader.versionInfo().neoForgeVersion();
         this.minecraftVersion = FMLLoader.versionInfo().mcVersion();

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoforgeMain.java bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgeMain.java

@@ -27,15 +27,15 @@
 
 import org.geysermc.geyser.GeyserMain;
 
-public class GeyserNeoforgeMain extends GeyserMain {
+public class GeyserNeoForgeMain extends GeyserMain {
 
     public static void main(String[] args) {
-        new GeyserNeoforgeMain().displayMessage();
+        new GeyserNeoForgeMain().displayMessage();
     }
 
     @Override
     public String getPluginType() {
-        return "Neoforge";
+        return "NeoForge";
     }
 
     @Override

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoforgePermissionHandler.java bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePermissionHandler.java

@@ -44,7 +44,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class GeyserNeoforgePermissionHandler {
+public class GeyserNeoForgePermissionHandler {
+
     private static final Constructor<?> PERMISSION_NODE_CONSTRUCTOR;
 
     static {
@@ -120,7 +121,7 @@ public boolean hasPermission(@NonNull CommandSourceStack source, @NonNull String
     private void registerNode(String node, PermissionGatherEvent.Nodes event) {
         PermissionNode<Boolean> permissionNode = this.createNode(node);
 
-        // Neoforge likes to crash if you try and register a duplicate node
+        // NeoForge likes to crash if you try and register a duplicate node
         if (!event.getNodes().contains(permissionNode)) {
             event.addNodes(permissionNode);
             this.permissionNodes.put(node, permissionNode);

bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoforgePlatform.java bootstrap/mod/neoforge/src/main/java/org/geysermc/geyser/platform/neoforge/GeyserNeoForgePlatform.java

@@ -38,7 +38,7 @@
 import java.io.InputStream;
 import java.nio.file.Path;
 
-public class GeyserNeoforgePlatform implements GeyserModPlatform {
+public class GeyserNeoForgePlatform implements GeyserModPlatform {
 
     @Override
     public @NonNull PlatformType platformType() {
@@ -57,7 +57,7 @@ public class GeyserNeoforgePlatform implements GeyserModPlatform {
 
     @Override
     public @NonNull BootstrapDumpInfo dumpInfo(@NonNull MinecraftServer server) {
-        return new GeyserNeoforgeDumpInfo(server);
+        return new GeyserNeoForgeDumpInfo(server);
     }
 
     @Override

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java

@@ -64,6 +64,7 @@
 
 @RequiredArgsConstructor
 public abstract class GeyserModBootstrap implements GeyserBootstrap {
+
     @Getter
     private static GeyserModBootstrap instance;
 

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModInjector.java

@@ -47,6 +47,7 @@
 import java.util.List;
 
 public class GeyserModInjector extends GeyserInjector {
+
     private final MinecraftServer server;
     private final GeyserModPlatform platform;
     private DefaultEventLoopGroup eventLoopGroup;

build-logic/build.gradle.kts

@@ -12,11 +12,11 @@ repositories {
 }
 
 dependencies {
-    implementation("net.kyori", "indra-common", "3.1.1")
-    implementation("com.github.johnrengelman", "shadow", "7.1.3-SNAPSHOT")
-    implementation("architectury-plugin", "architectury-plugin.gradle.plugin", "3.4-SNAPSHOT")
-    implementation("dev.architectury.loom", "dev.architectury.loom.gradle.plugin", "1.4-SNAPSHOT")
-    implementation("com.modrinth.minotaur:Minotaur:2.7.5")
+    implementation(libs.indra)
+    implementation(libs.shadow)
+    implementation(libs.architectury.plugin)
+    implementation(libs.architectury.loom)
+    implementation(libs.minotaur)
 
     // Within the gradle plugin classpath, there is a version conflict between loom and some other
     // plugin for databind. This fixes it: minimum 2.13.2 is required by loom.

build-logic/settings.gradle.kts

@@ -0,0 +1,9 @@
+@file:Suppress("UnstableApiUsage")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts

@@ -22,7 +22,7 @@ indra {
 
 tasks {
     processResources {
-        // Spigot, BungeeCord, Velocity, Sponge, Fabric
+        // Spigot, BungeeCord, Velocity, Fabric, NeoForge
         filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json", "fabric.mod.json", "META-INF/mods.toml")) {
             expand(
                 "id" to "geyser",

gradle/libs.versions.toml

@@ -34,6 +34,13 @@ fabric-api = "0.91.2+1.20.4"
 neoforge-minecraft = "20.4.48-beta"
 mixin = "0.8.5"
 
+# plugin versions
+indra = "3.1.1"
+shadow = "7.1.3-SNAPSHOT"
+architectury-plugin = "3.4-SNAPSHOT"
+architectury-loom = "1.4-SNAPSHOT"
+minotaur = "2.7.5"
+
 [libraries]
 base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }
 cumulus = { group = "org.geysermc.cumulus", name = "cumulus", version.ref = "cumulus" }
@@ -108,6 +115,16 @@ math = { group = "org.cloudburstmc.math", name = "immutable", version = "2.0" }
 
 blockstateupdater = { group = "org.cloudburstmc", name = "block-state-updater", version.ref = "blockstateupdater"}
 
+# plugins
+indra = { group = "net.kyori", name  = "indra-common", version.ref = "indra" }
+shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
+architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
+architectury-loom = { group = "dev.architectury.loom", name = "dev.architectury.loom.gradle.plugin", version.ref = "architectury-loom" }
+minotaur = { group = "com.modrinth.minotaur", name = "Minotaur", version.ref = "minotaur" }
+
+[plugins]
+
+
 [bundles]
 jackson = [ "jackson-annotations", "jackson-core", "jackson-dataformat-yaml" ]
 fastutil = [ "fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps" ]

settings.gradle.kts

@@ -18,11 +18,10 @@ dependencyResolutionManagement {
             mavenContent { snapshotsOnly() }
         }
 
-        // Neoforge
+        // NeoForge
         maven("https://maven.neoforged.net/releases") {
             mavenContent { releasesOnly() }
         }
-        maven("https://maven.neoforged.net/")
 
         // Minecraft
         maven("https://libraries.minecraft.net") {