Port to 1.21.1

.gitignore

@@ -1,73 +1,28 @@
-# User-specific stuff
-.idea/
-
+# IntelliJ
 *.iml
 *.ipr
 *.iws
-
-# IntelliJ
+.idea/
 out/
+
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
+# Eclipse
+.project
+.classpath
+.settings/
+.eclipse/
+bin/
 
 # General
 .DS_Store
 .AppleDouble
 .LSOverride
 
-# Icon must end with two \r
-Icon
-
 # Thumbnails
 ._*
 
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
 # Directories potentially created on remote AFP share
 .AppleDB
 .AppleDesktop
@@ -81,25 +36,12 @@ Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 
-# Dump file
-*.stackdump
-
 # Folder config file
 [Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
 .gradle
 build/
 
@@ -115,6 +57,3 @@ gradle-app.setting
 run/
 server/
 
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-

README.md

@@ -5,7 +5,7 @@ Get ready to upgrade your builds! This mod adds modern and futuristic looking la
 
 ## Supported Connected Textures Mod
 * CTM | 1.18 - 1.19
-* Fusion | 1.20
+* Fusion | 1.20 - 1.21
 
 ## Acknowledgments
 * This project uses sound files from the [Chisel Github Repository](https://github.com/Chisel-Team/Chisel)

build.gradle

@@ -1,124 +1,62 @@
-buildscript {
-    repositories {
-        maven {
-            name = "Minecraft Forge maven"
-            url = "https://maven.minecraftforge.net"
-        }
-        maven {
-            name = "Parchment maven"
-            url = "https://maven.parchmentmc.org"
-        }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'org.parchmentmc:librarian:1.+'
-    }
-}
-
 plugins {
-    id "maven-publish"
+    id 'maven-publish'
+    id 'net.neoforged.moddev' version '1.0.21'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.parchmentmc.librarian.forgegradle'
-
 group = 'de.artemis.laboratoryblocks'
 version = "${mc_version}-${mod_version}-fusion"
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 wrapper {
-    gradleVersion = '7.5.1'
+    gradleVersion = '8.10'
     distributionType = Wrapper.DistributionType.ALL
 }
 
-minecraft {
-    mappings channel: "${mappings_channel}", version: "${mappings_version}"
-
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'laboratoryblocks'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+sourceSets {
+    main.resources {
+        srcDir 'src/generated/resources'
+    }
+}
 
-            args "--username", "ArtemisYouTube"
-            args "--uuid", "6611b78f-7fbb-4f41-801a-4e85fd0dca3c"
+neoForge {
+    version = "${neoforge_version}"
 
-            mods {
-                laboratoryblocks {
-                    source sourceSets.main
-                }
-            }
+    mods {
+        laboratoryblocks {
+            sourceSet sourceSets.main
         }
+    }
 
-        server {
-            workingDirectory project.file('server')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'laboratoryblocks'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+    parchment {
+        minecraftVersion = "${parchment_mcversion}"
+        mappingsVersion = "${parchment_version}"
+    }
 
-            mods {
-                laboratoryblocks {
-                    source sourceSets.main
-                }
-            }
+    runs {
+        client {
+            client()
+            ideName = 'runLaboratoryBlocksClient'
+            programArguments = ['--username', 'ArtemisYouTube', '--uuid', '6611b78f-7fbb-4f41-801a-4e85fd0dca3c']
         }
 
-        gameTestServer {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'laboratoryblocks'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
-
-            mods {
-                laboratoryblocks {
-                    source sourceSets.main
-                }
-            }
+        server {
+            server()
+            gameDirectory = project.file('server')
+            ideName = 'runLaboratoryBlocksServer'
         }
 
         data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
-
-            args '--mod', 'laboratoryblocks', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                laboratoryblocks {
-                    source sourceSets.main
-                }
-            }
+            data()
+            ideName = 'runLaboratoryBlocksData'
+            programArguments.addAll '--mod', "laboratoryblocks", '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
         }
     }
 }
 
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
-    testMod {}
-}
-
 repositories {
-    flatDir {
-        dirs 'lib'
-    }
-
     maven {
-        name = "Blamejared maven botania patchouli"
+        name = "Blamejared maven"
         url = 'https://maven.blamejared.com'
     }
     maven {
@@ -133,17 +71,13 @@ repositories {
         name = "Modrinth"
         url = "https://api.modrinth.com/maven"
     }
-    maven {
-        url "https://cursemaven.com"
-    }
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
-    //JEI
-    runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
+    // JEI
+    runtimeOnly "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
     // Fusion
-    implementation fg.deobf("maven.modrinth:fusion-connected-textures:${fusion_version}-forge-mc${mc_version}")
+    implementation "maven.modrinth:fusion-connected-textures:${fusion_version}"
 }
 
 jar {
@@ -154,15 +88,16 @@ jar {
                 "Specification-Version"   : "${mod_version}",
                 "Implementation-Title"    : project.name,
                 "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "Artemis",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+                "Implementation-Vendor"   : "Artemis"
         ])
     }
 }
 
-jar.finalizedBy('reobfJar')
-
 tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
+tasks.withType(AbstractArchiveTask).configureEach {
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+}

gradle.properties

@@ -1,12 +1,14 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
-forge_version=47.2.20
-mc_version=1.20.1
+
+neoforge_version=21.1.72
+mc_version=1.21.1
 mod_version=0.5r
-mappings_channel=parchment
-mappings_version=2023.07.16-1.20.1
-jei_version=15.2.0.23
-fusion_version=1.1.0b
+parchment_mcversion=1.21
+parchment_version=2024.07.28
+
+jei_version=19.21.0.247
+fusion_version=1.1.1a-neoforge-mc1.21
 
 spaceUsername = Srendi
 # This is an access token with repo read permissions

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,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/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum