Minecraft 1.20.5 backport

Author: LostLuma

build-logic/src/main/kotlin/dynamic_fps.base.gradle.kts

@@ -24,7 +24,7 @@ if (project.hasProperty("loom.platform")) {
 tasks.withType<ProcessResources> {
     inputs.property("version", modVersion)
 
-    filesMatching(listOf("fabric.mod.json", "mods.toml", "neoforge.mods.toml", "quilt.mod.json")) {
+    filesMatching(listOf("fabric.mod.json", "META-INF/mods.toml", "META-INF/neoforge.mods.toml", "quilt.mod.json")) {
         expand(inputs.properties)
     }
 }

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
+enabled_platforms=fabric,neoforge

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"
 quilt_standard_libraries = "8.0.0-alpha.12+1.20.4"

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);
 	}
 }

platforms/fabric/build.gradle

@@ -85,13 +85,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,15 +102,13 @@ publishMods {
 		accessToken = providers.environmentVariable("MODRINTH_SECRET")
 		projectId = "LQ3K71Q1"
 
-		/*
 		minecraftVersionRange {
 			start = project.property("minecraft_version_min").toString()
 			end = project.property("minecraft_version_max").toString()
 
 			includeSnapshots = true
 		}
-		*/
-		minecraftVersions.add(project.property("minecraft_version_min").toString())
+		// minecraftVersions.add(project.property("minecraft_version_min").toString())
 
 		requires("fabric-api")
 		optional("cloth-config", "modmenu")

platforms/fabric/gradle.properties

@@ -1,2 +1,2 @@
 loom.platform=fabric
-supported_platforms=fabric
+supported_platforms=fabric,quilt

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": "*"

platforms/forge/build.gradle

@@ -85,13 +85,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
@@ -103,14 +101,12 @@ 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("modmenu")
+		optional("cloth-config")
 	}
 }

platforms/neoforge/build.gradle

@@ -90,13 +90,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
@@ -108,14 +106,12 @@ 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("modmenu")
+		optional("cloth-config")
 	}
 }

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"
 

platforms/quilt/build.gradle

@@ -83,13 +83,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
@@ -102,15 +100,13 @@ publishMods {
 		accessToken = providers.environmentVariable("MODRINTH_SECRET")
 		projectId = "LQ3K71Q1"
 
-		/*
 		minecraftVersionRange {
 			start = project.property("minecraft_version_min").toString()
 			end = project.property("minecraft_version_max").toString()
 
 			includeSnapshots = true
 		}
-		*/
-		minecraftVersions.add(project.property("minecraft_version_min").toString())
+		// minecraftVersions.add(project.property("minecraft_version_min").toString())
 
 		requires("qsl")
 		optional("cloth-config", "modmenu")

settings.gradle.kts

@@ -19,4 +19,4 @@ include(":platforms:common")
 include(":platforms:fabric")
 // include(":platforms:forge")
 include(":platforms:neoforge")
-include(":platforms:quilt")
+// include(":platforms:quilt")