Port to Minecraft 1.21.4 (Fabric)

.github/workflows/build.yml

@@ -0,0 +1,41 @@
+# Automatically build the project and run any configured tests for every push
+# and submitted pull request. This can help catch issues that only occur on
+# certain platforms or Java versions, and provides a first line of defence
+# against bad commits.
+
+name: build
+on: [pull_request, push]
+
+jobs:
+  build:
+    strategy:
+      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 }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - 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@v4
+        with:
+          name: Artifacts
+          path: build/libs/

.github/workflows/gradle.yml

@@ -14,10 +14,10 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Change wrapper permissions
       run: chmod +x ./gradlew
@@ -30,16 +30,17 @@ jobs:
     if: endswith(github.ref_name, 'master') && github.ref_protected && github.ref_type == 'branch'
     runs-on: ubuntu-latest
     env:
-      APPVEYOR_BUILD_VERSION: '3.2.2'
+      APPVEYOR_BUILD_VERSION: '3.2.3'
       CURSETOKEN: ${{ secrets.CURSETOKEN }}
+      MODRINTHTOKEN: ${{ secrets.MODRINTHTOKEN }}
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Change wrapper permissions
       run: chmod +x ./gradlew

.gitignore

@@ -20,6 +20,7 @@ build
 # other
 eclipse
 run
+runs
 
 # Files from Forge MDK
 forge*changelog.txt

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "linkableapi"]
 	path = linkableapi
 	url = https://github.com/MrTroble/linkableapi
+	branch = 1.21.3-fabric

build.gradle

@@ -1,20 +1,18 @@
-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        maven { url "https://plugins.gradle.org/m2/" }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
-        classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
-    }
+plugins {
+	id 'fabric-loom' version '1.11-SNAPSHOT'
+	id 'maven-publish'
+	id "com.matthewprenger.cursegradle" version "1.4.0"
+	id "com.modrinth.minotaur" version "2.+"
+}
+
+def ver = System.getenv("APPVEYOR_BUILD_VERSION")
+if(ver == null)
+	ver = "dev"
+version = ver
+group = 'com.troblecodings'
+base {
+	archivesName = 'TC-Redstone-1.21.4-Fabric'
 }
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-apply plugin: "com.matthewprenger.cursegradle"
 
 sourceSets{
     main {
@@ -28,88 +26,89 @@ def key = System.getenv("CURSETOKEN")
 if(key == null)
 	key = 'dev'
 curseforge {
-  apiKey = key
-  project {
-    id = '503143'
-    changelog = file('changelog.md')
-    changelogType = 'markdown'
-    releaseType = 'release'
-    addGameVersion 'Java 17'
-  }
+	apiKey = key
+    project {
+        id = '503143'
+		changelog = file('changelog.md')
+		changelogType = 'markdown'
+		releaseType = 'release'
+        addGameVersion 'Java 21'
+		mainArtifact(remapJar) {
+			displayName = "Example $project.version"
+        }
+    }
+    options {
+        forgeGradleIntegration = false
+    }
 }
 
+afterEvaluate {
+    tasks.curseforge503143.dependsOn remapJar
+}
 
-def ver = System.getenv("APPVEYOR_BUILD_VERSION")
-if(ver == null)
-	ver = "dev"
-version = ver
-group = 'com.troblecodings'
-archivesBaseName = 'TC-Redstone-1.20.1'
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-
-minecraft {
-    mappings channel: 'official', version: '1.20.1'
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                gircredstone {
-                    source sourceSets.main
-                }
-            }
-        }
 
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-            
-            mods {
-                gircredstone {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
+def token = System.getenv("MODRINTHTOKEN")
+if(token == null)
+	token = 'dev'
+modrinth {
+    token = token
+    projectId = 'rMlghquR'
+    versionNumber = ver
+	versionType = 'release'
+    versionName = 'TC-Redstone-1.21.4-Fabric'
+    uploadFile = remapJar
+    gameVersions = ['1.21.4']
+    loaders = ['fabric']
 }
 
-repositories {
-
+task publishToModSites {
+    publishToModSites.dependsOn modrinth
+    publishToModSites.dependsOn curseforge
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.20.1-47.2.0'
+	minecraft "com.mojang:minecraft:${minecraft_version}"
+	mappings "net.fabricmc:yarn:${yarn_mappings}"
+	modImplementation "net.fabricmc:fabric-loader:${loader_version}"
+
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+java {
+	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
-    manifest {
-        attributes([
-            "Specification-Title": "TC-Redstone",
-            "Specification-Vendor": "troblecodings",
-            "Specification-Version": ver,
-            "Implementation-Title": project.name,
-            "Implementation-Version": ver,
-            "Implementation-Vendor" :"troblecodings",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
 }
 
-jar.finalizedBy('reobfJar') 
 publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
+	publications {
+		mavenJava(MavenPublication) {
+			from components.java
+		}
+	}
+
+	repositories {
+			maven {
             url "file:///${project.projectDir}/mcmodsrepo"
         }
-    }
-}
+	}
+}

changelog.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## [1.20.1 - 3.2.2]
+## [1.21 Fabric - 3.2.3]
 
-* rem: debug output
+* port to 1.21
+
+## [1.20.4 Fabric - 3.2.3]
+
+* port to fabric
 
 ## [1.20.1-3.2.1]
 

gradle.properties

@@ -1,4 +1,18 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.14
+loom_version=1.11-SNAPSHOT
+
+# Mod Properties
+mod_version=1.0.0
+maven_group=com.example
+archives_base_name=modid
+
+# Dependencies
+fabric_version=0.119.4+1.21.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists