Merge 1.20.1, 1.21.1 and 1.21.4 into a single branch

build.gradle.kts

@@ -0,0 +1,107 @@
+import com.modrinth.minotaur.dependencies.ModDependency
+plugins {
+    id("fabric-loom") version "1.9-SNAPSHOT"
+    id("maven-publish")
+    id("com.modrinth.minotaur") version "2.+"
+    id("dev.kikugie.stonecutter")
+}
+version = "${property("mod_version")}+${property("minecraft_version")}"
+group = property("maven_group") as String
+base {
+    archivesName.set(property("archives_base_name") as String)
+}
+repositories {
+    mavenLocal()
+    maven {
+        name = "ParchmentMC"
+        url = uri("https://maven.parchmentmc.org")
+    }
+    maven { url = uri("https://maven.nucleoid.xyz") }
+    maven {
+        name = "TerraformersMC"
+        url = uri("https://maven.terraformersmc.com/")
+    }
+    maven {
+        name = "Ladysnake Libs"
+        url = uri("https://maven.ladysnake.org/releases")
+    }
+}
+val accessWidener = rootProject.file("src/main/resources/solstice.accesswidener")
+loom {
+    accessWidenerPath = accessWidener
+}
+dependencies {
+    minecraft("com.mojang:minecraft:${property("minecraft_version")}")
+    mappings(loom.layered {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${property("minecraft_version")}:${property("parchment_mappings")}@zip")
+    })
+    modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
+    include(implementation("org.spongepowered:configurate-core:${property("configurate_version")}")!!)
+    include(implementation("org.spongepowered:configurate-hocon:${property("configurate_version")}")!!)
+    include(implementation("org.spongepowered:configurate-gson:${property("configurate_version")}")!!)
+    include("com.typesafe:config:1.4.3")
+    include("io.leangen.geantyref:geantyref:1.3.16")
+    include(modImplementation("me.lucko:fabric-permissions-api:${property("permissions_api_version")}")!!)
+    include(modImplementation("eu.pb4:placeholder-api:${property("placeholderapi_version")}")!!)
+    include(modImplementation("eu.pb4:sgui:${property("sgui_version")}")!!)
+    modImplementation(include("eu.pb4:common-economy-api:${property("commoneconomy_version")}")!!)
+    modCompileOnly("dev.emi:trinkets:${property("trinkets_version")}")
+    modCompileOnly("net.luckperms:api:5.4")
+    modRuntimeOnly("net.luckperms:api:5.4")
+}
+tasks.processResources {
+    val mcConstraint = project.property("minecraft_constraint") as String
+    val javaVer = project.property("java_version") as String
+    inputs.property("version", project.version)
+    inputs.property("minecraft_constraint", mcConstraint)
+    inputs.property("java_version", javaVer)
+    filesMatching("fabric.mod.json") {
+        expand(mapOf(
+            "version" to project.version,
+            "minecraft_constraint" to mcConstraint,
+            "java_version" to javaVer
+        ))
+    }
+}
+val javaVersion = (property("java_version") as String).toInt()
+tasks.withType<JavaCompile>().configureEach {
+    options.release = javaVersion
+}
+java {
+    withSourcesJar()
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
+    targetCompatibility = JavaVersion.toVersion(javaVersion)
+}
+tasks.jar {
+    from(rootProject.file("LICENSE")) {
+        rename { "${it}_${base.archivesName.get()}" }
+    }
+}
+modrinth {
+    token = System.getenv("MODRINTH_TOKEN")
+    projectId = "uIvrDZas"
+    uploadFile = tasks["remapJar"]
+    gameVersions = listOf(property("minecraft_version") as String)
+    loaders = listOf("fabric")
+    dependencies = listOf(ModDependency("P7dR8mSH", "required"))
+}
+publishing {
+    publications {
+        create<MavenPublication>("mavenJava") {
+            artifactId = property("archives_base_name") as String
+            from(components["java"])
+        }
+    }
+    repositories {
+        maven {
+            name = "AlexDevsRepo"
+            url = uri("https://maven.alexdevs.me/releases")
+            credentials {
+                username = System.getenv("MAVEN_USERNAME")
+                password = System.getenv("MAVEN_PASSWORD")
+            }
+        }
+    }
+}

