diff --git a/build.gradle b/build.gradle index 7bd7842..7b7a088 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ plugins { - id 'fabric-loom' version '1.10-SNAPSHOT' apply false - id 'net.neoforged.moddev' version '2.0.88' apply false + id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT' apply false + id 'net.neoforged.moddev' version '2.0.141' apply false } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index 3303eb2..081ffee 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' + id 'net.fabricmc.fabric-loom' id 'maven-publish' } @@ -32,11 +32,11 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" + // mappings loom.officialMojangMappings() + implementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" - // sosium - modImplementation "maven.modrinth:sodium:mc1.21.4-0.6.13-fabric" + // sodium + implementation "maven.modrinth:sodium:mc26.2-0.9.0-fabric" } processResources { @@ -62,7 +62,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 25 } java { @@ -71,8 +71,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } jar { @@ -87,7 +87,7 @@ jar { publishing { publications { create("mavenJava", MavenPublication) { - artifactId = project.mod_id + artifactId = providers.gradleProperty("mod_id").get() from components.java } } diff --git a/fabric/src/main/java/me/andreasmelone/podium/mixin/PreLaunchChecksMixin.java b/fabric/src/main/java/me/andreasmelone/podium/mixin/PreLaunchChecksMixin.java index a092191..11eb6c2 100644 --- a/fabric/src/main/java/me/andreasmelone/podium/mixin/PreLaunchChecksMixin.java +++ b/fabric/src/main/java/me/andreasmelone/podium/mixin/PreLaunchChecksMixin.java @@ -10,7 +10,9 @@ @Mixin(PreLaunchChecks.class) public abstract class PreLaunchChecksMixin { @Shadow(remap = false) - private static boolean isUsingPrismLauncher() { return false; } + private static String getLauncherBrand(){ + return "unknown"; + } ; // removing this check may cause issues outside pojav @Inject( @@ -24,6 +26,6 @@ private static void checkLwjglRuntimeVersionMixin(CallbackInfo ci) { // this means that if somehow, a prism user ends up with podium and the wrong lwjgl version // we don't need to give them a weird crash message because some non-existant method has been // called, but instead give them the default lwjgl mismatch message - if(!isUsingPrismLauncher()) ci.cancel(); + if(!getLauncherBrand().equalsIgnoreCase("prismlauncher")) ci.cancel(); } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 4d66941..ff795c9 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -17,9 +17,9 @@ "podium.mixins.json" ], "depends": { - "fabricloader": ">=0.15", - "minecraft": ">1.20", - "java": ">=17", - "sodium": ">=0.5.13" + "fabricloader": ">=0.19.3", + "minecraft": ">=26.2", + "java": ">=25", + "sodium": ">=0.9.0" } } diff --git a/gradle.properties b/gradle.properties index 288dadf..12beffd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.configuration-cache=true -minecraft_version_range=[1.20.1,) -minecraft_version=1.21.4 +minecraft_version_range=[26.2,) +minecraft_version=26.2 -neo_version=21.5.68-beta -neo_version_range=[21,) +neo_version=26.2.0.1-beta +neo_version_range=[26.2,) neo_loader_version_range=[4,) -fabric_loader_version=0.16.13 +fabric_loader_version=0.19.3 # Mod Properties -mod_version=1.1.0 +mod_version=2.0.0 mod_group_id=me.andreasmelone mod_id=podium @@ -23,6 +23,4 @@ mod_license=MIT mod_authors=AndreasMelone mod_description=Patches Sodium to disable the check for PojavLauncher! -parchment_minecraft_version=1.21 -parchment_mappings_version=2024.11.10 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..5dd3c01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -205,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 924da8a..bc37a69 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -60,7 +60,7 @@ base { } java { - toolchain.languageVersion = JavaLanguageVersion.of(21) + toolchain.languageVersion = JavaLanguageVersion.of(25) withSourcesJar() } @@ -68,10 +68,6 @@ neoForge { // Specify the version of NeoForge to use. version = project.neo_version - parchment { - mappingsVersion = project.parchment_mappings_version - minecraftVersion = project.parchment_minecraft_version - } // This line is optional. Access Transformers are automatically detected // accessTransformers.add('src/main/resources/META-INF/accesstransformer.cfg') @@ -83,13 +79,13 @@ neoForge { client() // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + systemProperty 'neoforge.enabledGameTestNamespaces', providers.gradleProperty("mod_id").get() } server { server() programArgument '--nogui' - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + systemProperty 'neoforge.enabledGameTestNamespaces', providers.gradleProperty("mod_id").get() } // This run config launches GameTestServer and runs all registered gametests, then exits. @@ -97,7 +93,7 @@ neoForge { // The gametest system is also enabled by default for other run configs under the /test command. gameTestServer { type = "gameTestServer" - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + systemProperty 'neoforge.enabledGameTestNamespaces', providers.gradleProperty("mod_id").get() } data { @@ -107,7 +103,7 @@ neoForge { // gameDirectory = project.file('run-data') // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + programArguments.addAll '--mod', providers.gradleProperty("mod_id").get(), '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } // applies to all the run configs above @@ -147,7 +143,7 @@ dependencies { // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" // compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}" // runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}" - implementation "maven.modrinth:sodium:mc1.21.4-0.6.13-neoforge" + implementation "maven.modrinth:sodium:mc26.2-0.9.0-neoforge" // Example mod dependency using a mod jar from ./libs with a flat dir repository // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar @@ -166,10 +162,10 @@ dependencies { // should prob not do it here lol extractJarJarDependency( - "maven.modrinth:sodium:mc1.21.4-0.6.13-neoforge", - "net.caffeinemc.sodium-neoforge-0.6.13+mc1.21.4-service.jar" + "maven.modrinth:sodium:mc26.2-0.9.0-neoforge", + "net.caffeinemc.sodium-neoforge-0.9.0+mc26.2-mod.jar" ) - implementation fileTree(dir: "${buildDir}/extracted-jarjar-cache", include: "*.jar") + implementation fileTree(dir: layout.buildDirectory.dir("extracted-jarjar-cache").get().asFile, include: "*.jar") } // This block of code expands all declared replace properties in the specified resource targets. diff --git a/neoforge/gradle/wrapper/gradle-wrapper.properties b/neoforge/gradle/wrapper/gradle-wrapper.properties index 0d8ab51..94f44f1 100644 --- a/neoforge/gradle/wrapper/gradle-wrapper.properties +++ b/neoforge/gradle/wrapper/gradle-wrapper.properties @@ -1 +1 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip diff --git a/neoforge/src/main/templates/META-INF/neoforge.mods.toml b/neoforge/src/main/templates/META-INF/neoforge.mods.toml index a43b437..f5a0201 100644 --- a/neoforge/src/main/templates/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/templates/META-INF/neoforge.mods.toml @@ -75,7 +75,7 @@ side="CLIENT" [[dependencies."${mod_id}"]] modId = "sodium" type = "required" -versionRange = "[0.5.13,)" +versionRange = "[0.9.0,)" ordering = "BEFORE" side = "CLIENT" diff --git a/settings.gradle b/settings.gradle index e51a38c..a4073c9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } include 'fabric', 'neoforge' \ No newline at end of file