[mr] [cf] version cleanup, 1.21.11 fix

Author: AlgorithmLX

build.gradle.kts

@@ -149,26 +149,6 @@ stonecutter {
     }
 }
 
-val buildAndCollect = project.tasks.register<Copy>("buildAndCollect") {
-    group = "build"
-    from(project.tasks.named<Jar>("remapJar").map { it.archiveFile.get().asFile })
-    into(project.rootProject.layout.buildDirectory.file("../merged"))
-
-    dependsOn("build")
-}
-
-if (stonecutter.current.isActive) {
-    project.rootProject.tasks.register("buildActive") {
-        group = "project"
-        dependsOn(buildAndCollect)
-    }
-
-    project.rootProject.tasks.register("runActive") {
-        group = "project"
-        dependsOn(project.tasks.named("runClient"))
-    }
-}
-
 publishMods {
     dryRun = false
 

gradle.properties

@@ -1,5 +1,5 @@
 # Done to increase the memory available to Gradle.
-org.gradle.jvmargs=-Xmx6G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 # Mod properties
 kotlinVersion=2.3.0

settings.gradle.kts

@@ -21,7 +21,7 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.8+"
+    id("dev.kikugie.stonecutter") version "0.9+"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

src/main/kotlin/init/post/PostBlock.kt

@@ -130,12 +130,9 @@ data class PostBlock(
         val displayName: String = ""
     ) {
         fun asBlockBehaviourProperties(): BlockBehaviour.Properties = BlockBehaviour.Properties.of().apply {
-            // noCollission
-            //? if >1.21.1 {
-            if (noCollision) this.noCollision()
-            //?} else {
-            /*if (noCollision) this.noCollission()
-            *///?}
+            if (noCollision)
+                //$ if >1.21.1 'this.noCollision()' else 'this.noCollission()'
+                this.noCollision()
             if (noOcclusion) this.noOcclusion()
             if (friction != 0F) this.friction(friction)
             if (speedFactor != 0F) this.speedFactor(speedFactor)

src/main/kotlin/util/MigrationUtil.kt

@@ -1,12 +1,8 @@
 package com.algorithmlx.dimore.util
 
-//? if >1.21.10 {
+//$ if >1.21.10 'import net.minecraft.resources.Identifier' else 'import net.minecraft.resources.ResourceLocation'
 import net.minecraft.resources.Identifier
-//?} else {
-/*import net.minecraft.resources.ResourceLocation
-*///?}
 
-//? if >1.21.10 {
-typealias ResLoc = Identifier
-//?} else
-//typealias ResLoc = ResourceLocation
+typealias ResLoc =
+    //$ if >1.21.10 'Identifier' else 'ResourceLocation'
+    Identifier

versions/1.21.1-fabric/nopub

@@ -0,0 +1 @@
+

versions/1.21.1-neoforge/nopub

@@ -0,0 +1 @@
+