gradle.properties

@@ -1,11 +1,13 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.21.1
 loader_version=0.16.14
+java_version=17
+minecraft_constraint=~1.20.1
 
 parchment_mappings=2024.11.17
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -0,0 +1,27 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = "Fabric"
+            url = uri("https://maven.fabricmc.net/")
+        }
+        maven {
+            name = "Stonecutter"
+            url = uri("https://maven.kikugie.dev/snapshots")
+            content { includeGroup("dev.kikugie") }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.kikugie.stonecutter") version "0.9"
+}
+
+stonecutter {
+    create(rootProject) {
+        versions("1.20.1", "1.21.1", "1.21.4")
+        vcsVersion = "1.21.1"
+    }
+}
+

src/main/java/me/alexdevs/solstice/Solstice.java

@@ -10,6 +10,7 @@
 import me.alexdevs.solstice.integrations.ConnectorIntegration;
 import me.alexdevs.solstice.integrations.LuckPermsIntegration;
 import me.alexdevs.solstice.locale.LocaleManager;
+import me.alexdevs.solstice.api.utils.ResourceUtils;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
@@ -28,7 +29,7 @@
 public class Solstice implements ModInitializer {
     public static final String MOD_ID = "solstice";
     public static final Logger LOGGER = LoggerFactory.getLogger(Solstice.class);
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(MOD_ID, "");
+    public static final ResourceLocation ID = ResourceUtils.location(MOD_ID, "");
 
     public static final IConfigDataManager configManager = new ConfigDataManager(Paths.configDirectory.resolve("config.conf"));
     public static final LocaleManager localeManager = new LocaleManager(Paths.configDirectory.resolve("locale.json"));

src/main/java/me/alexdevs/solstice/api/ServerLocation.java

@@ -2,11 +2,11 @@
 
 import com.google.common.collect.ImmutableList;
 import me.alexdevs.solstice.modules.ModuleProvider;
+import me.alexdevs.solstice.api.utils.ResourceUtils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -17,6 +17,9 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.phys.Vec3;
 
+//? >= 1.21.4
+//import java.util.Set;
+
 import java.util.Objects;
 
 public class ServerLocation {
@@ -80,6 +83,9 @@ public void teleport(ServerPlayer player, boolean setBackPosition) {
         player.setDeltaMovement(player.getDeltaMovement().multiply(1f, 0f, 1f));
         player.setOnGround(true);
 
+        //? >= 1.21.4
+        //player.teleportTo(serverWorld, this.getX(), this.getY(), this.getZ(), Set.of(), this.getYaw(), this.getPitch(), false);
+        //? < 1.21.4
         player.teleportTo(serverWorld, this.getX(), this.getY(), this.getZ(), this.getYaw(), this.getPitch());
 
         // There is a bug (presumably in Fabric's api) that causes experience level to be set to 0 when teleporting between dimensions/worlds.
@@ -92,7 +98,7 @@ public void teleport(ServerPlayer player) {
     }
 
     public ResourceKey<Level> getWorldKey() {
-        return ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(this.getWorld()));
+        return ResourceKey.create(Registries.DIMENSION, ResourceUtils.parse(this.getWorld()));
     }
 
     public ServerLevel getWorld(MinecraftServer server) {

src/main/java/me/alexdevs/solstice/api/text/tag/PhaseGradientTag.java

@@ -47,10 +47,16 @@ public static TextParserV1.TextTag createTag() {
                             }
 
                             var parsedColor = TextColor.parseColor(arg);
+                            //? >= 1.21.1
                             if (parsedColor.isError()) {
+                            //? < 1.21.1
+                            //if (parsedColor == null) {
                                 textColors.add(TextColor.fromRgb(0));
                             } else {
+                                //? >= 1.21.1
                                 textColors.add(parsedColor.getOrThrow());
+                                //? < 1.21.1
+                                //textColors.add(parsedColor);
                             }
                         }