Port to 1.21.1

Author: ekulxam

.gitignore

@@ -39,3 +39,4 @@ replay_*.log
 *.hprof
 *.jfr
 /src/main/generated/.cache
+versions/*/src/main/generated/.cache

LICENSE

@@ -1,18 +1,21 @@
-The MIT-0 License (MIT-0)
+MIT License
 
-Copyright (c) 2024-present ekulxam
+Copyright (c) 23:25 UTC 17 Nov 2025-present ekulxam
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
-furnished to do so.
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE-former

@@ -0,0 +1,18 @@
+The MIT-0 License (MIT-0)
+
+Copyright (c) 2024-23:24 UTC 17 Nov 2025 ekulxam
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

build.gradle.kts

@@ -1,3 +1,6 @@
+import java.io.BufferedReader
+import java.io.FileReader
+
 plugins {
     id("fabric-loom") version "1.13-SNAPSHOT"
     id("maven-publish")
@@ -48,8 +51,9 @@ dependencies {
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("deps.fabric_api")}")
 
-    bundleAPI("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.property("deps.cca")}")
-    bundleAPI("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.property("deps.cca")}")
+    val ccaPackage = if(stonecutter.eval(stonecutter.current.version, ">=1.20.5"))  "org.ladysnake" else "dev.onyxstudios"
+    bundleAPI("${ccaPackage}.cardinal-components-api:cardinal-components-base:${project.property("deps.cca")}")
+    bundleAPI("${ccaPackage}.cardinal-components-api:cardinal-components-entity:${project.property("deps.cca")}")
 
     modApi("dev.isxander:yet-another-config-lib:${project.property("deps.yacl")}")
     modApi("com.terraformersmc:modmenu:${project.property("deps.modmenu")}")
@@ -61,6 +65,13 @@ dependencies {
     compat("maven.modrinth:midnightlib:${project.property("deps.midnightlib")}")
 }
 
+stonecutter {
+    replacements.string {
+        direction = eval(current.version, ">=1.20.5")
+        replace("dev.onyxstudios", "org.ladysnake")
+    }
+}
+
 fletchingTable {
     mixins.create("main") {
         // Default matches the default value in the annotation
@@ -87,6 +98,29 @@ tasks.processResources {
     }
 }
 
+tasks.named("build") {
+    finalizedBy("autoVersionChangelog")
+}
+
+tasks.register("autoVersionChangelog") {
+    doLast {
+        val changelog = File("changelog.md")
+        val reader = BufferedReader(FileReader(changelog))
+        val lines = reader.readLines().toMutableList()
+        val title = "Laseredstone ${project.property("mod_version")}"
+        lines[0] = title
+        changelog.bufferedWriter().use { writer ->
+            for (i in 0..<lines.size) {
+                writer.write(lines[i])
+                if (i != lines.size - 1) {
+                    writer.newLine()
+                }
+            }
+        }
+        println("Changelog header successfully replaced as $title")
+    }
+}
+
 loom {
     runConfigs.all {
         ideConfigGenerated(true)

changelog.md

@@ -0,0 +1,4 @@
+Shield Surf 1.0.2
+- Fix [#1](https://github.com/ekulxam/shield_surf/issues/1)
+- Port to stonecutter (multiversion)
+- Port to 1.21.1 (closes [#3](https://github.com/ekulxam/shield_surf/issues/3))

gradle.properties

@@ -2,8 +2,8 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 # Fabric Properties
-loader_version=0.16.9
+loader_version=0.17.3
 # Mod Properties
-mod_version=1.0.1+1.20.1
+mod_version=1.0.2
 maven_group=survivalblock.shield_surf
 archives_base_name=shield_surf

settings.gradle.kts

@@ -18,7 +18,7 @@ stonecutter {
 
     // Subproject configuration
     create(rootProject) {
-        versions("1.20.1")
+        versions("1.20.1", "1.21.1")
         vcsVersion = "1.20.1"
     }
 }

src/main/java/survivalblock/shield_surf/client/render/ProjectedShieldEntityRenderer.java

@@ -18,7 +18,8 @@
 
 public class ProjectedShieldEntityRenderer extends EntityRenderer<ProjectedShieldEntity> {
 
-    public static final Identifier TEXTURE = new Identifier("textures/entity/shield_base_nopattern.png");
+    public static final Identifier TEXTURE = /*? >=1.21.1 {*/ /*Identifier.ofVanilla *//*?} else {*/ new Identifier /*?}*/("textures/entity/shield_base_nopattern.png");
+
     public ProjectedShieldEntityRenderer(EntityRendererFactory.Context context) {
         super(context);
     }

src/main/java/survivalblock/shield_surf/client/render/ShieldboardEntityRenderer.java

@@ -19,12 +19,11 @@
 
 @Environment(value= EnvType.CLIENT)
 public class ShieldboardEntityRenderer extends EntityRenderer<ShieldboardEntity> {
-    public static final Identifier TEXTURE = new Identifier("textures/entity/shield_base_nopattern.png");
-    // private final ShieldEntityModel modelShield;
+
+    public static final Identifier TEXTURE = /*? >=1.21.1 {*/ /*Identifier.ofVanilla *//*?} else {*/ new Identifier /*?}*/("textures/entity/shield_base_nopattern.png");
 
     public ShieldboardEntityRenderer(EntityRendererFactory.Context context) {
         super(context);
-        // this.modelShield = new ShieldEntityModel(context.getPart(EntityModelLayers.SHIELD));
     }
 
     @Override

src/main/java/survivalblock/shield_surf/common/ShieldSurf.java

@@ -20,6 +20,7 @@ public class ShieldSurf implements ModInitializer {
 
 	@Override
 	public void onInitialize() {
+        //? if <1.21
 		ShieldSurfEnchantments.init();
 		ShieldSurfEntityTypes.init();
 		ShieldSurfSoundEvents.init();
@@ -35,7 +36,7 @@ public void onInitialize() {
 	}
 
 	public static Identifier id(String value) {
-		return new Identifier(MOD_ID, value);
+		return /*? >=1.21.1 {*/ /*Identifier.of *//*?} else {*/ new Identifier /*?}*/(MOD_ID, value);
 	}
 
 	@SuppressWarnings("UnusedReturnValue")