Port to 1.20.5

Author: Mrbysco

build.gradle

@@ -8,7 +8,7 @@ plugins {
 subprojects {
     apply plugin: 'java'
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
     java.withSourcesJar()
 
     jar {
@@ -47,7 +47,7 @@ subprojects {
 
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = 'UTF-8'
-        it.options.getRelease().set(17)
+        it.options.getRelease().set(21)
     }
 
     processResources {
@@ -63,3 +63,11 @@ subprojects {
         enabled = false
     }
 }
+
+// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
+    }
+}

common/src/main/java/com/mrbysco/dailydadserver/platform/services/IPlatformHelper.java

@@ -23,7 +23,7 @@ public interface IPlatformHelper {
 	/**
 	 * Gets a joke from the online dadabase (Asynchronous)
 	 *
-	 * @param resolved
+	 * @param resolved The callback to be called when the joke is resolved
 	 */
 	void getJokeAsync(JokeResolved resolved);
 }

common/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Daily Dad Server Resources",
-        "pack_format": 22
+        "pack_format": 32
     }
 }

fabric/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'idea'
     id 'maven-publish'
-    id 'fabric-loom' version '1.3-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'net.darkhax.curseforgegradle'
     id 'com.modrinth.minotaur'
 }
@@ -104,7 +104,7 @@ if (System.getenv().CURSEFORGE_KEY) {
         mainFile.releaseType = 'beta'
         mainFile.addGameVersion "Fabric"
         mainFile.addGameVersion "${minecraft_version}"
-        mainFile.addGameVersion "Java 17"
+        mainFile.addGameVersion "Java 21"
 
         mainFile.changelog = file("$project.rootDir/changelog.md")
         mainFile.changelogType = 'markdown'

fabric/src/main/resources/dailydad_server.fabric.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8.4",
   "package": "com.mrbysco.dailydadserver.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "PlayerListMixin"
   ],

fabric/src/main/resources/fabric.mod.json

@@ -26,10 +26,10 @@
     "dailydad_server.fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.15.3",
-    "minecraft": "~1.20.4",
-    "java": ">=17",
+    "fabricloader": ">=0.15.10",
+    "minecraft": "~1.20.5",
+    "java": ">=21",
     "fabric-api": "*",
-    "cloth-config": ">=12"
+    "cloth-config": ">=14"
   }
 }

gradle.properties

@@ -3,16 +3,16 @@ version=1.6.0
 group=com.mrbysco.dailydadserver
 
 # Common
-minecraft_version=1.20.4
+minecraft_version=1.20.5
 
 # NeoForge
-neo_version=20.4.69-beta
+neo_version=20.5.0-beta
 
 # Fabric
-fabric_version=0.92.0+1.20.4
-fabric_loader_version=0.15.3
-cloth_config_version=13.0.114
-mod_menu_version=9.0.0
+fabric_version=0.97.5+1.20.5
+fabric_loader_version=0.15.10
+cloth_config_version=14.0.125
+mod_menu_version=10.0.0-alpha.3
 
 # Mod options
 mod_name=DailyDad-Server

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.72'
+    id 'net.neoforged.gradle.userdev' version '7.0.107'
     id 'net.darkhax.curseforgegradle'
     id 'com.modrinth.minotaur'
 }
@@ -102,7 +102,7 @@ if (System.getenv().CURSEFORGE_KEY) {
         mainFile.releaseType = 'release'
         mainFile.addGameVersion "NeoForge"
         mainFile.addGameVersion "${minecraft_version}"
-        mainFile.addGameVersion "Java 17"
+        mainFile.addGameVersion "Java 21"
 
         mainFile.changelog = file("$project.rootDir/changelog.md")
         mainFile.changelogType = 'markdown'

neoforge/build.gradle

@@ -3,33 +3,28 @@
 import com.mrbysco.dailydadserver.commands.ForgeDadCommands;
 import com.mrbysco.dailydadserver.config.JokeConfig;
 import com.mrbysco.dailydadserver.handler.JokeHandler;
+import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
-import net.neoforged.fml.IExtensionPoint;
-import net.neoforged.fml.IExtensionPoint.DisplayTest;
-import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig.Type;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
-import net.neoforged.neoforge.network.NetworkConstants;
 
 @Mod(Constants.MOD_ID)
 public class DailyDadNeoForge {
 
-	public DailyDadNeoForge(IEventBus eventBus) {
-		ModLoadingContext.get().registerConfig(Type.COMMON, JokeConfig.serverSpec);
-		eventBus.register(JokeConfig.class);
+	public DailyDadNeoForge(IEventBus eventBus, Dist dist, ModContainer container) {
+		if (dist.isDedicatedServer()) {
+			container.registerConfig(Type.COMMON, JokeConfig.serverSpec);
+			eventBus.register(JokeConfig.class);
 
-		NeoForge.EVENT_BUS.addListener(this::onCommandRegister);
-		NeoForge.EVENT_BUS.addListener(this::onLoggedIn);
-		NeoForge.EVENT_BUS.addListener(this::onPlayerRespawn);
-
-		//Make sure the mod being absent on client side does not cause the server to be displayed as incompatible
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () ->
-				new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY,
-						(remoteVersionString, networkBool) -> true));
+			NeoForge.EVENT_BUS.addListener(this::onCommandRegister);
+			NeoForge.EVENT_BUS.addListener(this::onLoggedIn);
+			NeoForge.EVENT_BUS.addListener(this::onPlayerRespawn);
+		}
 	}
 
 	public void onLoggedIn(PlayerLoggedInEvent event) {

neoforge/src/main/java/com/mrbysco/dailydadserver/DailyDadNeoForge.java

@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-public class ForgePlatformHelper implements IPlatformHelper {
+public class NeoForgePlatformHelper implements IPlatformHelper {
 
 	@Override
 	public List<? extends String> getInternalDadabase() {

neoforge/src/main/java/com/mrbysco/dailydadserver/platform/ForgePlatformHelper.java renamed to neoforge/src/main/java/com/mrbysco/dailydadserver/platform/NeoForgePlatformHelper.java

@@ -17,6 +17,6 @@ Sometimes he laughs at them
 [[dependencies.dailydad_server]]
 modId="minecraft"
 type="REQUIRED"
-versionRange="[1.20.4,1.21)"
+versionRange="[1.20.5,1.21)"
 ordering="NONE"
 side="BOTH"

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

@@ -1 +1 @@
-com.mrbysco.dailydadserver.platform.ForgePlatformHelper
+com.mrbysco.dailydadserver.platform.NeoForgePlatformHelper

neoforge/src/main/resources/META-INF/services/com.mrbysco.dailydadserver.platform.services.IPlatformHelper

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
 // This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606)