release: CullLeaves v4.1.0

CHANGELOG.md

@@ -0,0 +1,5 @@
+# Cull Leaves v4.1.0
+- Setup a **multiversion** build environment
+    - CullLeaves will now always be up-to-date on all relevant versions of Minecraft  
+      (Fabric/Forge 1.20.1; Fabric/NeoForge 1.21.1, 1.21.5, 1.21.8, 1.21.10)
+- Migrate to Mojang mappings in preparation for upcoming non-obfuscated releases

build.gradle.kts

@@ -24,13 +24,15 @@ repositories {
     maven("https://maven.nucleoid.xyz/")
 
     // MidnightLib
-    maven("https://maven.midnightdust.eu/snapshots/")
+    maven("https://maven.midnightdust.eu/releases/")
 }
 dependencies {
     minecraft("com.mojang:minecraft:$minecraft")
 
     // MidnightLib
-    modImplementation ("eu.midnightdust:midnightlib:${mod.dep("midnightlib_version")}+${minecraft}-${loader}")
+    val midnightlib = "eu.midnightdust:midnightlib:${mod.dep("midnightlib_version")}+${minecraft}-${loader}"
+    modImplementation(midnightlib)
+    include(midnightlib)
 
     if (loader == "fabric") {
         modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader")}")
@@ -71,21 +73,24 @@ publishMods {
     file = project.tasks.remapJar.get().archiveFile
     dryRun = modrinthToken == null || curseforgeToken == null
 
-    displayName = "${mod.name} ${loader.replaceFirstChar { it.uppercase() }} ${property("mod.mc_title")}-${mod.version}"
+    displayName = "${mod.name} ${mod.version} - ${loader.replaceFirstChar { it.uppercase() }} ${property("mod.mc_title")}"
-    version = mod.version
+    version = "${mod.version}+${property("mod.mc_title")}-${loader}"
     changelog = rootProject.file("CHANGELOG.md").readText()
-    type = BETA
+    type = STABLE
 
     modLoaders.add(loader)
+    if (loader == "fabric") {
+        modLoaders.add("quilt")
+    }
 
     val targets = property("mod.mc_targets").toString().split(' ')
     modrinth {
         projectId = property("publish.modrinth").toString()
         accessToken = modrinthToken
         targets.forEach(minecraftVersions::add)
+        requires("midnightlib")
         if (loader == "fabric") {
             requires("fabric-api")
-            optional("modmenu")
         }
     }
 
@@ -93,41 +98,28 @@ publishMods {
         projectId = property("publish.curseforge").toString()
         accessToken = curseforgeToken.toString()
         targets.forEach(minecraftVersions::add)
+        requires("midnightlib")
         if (loader == "fabric") {
             requires("fabric-api")
-            optional("modmenu")
         }
     }
 
-    github {
+//    github {
-        accessToken = githubToken
+//        accessToken = githubToken
-        repository = "TeamMidnightDust/CullLeaves"
+//        repository = "TeamMidnightDust/CullLeaves"
-        commitish = "multiversion" // This is the branch the release tag will be created from
+//        commitish = "multiversion" // This is the branch the release tag will be created from
-
-        tagName = "v" + properties["mod.version"]
-
-        // Allow the release to be initially created without any files.
-        allowEmptyFiles = true
-    }
-}
-//publishing {
-//    publications {
-//        create<MavenPublication>("mavenJava") {
-//            pom {
-//                groupId = "eu.midnightdust"
-//                artifactId = "midnightlib"
-//                version = project.version
 //
-//                from(components["java"])
+//        tagName = "v" + properties["mod.version"]
-//            }
+//
-//        }
+//        // Allow the release to be initially created without any files.
+//        allowEmptyFiles = true
 //    }
-//}
+}
 publishing {
     repositories {
         maven {
             name = "MidnightDust"
-            url = uri("https://maven.midnightdust.eu/snapshots")
+            url = uri("https://maven.midnightdust.eu/releases")
             credentials(PasswordCredentials::class)
         }
     }

gradle.properties

@@ -29,7 +29,7 @@ deps.neoforge_loader=[VERSIONED]
 deps.neoforge_patch=[VERSIONED]
 
 # Mod dependencies
-deps.midnightlib_version=1.9.0-alpha.1
+deps.midnightlib_version=1.9.0
 deps.sodium_version=mc1.21.8-0.7.0
 
 # Publishing

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

@@ -29,7 +29,7 @@ side = "CLIENT"
 [[dependencies.cullleaves]]
 modId = "minecraft"
 required = true
-versionRange = "[1.21,)"
+versionRange = "${minecraft}"
 ordering = "NONE"
 side = "CLIENT"
 

src/main/resources/architectury.common.json

@@ -1,2 +0,0 @@
-{
-}

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
 
   "depends": {
     "midnightlib": "*",
-    "minecraft": ">=1.20"
+    "minecraft": "${minecraft}"
   },
   "breaks": {
     "sodium": "<0.6.0"

versions/1.20.1-fabric/gradle.properties

@@ -1,7 +1,7 @@
-mod.mc_dep_fabric==1.20.1
+mod.mc_dep_fabric=>=1.20 <=1.20.1
 mod.mc_dep_forgelike=[1.20, 1.20.1]
 mod.mc_title=1.20.1
-mod.mc_targets=1.20.1
+mod.mc_targets=1.20 1.20.1
 
 deps.forge_loader=47.3.0
 deps.neoforge_loader=[UNSUPPORTED]

versions/1.20.1-fabric/src/main/resources/fabric.mod.json

@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "cullleaves",
+  "version": "${version}",
+
+  "name": "Cull Leaves",
+  "description": "Adds culling to leaf blocks, providing a huge performance boost over vanilla.",
+  "authors": [
+    "Motschen",
+    "TeamMidnightDust"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/CullLeaves",
+    "issues": "https://github.com/TeamMidnightDust/CullLeaves/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/cullleaves/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "main": [
+      "eu.midnightdust.cullleaves.CullLeavesClient"
+    ]
+  },
+
+  "depends": {
+    "midnightlib": "*",
+    "minecraft": "${minecraft}"
+  },
+  "breaks": {
+    "sodium": ">=0.6.0"
+  },
+
+  "mixins": [
+    "cullleaves.mixins.json",
+    "cullleaves-fabric.mixins.json"
+  ]
+}

