diff --git a/gradle.properties b/gradle.properties index b09ac9ee..dd9ed9d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,9 +10,9 @@ maven_group = juliand665 archives_name = dynamic-fps # File naming version -minecraft_version = 1.21.0 +minecraft_version = 1.20.5 # Version for publishing -minecraft_version_min = 1.21 -minecraft_version_max = 1.21 +minecraft_version_min = 1.20.5 +minecraft_version_max = 1.20.6 enabled_platforms=fabric,neoforge,quilt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31be607d..f62a520e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -minecraft = "1.21" +minecraft = "1.20.5" # Platform libraries fabric_loader = "0.15.10" -fabric_api = "0.100.1+1.21" +fabric_api = "0.97.4+1.20.5" forge = "1.20.4-49.0.30" -neoforge = "21.0.0-beta" +neoforge = "20.5.21-beta" quilt_loader = "0.25.0" diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java b/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java index 45e40b8d..c9f0ab50 100644 --- a/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java +++ b/platforms/common/src/main/java/dynamic_fps/impl/util/ResourceLocations.java @@ -4,6 +4,6 @@ public class ResourceLocations { public static ResourceLocation of(String namespace, String path) { - return ResourceLocation.fromNamespaceAndPath(namespace, path); + return new ResourceLocation(namespace, path); } } diff --git a/platforms/fabric/build.gradle b/platforms/fabric/build.gradle index 79505109..c8f4be2f 100644 --- a/platforms/fabric/build.gradle +++ b/platforms/fabric/build.gradle @@ -87,13 +87,11 @@ publishMods { accessToken = providers.environmentVariable("CURSEFORGE_SECRET") projectId = "335493" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) clientRequired = true serverRequired = false @@ -106,13 +104,11 @@ publishMods { accessToken = providers.environmentVariable("MODRINTH_SECRET") projectId = "LQ3K71Q1" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) requires("fabric-api") optional("cloth-config", "modmenu") diff --git a/platforms/fabric/src/main/resources/fabric.mod.json b/platforms/fabric/src/main/resources/fabric.mod.json index 4d0ecdcb..0d623a42 100644 --- a/platforms/fabric/src/main/resources/fabric.mod.json +++ b/platforms/fabric/src/main/resources/fabric.mod.json @@ -70,7 +70,10 @@ }, "depends": { "fabricloader": ">=0.15.10", - "minecraft": ">=1.21.0-alpha.24.20.a", + "minecraft": [ + "1.20.5", + "1.20.6" + ], "mixinextras": ">=0.3.2", "fabric-resource-loader-v0": "*", "fabric-lifecycle-events-v1": "*" diff --git a/platforms/forge/build.gradle b/platforms/forge/build.gradle index b7e66a3e..379edf43 100644 --- a/platforms/forge/build.gradle +++ b/platforms/forge/build.gradle @@ -86,13 +86,11 @@ publishMods { accessToken = providers.environmentVariable("CURSEFORGE_SECRET") projectId = "335493" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) clientRequired = true serverRequired = false @@ -104,13 +102,11 @@ publishMods { accessToken = providers.environmentVariable("MODRINTH_SECRET") projectId = "LQ3K71Q1" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) optional("cloth-config") } diff --git a/platforms/neoforge/build.gradle b/platforms/neoforge/build.gradle index fce0c47e..f6ba30c8 100644 --- a/platforms/neoforge/build.gradle +++ b/platforms/neoforge/build.gradle @@ -91,13 +91,11 @@ publishMods { accessToken = providers.environmentVariable("CURSEFORGE_SECRET") projectId = "335493" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) clientRequired = true serverRequired = false @@ -109,13 +107,11 @@ publishMods { accessToken = providers.environmentVariable("MODRINTH_SECRET") projectId = "LQ3K71Q1" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) optional("cloth-config") } diff --git a/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 04dedd3d..32003217 100644 --- a/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/platforms/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -85,7 +85,7 @@ file="META-INF/accesstransformer.cfg" [[dependencies.dynamic_fps]] modId = "minecraft" mandatory = true -versionRange = "[1.21.0,)" +versionRange = "[1.20.5,1.20.6]" ordering = "NONE" side = "CLIENT" diff --git a/platforms/quilt/build.gradle b/platforms/quilt/build.gradle index 418984ed..114a5c81 100644 --- a/platforms/quilt/build.gradle +++ b/platforms/quilt/build.gradle @@ -88,13 +88,11 @@ publishMods { accessToken = providers.environmentVariable("CURSEFORGE_SECRET") projectId = "335493" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) clientRequired = true serverRequired = false @@ -107,13 +105,11 @@ publishMods { accessToken = providers.environmentVariable("MODRINTH_SECRET") projectId = "LQ3K71Q1" - /* minecraftVersionRange { start = project.property("minecraft_version_min").toString() end = project.property("minecraft_version_max").toString() } - */ - minecraftVersions.add(project.property("minecraft_version_min").toString()) + // minecraftVersions.add(project.property("minecraft_version_min").toString()) requires("qsl") optional("cloth-config", "modmenu")