Port to Minecraft 1.21.3 (NeoForge)

.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,16 @@ 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 }}
     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-neoforge

build.gradle

@@ -1,22 +1,12 @@
-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 'java-library'
+    id 'eclipse'
+    id 'maven-publish'
+    id 'net.neoforged.gradle.userdev' version '7.0.171'
+    id 'com.matthewprenger.cursegradle' version '1.4.0'
 }
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-apply plugin: "com.matthewprenger.cursegradle"
 
-sourceSets{
+sourceSets {
     main {
         java {
             srcDirs("linkableapi/src/")
@@ -34,56 +24,45 @@ curseforge {
     changelog = file('changelog.md')
     changelogType = 'markdown'
     releaseType = 'release'
-    addGameVersion 'Java 17'
+    addGameVersion 'Java 21'
   }
 }
 
 
 def ver = System.getenv("APPVEYOR_BUILD_VERSION")
 if(ver == null)
-	ver = "dev"
+	ver = "0.0"
 version = ver
 group = 'com.troblecodings'
-archivesBaseName = 'TC-Redstone-1.20.1'
+base.archivesName = 'TC-Redstone-1.21.3'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-minecraft {
-    mappings channel: 'official', version: '1.20.1'
+runs {
+    configureEach {
+        systemProperty 'forge.logging.markers', 'REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
+        modSource project.sourceSets.main
+    }
 
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                gircredstone {
-                    source sourceSets.main
-                }
-            }
-        }
+    client {
+        // configured as client
+    }
 
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                gircredstone {
-                    source sourceSets.main
-                }
-            }
-        }
+    server {
+        arguments '--nogui'
     }
 }
 
 repositories {
-
+    maven {
+        name = 'NeoForged'
+        url = 'https://maven.neoforged.net/releases'
+    }
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.20.1-47.2.0'
+    implementation "net.neoforged:neoforge:${neoforge_version}"
 }
 
 jar {
@@ -100,7 +79,6 @@ jar {
     }
 }
 
-jar.finalizedBy('reobfJar') 
 publishing {
     publications {
         mavenJava(MavenPublication) {

changelog.md

@@ -1,7 +1,17 @@
 # Changelog
 
-## [1.20.1 - 3.2.2]
+## [1.21 - 3.2.3]
 
+* port 1.21
+
+## [1.20.4 - 3.2.3]
+
+* feat: add item damage
+* ref: update linkable api
+
+## [1.20.4 - 3.2.2]
+
+* port 1.20.4
 * rem: debug output
 
 ## [1.20.1-3.2.1]

gradle.properties

@@ -1,4 +1,6 @@
 # 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
+org.gradle.daemon=false
+
+neoforge_version=21.3.86

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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.10-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -0,0 +1,13 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'NeoForged'
+            url = 'https://maven.neoforged.net/releases'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}

src/main/java/com/troblecodings/tcredstone/GIRCRedstoneMain.java

@@ -5,13 +5,21 @@
 
 import com.troblecodings.tcredstone.init.GIRCInit;
 
-import net.minecraftforge.fml.common.Mod;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
 
 @Mod(GIRCRedstoneMain.MODID)
 public class GIRCRedstoneMain {
 
-    public GIRCRedstoneMain() {
-        GIRCInit.init();
+    public static final DataComponentType<CompoundTag> COMPOUND_DATA =
+            DataComponentType.<CompoundTag>builder().persistent(CompoundTag.CODEC)
+                    .networkSynchronized(ByteBufCodecs.COMPOUND_TAG).build();
+
+    public GIRCRedstoneMain(final IEventBus modEventBus) {
+        GIRCInit.init(modEventBus);
     }
 
     public static final Logger LOGGER = LogManager.getLogger();