versions/1.20.1-forge/gradle.properties

@@ -1,7 +1,7 @@
-mod.mc_dep_fabric==1.20.1
+mod.mc_dep_fabric=>=1.20 <=1.20.1
 mod.mc_dep_forgelike=[1.20, 1.20.1]
 mod.mc_title=1.20.1
-mod.mc_targets=1.20.1
+mod.mc_targets=1.20 1.20.1
 
 deps.forge_loader=47.3.0
 deps.neoforge_loader=[UNSUPPORTED]

versions/1.20.1-forge/src/main/resources/META-INF/mods.toml

@@ -23,7 +23,7 @@ side = "CLIENT"
 [[dependencies.cullleaves]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.2,)"
+versionRange = "${minecraft}"
 ordering = "NONE"
 side = "CLIENT"
 

versions/1.21.10-fabric/gradle.properties

@@ -1,7 +1,7 @@
 mod.mc_dep_fabric=>=1.21.9
-mod.mc_dep_forgelike=[1.21.10,)
+mod.mc_dep_forgelike=[1.21.9,)
 mod.mc_title=1.21.10
-mod.mc_targets=1.21.9, 1.21.10
+mod.mc_targets=1.21.9 1.21.10
 
 deps.forge_loader=0
 deps.neoforge_loader=21.10.47-beta

versions/1.21.10-neoforge/gradle.properties

@@ -1,7 +1,7 @@
 mod.mc_dep_fabric=>=1.21.9
-mod.mc_dep_forgelike=[1.21.10,)
+mod.mc_dep_forgelike=[1.21.9,)
 mod.mc_title=1.21.10
-mod.mc_targets=1.21.9, 1.21.10
+mod.mc_targets=1.21.9 1.21.10
 
 deps.forge_loader=0
 deps.neoforge_loader=21.10.47-beta

versions/1.21.5-fabric/gradle.properties

@@ -1,7 +1,7 @@
-mod.mc_dep_fabric==1.21.5
+mod.mc_dep_fabric=>=1.21.4 <=1.21.5
-mod.mc_dep_forgelike=[1.21.5]
+mod.mc_dep_forgelike=[1.21.4, 1.21.5]
 mod.mc_title=1.21.5
-mod.mc_targets=1.21.5
+mod.mc_targets=1.21.4 1.21.5
 
 deps.forge_loader=54.0.13
 deps.neoforge_loader=21.4.47-beta

versions/1.21.5-neoforge/gradle.properties

@@ -1,7 +1,7 @@
-mod.mc_dep_fabric==1.21.5
+mod.mc_dep_fabric=>=1.21.4 <=1.21.5
-mod.mc_dep_forgelike=[1.21.5]
+mod.mc_dep_forgelike=[1.21.4, 1.21.5]
 mod.mc_title=1.21.5
-mod.mc_targets=1.21.5
+mod.mc_targets=1.21.4 1.21.5
 
 deps.forge_loader=0
 deps.neoforge_loader=21.5.54-beta

versions/1.21.8-fabric/gradle.properties

@@ -1,7 +1,7 @@
-mod.mc_dep_fabric==1.21.8
+mod.mc_dep_fabric=>=1.21.6 <=1.21.8
-mod.mc_dep_forgelike=[1.21.8]
+mod.mc_dep_forgelike=[1.21.6, 1.21.8]
 mod.mc_title=1.21.8
-mod.mc_targets=1.21.8
+mod.mc_targets=1.21.6 1.21.7 1.21.8
 
 deps.forge_loader=0
 deps.neoforge_loader=21.8.50

versions/1.21.8-neoforge/gradle.properties

@@ -1,7 +1,7 @@
-mod.mc_dep_fabric==1.21.5
+mod.mc_dep_fabric=>=1.21.6 <=1.21.8
-mod.mc_dep_forgelike=[1.21.5]
+mod.mc_dep_forgelike=[1.21.6, 1.21.8]
-mod.mc_title=1.21.5
+mod.mc_title=1.21.8
-mod.mc_targets=1.21.5
+mod.mc_targets=1.21.6 1.21.7 1.21.8
 
 deps.forge_loader=0
 deps.neoforge_loader=21.8.50