rough 1.18 port

Author: RCXcrafter

build.gradle

@@ -1,6 +1,8 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url 'https://maven.minecraftforge.net' }
+        maven { url 'https://maven.parchmentmc.org' }
+        //maven { url 'https://repo.spongepowered.org/repository/maven-public/' }
         mavenCentral()
         maven {
             name = "sonatype"
@@ -9,16 +11,21 @@ buildscript {
         maven {
             url "https://plugins.gradle.org/m2/"
         }
-		//maven { url='https://repo.spongepowered.org/repository/maven-public/' }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
-        classpath "io.freefair.gradle:lombok-plugin:4.+"
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath 'org.parchmentmc:librarian:1.+'
+        classpath 'io.freefair.gradle:lombok-plugin:6.3.0'
 		//classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
     }
 }
-apply plugin: 'net.minecraftforge.gradle'
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+plugins {
+    id 'eclipse'
+    id 'maven-publish'
+}
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: "io.freefair.lombok"
@@ -32,9 +39,10 @@ version = mod_version
 group = 'com.rcx.materialis' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'materialis'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
     // Channel:   Version:
@@ -47,7 +55,7 @@ minecraft {
     //
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.16.5'
+    mappings channel: 'parchment', version: "${mappings_version}-${minecraft_version}"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -57,10 +65,9 @@ minecraft {
     runs {
         client {
             workingDirectory project.file('run')
-            jvmArgs "-Dmixin.env.disableRefMap=true"
 
             // Recommended logging data for a userdev environment
-            // The markers can be changed as needed. 
+            // The markers can be added/remove as needed separated by commas.
             // "SCAN": For mods scan.
             // "REGISTRIES": For firing of registry events.
             // "REGISTRYDUMP": For getting the contents of all registries.
@@ -71,6 +78,9 @@ minecraft {
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'materialis'
+
             mods {
                 materialis {
                     source sourceSets.main
@@ -80,10 +90,29 @@ minecraft {
 
         server {
             workingDirectory project.file('run')
-            jvmArgs "-Dmixin.env.disableRefMap=true"
+
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            property 'forge.logging.console.level', 'debug'
+
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'materialis'
+
+            mods {
+                materialis {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        // This run config launches GameTestServer and runs all registered gametests, then exits.
+        // By default, the server will crash when no gametests are provided.
+        // The gametest system is also enabled by default for other run configs under the /test command.
+        gameTestServer {
+            workingDirectory project.file('run')
 
             // Recommended logging data for a userdev environment
-            // The markers can be changed as needed. 
+            // The markers can be added/remove as needed separated by commas.
             // "SCAN": For mods scan.
             // "REGISTRIES": For firing of registry events.
             // "REGISTRYDUMP": For getting the contents of all registries.
@@ -94,6 +123,9 @@ minecraft {
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'materialis'
+
             mods {
                 materialis {
                     source sourceSets.main
@@ -103,18 +135,9 @@ minecraft {
 
         data {
             workingDirectory project.file('run')
-            jvmArgs "-Dmixin.env.disableRefMap=true"
 
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed. 
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             property 'forge.logging.markers', 'REGISTRIES'
 
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
@@ -132,31 +155,54 @@ minecraft {
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+repositories {
+    mavenLocal()
+    maven { // SlimeKnights and JEI
+        name 'DVS1 Maven FS'
+        url 'https://dvs1.progwml6.com/files/maven'
+    }
+    maven { // TOP
+        name 'tterrag maven'
+        url "https://maven.tterrag.com/"
+    }
+    maven {
+        name = "CurseMaven"
+        url = "https://www.cursemaven.com/"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
+    maven { // Psi & botania
+        name = "jared maven"
+        url = "https://maven.blamejared.com/"
+    }
+}
+
 dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft "net.minecraftforge:forge:1.16.5-${forge_version}"
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     // Copypasted from tinkers energistics. No shame whatsoever.
-    compile fg.deobf("slimeknights.tconstruct:TConstruct:${minecraft_version}-${tcon_version}")
-    compile fg.deobf("slimeknights.mantle:Mantle:${minecraft_version}-${mantle_version}")
+    implementation fg.deobf("slimeknights.tconstruct:TConstruct:1.18.1-${tcon_version}")
+    implementation fg.deobf("slimeknights.mantle:Mantle:1.18.1-${mantle_version}")
 
-    compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
 
-    compileOnly fg.deobf("curse.maven:eidolon-429625:3157832")
-    compileOnly fg.deobf("curse.maven:curios-309927:3456953")
-    compileOnly fg.deobf("vazkii.psi:Psi:${psi_version}")
-    compileOnly fg.deobf("curse.maven:magipsi-396405:3388248")
+    //compileOnly fg.deobf("curse.maven:eidolon-429625:3157832")
+    compileOnly fg.deobf("curse.maven:curios-309927:3661868")
+    //compileOnly fg.deobf("vazkii.psi:Psi:${psi_version}")
+    //compileOnly fg.deobf("curse.maven:magipsi-396405:3388248")
     compileOnly fg.deobf("vazkii.botania:Botania:${botania_version}")
-    compileOnly fg.deobf("curse.maven:quark-243121:3490981")
-    compileOnly fg.deobf("curse.maven:arl-250363:3326041")
-    compileOnly fg.deobf("curse.maven:thermal-222880:3412300")
-    compileOnly fg.deobf("curse.maven:cofhcore-69162:3407019")
-	compileOnly fg.deobf("curse.maven:create-328085:3499718")
-	compileOnly fg.deobf("curse.maven:immersiveengineering-231951:3497359")
-	compileOnly fg.deobf("curse.maven:prettypipes-376737:3472990")
+    compileOnly fg.deobf("curse.maven:quark-243121:3662309")
+    compileOnly fg.deobf("curse.maven:arl-250363:3642382")
+    //compileOnly fg.deobf("curse.maven:thermal-222880:3412300")
+    //compileOnly fg.deobf("curse.maven:cofhcore-69162:3407019")
+	compileOnly fg.deobf("curse.maven:create-328085:3687358")
+	compileOnly fg.deobf("curse.maven:immersiveengineering-231951:3587149")
+	compileOnly fg.deobf("curse.maven:prettypipes-376737:3645314")
 
 	//annotationProcessor 'org.spongepowered:mixin:0.1.2-SNAPSHOT:processor'
 
@@ -180,81 +226,6 @@ dependencies {
 
 }
 
-repositories {
-    mavenLocal()
-    maven { // Forge
-        name 'ForgeFS'
-        url 'https://files.minecraftforge.net/maven'
-    }
-    maven { // SlimeKnights and JEI
-        name 'DVS1 Maven FS'
-        url 'https://dvs1.progwml6.com/files/maven'
-    }
-    maven { // TOP
-        name 'tterrag maven'
-        url "https://maven.tterrag.com/"
-    }
-    maven {
-        name = "CurseMaven"
-        url = "https://www.cursemaven.com/"
-    }
-    maven { // Psi & botania
-        name = "jared maven"
-        url = "https://maven.blamejared.com/"
-    }
-}
-
-ext.artifact_version = 'NFG'
-if (System.getenv().ARTIFACT_VERSION == null) {
-    artifact_version = "${mod_version}"
-}
-if (System.getenv().ARTIFACT_VERSION != null) {
-    artifact_version = "${system.getenv().ARTIFACT_VERSION}"
-}
-
-def modsTomlSpec = copySpec{
-    from(sourceSets.main.resources) {
-        include 'META-INF/mods.toml'
-        expand 'version': artifact_version,
-            'loader_range': loader_range,
-            'minecraft_range': minecraft_range,
-            'forge_range': forge_range,
-            'mantle_range': mantle_range,
-            'tconstruct_range': tconstruct_range
-    }
-}
-
-def buildPaths = [
-    "$rootDir/out/production/resources", // IDEA
-    "$rootDir/bin", // Eclipse
-]
-
-/*task replaceResources {
-    // ensure directory exists, first build likes to fail
-    new File("${processResources.destinationDir}/META-INF").mkdirs()
-    // copy for gradle
-    copy {
-        outputs.upToDateWhen { false }
-        with modsTomlSpec
-        into processResources.destinationDir
-    }
-    // copy for IDEs
-    buildPaths.each { path ->
-        if (new File(path).exists()) {
-            copy {
-                outputs.upToDateWhen { false }
-                with modsTomlSpec
-                into path
-            }
-        }
-    }
-}
-
-processResources {
-    exclude 'META-INF/mods.toml'
-    finalizedBy replaceResources
-}*/
-
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
     manifest {
@@ -270,11 +241,11 @@ jar {
     }
 }
 
-// Example configuration to allow publishing using the maven-publish task
+// Example configuration to allow publishing using the maven-publish plugin
 // This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar') 
+jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
+// publish.dependsOn('reobfJar')
 
 publishing {
     publications {
@@ -284,7 +255,11 @@ publishing {
     }
     repositories {
         maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
+            url "file://${project.projectDir}/mcmodsrepo"
         }
     }
 }
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}

gradle.properties

@@ -5,25 +5,25 @@ org.gradle.daemon=false
 
 # copypasting time yeeaaaaah
 
-mod_version=1.16.5-2.5.1
+mod_version=1.18.1-2.5.1
 
-minecraft_base_version=1.16
-minecraft_version=1.16.5
-minecraft_range=[1.16.5,1.17)
+minecraft_base_version=1.18
+minecraft_version=1.18.1
+minecraft_range=[1.18.1,1.19)
 
 # Forge Version Information
-forge_version=36.2.4
-mappings_version=20201028-1.16.3
+forge_version=39.1.0
+mappings_version=2022.03.06
 loader_range=[33.0,)
 forge_range=[36.1.4,)
 
 # Build Dependencies
-tcon_version=3.3.3.332
-mantle_version=1.6.155
-jei_version=1.16.4:7.6.1.+
+tcon_version=3.4.2.60
+mantle_version=1.8.37
+jei_version=9.4.1.112
 probe_version=3.0.6-8
 psi_version=1.16-97.425
-botania_version=1.16-389
+botania_version=1.18.1-430-SNAPSHOT
 
 # dependency Version Ranges
 tconstruct_range=[3.3.3.332,)

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -79,10 +79,6 @@
   "item.materialis.molten_terrasteel_bucket": "Molten Terrasteel Bucket",
   "item.materialis.molten_utherium_bucket": "Molten Utherium Bucket",
   "item.materialis.pink_slime_crystal": "Pink Slime Crystal",
-  "item.materialis.psimetal_exosuit_boots": "Tinkers Exosuit Boots",
-  "item.materialis.psimetal_exosuit_chestplate": "Tinkers Exosuit Chestplate",
-  "item.materialis.psimetal_exosuit_helmet": "Tinkers Exosuit Helmet",
-  "item.materialis.psimetal_exosuit_leggings": "Tinkers Exosuit Leggings",
   "item.materialis.wrench": "Wrench",
   "item.materialis.wrench.description": "The Wrench is a common tool among engineers. It can efficiently break machines and has room for many abilities.\nRight Click: Rotate block",
   "item.materialis.wrench_head": "Wrench Head",