1.21 initial release

Blockus, Cinderscapes, Natures Spirit & Tech Reborn support provided.

.github/workflows/build.yml

@@ -12,30 +12,26 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
           21,    # Current Java LTS
         ]
-        # and run on both Linux and Windows
-        os: [ubuntu-22.04, windows-2022]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
       - name: setup jdk ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'microsoft'
       - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v3
+        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

.gitignore

@@ -119,3 +119,4 @@ run/
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 /.idea/runConfigurations/
+/src/main/generated/.cache/

build.gradle

@@ -1,45 +1,19 @@
 plugins {
-    id 'fabric-loom' version '1.5-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
-base {
-    archivesName = project.archives_base_name
-}
-
-//def apikeyPropertiesFile = rootProject.file("secrets/secrets.properties");
-def apikeyProperties = new Properties()
-//apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
 repositories {
-    mavenCentral()
-    maven { url "https://maven.terraformersmc.com/" } // Required for Mod Menu and Terraform APIs
-    maven { url "https://maven.shedaniel.me/" }       // Required for Cloth Config
-    maven { url "https://maven.ryanliptak.com/" }     // Required for AppleSkin
-    maven { url "https://maven.minecraftforge.net/" } // Required for TerraBlender
-    maven { url "https://maven.modmuss50.me/" } // Fiber
-    maven { url "https://maven.resourcefulbees.com/repository/maven-public/" } // Required for Ad Astra
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // Completecomfig for RegionsUnexplored
-    maven { url "https://maven.isxander.dev/releases" }
+    maven { url "https://jitpack.io" }
     maven { url "https://cursemaven.com/" }
     maven { url "https://api.modrinth.com/maven" }
-    maven { url "https://maven.kyrptonaught.dev" }
-    maven { url "https://maven.wispforest.io" } // owolib for MineCells
-    maven { url "https://maven.draylar.dev/releases" } // omegaconfig for MineCells
-    maven { url "https://maven.ladysnake.org/releases" } // Trinkets for Bewitchment
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-    maven { url "https://maven.jamieswhiteshirt.com/libs-release" }
-    maven { url "https://maven.parchmentmc.org" }
-    maven { url "https://jitpack.io" }
-    //maven {
-    //    url = uri("https://maven.pkg.github.com/Lemonszz/taniwha")
-    //    credentials {
-    //        username = apikeyProperties['gpr.user'] ?: System.getenv("USERNAME")
-    //        password = apikeyProperties['gpr.key'] ?: System.getenv("TOKEN")
-    //    }
-    //}
+    maven { url "https://maven.terraformersmc.com/" }
+    maven { url "https://maven.minecraftforge.net/" }
+    maven { url "https://maven.shedaniel.me" }
+
 }
 
 loom {
@@ -66,117 +40,40 @@ sourceSets {
     }
 }
 
-configurations.all {
-    resolutionStrategy {
-        force("net.fabricmc:fabric-loader:$loader_version")
-    }
-}
-
 dependencies {
-    implementation 'org.jetbrains:annotations:24.0.0'
-
+    // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.layered {
-        mappings file("mappings/mappings-fix.tiny")
-        mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
-    }
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    // Ad Astra
-    modRuntimeOnly("maven.modrinth:ad-astra:QzjRLT8e") // 1.15.5
-    modApi("maven.modrinth:botarium:a6dUCytc") //botarium 2.3.1
-    modApi("maven.modrinth:resourceful-config:PlEObkl9") //resourcefulconfig 2.1.2
-    modApi("maven.modrinth:resourceful-lib:HGTwQLNx") //resourcefullib 2.1.20
-
-    // Beach Party (Let's Do)
-    modRuntimeOnly("maven.modrinth:lets-do-beachparty:X0aF5oob") //1.1.3
-    modApi("maven.modrinth:do-api:wKMcbCEl") // Do Api 1.2.8
-    modApi("maven.modrinth:architectury-api:Sbew3kXe") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
-    // Architectury 9.1.12
-
-    // BetterArcheology
-    modRuntimeOnly("maven.modrinth:better-archeology:EJHNTdmP") // 1.1.0
-
-    // Bewitchment
-    modRuntimeOnly("maven.modrinth:bewitchment:riuujyHL") // 1.20-7
-    modApi("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
-    modApi("maven.modrinth:impersonate:6ZK2ddbg") // Impersonate 2.10.2
-    modApi("maven.modrinth:midnightlib:YXz8kIQl") // Midnight Lib 1.4.1
-    modApi("io.github.ladysnake:PlayerAbilityLib:1.8.0")
-    modApi("com.jamieswhiteshirt:reach-entity-attributes:2.4.0")
-    modApi("com.github.emilyploszaj:step-height-entity-attribute:v1.2.0")
-    modApi("maven.modrinth:patchouli:Y6tuH1cn") //Patchouli 1.20.1-84
-    modApi("me.zeroeightsix:fiber:0.23.0-2")
-    modRuntimeOnly("maven.modrinth:pehkui:NXT21hP9") // Pehkui 3.7.12
-    modApi("com.github.Virtuoel:KanosConfig:0.4.1")
-    modRuntimeOnly("maven.modrinth:trinkets:e563ycts") // Trinkets 3.7.1
-    modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.2")
-    modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.2")
-
-    // BiomeMakeover
-    modRuntimeOnly("maven.modrinth:jG8Q2YwT:rsoZ2Iqo") // 1.11.4
-    //modApi("party.lemons:taniwha-fabric:1.20.0-5.4.9")
-
-    // Blockus
-    modRuntimeOnly("maven.modrinth:blockus:TsvrmUbJ") { transitive false }
-
-    // Botania
-    modRuntimeOnly "vazkii.botania:Botania-xplat:1.20.1-443"
-
-    // Cinderscapes
-    modRuntimeOnly "com.terraformersmc:cinderscapes:4.0.9"
-    modRuntimeOnly "com.terraformersmc:cinderscapes-client:4.0.9"
-    modRuntimeOnly "com.terraformersmc:cinderscapes-common:4.0.9"
-    modRuntimeOnly "com.terraformersmc:cinderscapes-worldgen:4.0.9"
-    modApi("maven.modrinth:modmenu:lEkperf6") // ModMenu 7.2.2
-
-    // Deeper & Darker
-    modRuntimeOnly("maven.modrinth:fnAffV0n:jb78cjt3") { transitive false }
-    modApi("net.kyrptonaught:customportalapi:0.0.1-beta64-1.20")
-
-    // Desolation
-    modRuntimeOnly("maven.modrinth:desolation:HqakjlKA") // 1.3.2
-    modApi("maven.modrinth:geckolib:oPgOSBzN") // Geckolib
-
-    // Ecologics
-    modRuntimeOnly("curse.maven:ecologics-570463:4857271")
-
-    // Eldritch End
-    modRuntimeOnly("maven.modrinth:eldritch-end:hjijvYrR") { transitive false } // 0.2.30
-    modApi("maven.modrinth:azurelib:qmNj5M34") // 2.0.18
-    modApi("maven.modrinth:necronomicon:edD42FPx") // 1.3.0
-
-    // Meadow (Let's Do)
-    modRuntimeOnly("maven.modrinth:lets-do-meadow:QHqnFZCQ") // 1.3.4
-
-    // MineCells
-    modRuntimeOnly("maven.modrinth:minecells:MPeoUkHE")
-    modApi("maven.modrinth:owo-lib:zyOBB7J4") // owo lib 0.11.2
-    modApi("dev.draylar.omega-config:omega-config-base:1.4.0+1.20.1")
-
-    // Natures Spirit
-    modRuntimeOnly("maven.modrinth:natures-spirit:wLpIDkQv") // 1.3.0
-
-    // Promenade
-    modRuntimeOnly("maven.modrinth:promenade:A5YD9uS3") { transitive false } // 4.1.1
-    modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
-    modApi("com.terraformersmc:biolith:1.0.0-beta.1")
-
-    // Regions Unexplored 0.5
-    modRuntimeOnly("maven.modrinth:regions-unexplored:P5G5b4aO")
-    modApi("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.1.2")
-    modApi("com.github.Lortseam.completeconfig:base:2.5.0")
-
-    // Snifferplus
-    //modRuntimeOnly("maven.modrinth:BVgHoKxg:DLjYM0KE")
+    // Blockus 2.9.1+1.21
+    modRuntimeOnly("maven.modrinth:blockus:LSQaGN5A") { transitive false }
+
+    // Cinderscapes v5.0.0 for 1.21
+    modRuntimeOnly "com.terraformersmc:cinderscapes:5.0.0"
+    modRuntimeOnly "com.terraformersmc:cinderscapes-client:5.0.0"
+    modRuntimeOnly "com.terraformersmc:cinderscapes-common:5.0.0"
+    modRuntimeOnly "com.terraformersmc:cinderscapes-worldgen:5.0.0"
+    modApi ("com.terraformersmc:biolith-fabric:3.0.0-alpha.1")
+    modApi ("com.terraformersmc:modmenu:11.0.1")
+    modApi ("com.terraformersmc.terraform-api:terraform-biome-remapper-api-v1:11.0.0-alpha.1")
+    modApi ("com.terraformersmc.terraform-api:terraform-shapes-api-v1:11.0.0-alpha.1")
+    modApi ("com.terraformersmc.terraform-api:terraform-wood-api-v1:11.0.0-alpha.1")
+    modApi ("me.shedaniel.cloth:cloth-config-fabric:15.0.127")
+
+    // Natures Spirit 1.5.3-1.21
+    modRuntimeOnly("maven.modrinth:natures-spirit:k2mup3Kl") { transitive false }
 
     // Tech Reborn
-    modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.7")
+    modRuntimeOnly("TechReborn:TechReborn-1.21:5.11.6")
 
-    // Vinery
-    modRuntimeOnly("curse.maven:vinery-704465:4643442") { transitive false }
+}
 
+base {
+    archivesName = project.archives_base_name
 }
 
 processResources {
@@ -188,36 +85,32 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-    it.options.release = 17
+    it.options.release = 21
 }
 
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
+        rename { "${it}_${base.archivesName.get()}" }
     }
 }
 
-// configure the maven publication
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
         }
     }
 
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        // Add repositories to publish to here.
-        // Notice: This block does NOT have the same function as the block in the top level.
-        // The repositories here will be used for publishing your artifact, not for
-        // retrieving dependencies.
     }
-}
+}

gradle.properties

@@ -1,12 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx6G
 org.gradle.parallel=true
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.14.25
-#Fabric api
-fabric_version=0.91.0+1.20.1
+minecraft_version=1.21
+yarn_mappings=1.21+build.7
+loader_version=0.15.11
+
+# Fabric API
+fabric_version=0.100.4+1.21
+
 # Mod Properties
-mod_version=6.4
+mod_version=7.0
 maven_group=xanthian
 archives_base_name=variantcraftingtables

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail