Initial port to 1.16.5

Made component recipe an actual recipetype

.gitattributes

@@ -0,0 +1,5 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf

.gitignore

@@ -1,33 +1,25 @@
-bin/assets/
-run/
-bin/
-libs/
-build/
-eclipse/
-logs/
-mods/
-libs/
-saves/
-.gradle/
-.settings/
-server.properties 
-run/screenshots/
-.metadata/
-.settings/
+# eclipse
+bin
+*.launch
+.settings
+.metadata
 .classpath
 .project
-options.txt
-usernamecache.json
-crash-reports/
-*.fdx
-*.fnm
-*.tis
-.recommenders/
-.gitattributes
-*.launch
-*.lnk
-*.jks
 
-\.idea/
-classes/
+# idea
+out
+*.ipr
+*.iws
 *.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
+eclipse
+run
+
+# Files from Forge MDK
+forge*changelog.txt

build.gradle

@@ -1,136 +1,126 @@
 buildscript {
     repositories {
-        jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
+        maven { url = 'https://maven.minecraftforge.net' }
+        mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 
-version = "${mc_version}-${mod_version}"
+version = "${version}"
 group= "elucent.roots" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RootsClassic"
 
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-}
-
+java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
 
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    version = "${mc_version}-${forge_version}"
-    runDir = "run"
+    mappings  channel: "${mcp_channel}", version: "${mcp_mappings}"
 
-    mappings = project.mappings_version
-    makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
+    runs {
+        client {
+            workingDirectory project.file('run')
 
-    replace '@VERSION@', project.version
-    //Replaces all text that matches the left side with the right.
-    replace '@FINGERPRINT@', project.findProperty('signSHA1')
-    //Makes those replacement changes to the main mod class.
-    //My mod class is set in my project's gradle.properties file.
-    replaceIn "Roots.java"
-}
-task signJar(type: SignJar, dependsOn: reobfJar) {
+            // Recommended logging data for a userdev environment
+            // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
-    // Skips if the keyStore property is missing.
-    onlyIf {
-        project.hasProperty('keyStore')
-    }
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                rootsclassic {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        server {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                rootsclassic {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        data {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
-    // findProperty allows us to reference the property without it existing. 
-    // Using project.propName would cause the script to fail validation if 
-    // the property did not exist. 
-    keyStore = project.findProperty('keyStore')
-    alias = project.findProperty('keyStoreAlias')
-    storePass = project.findProperty('keyStorePass')
-    keyPass = project.findProperty('keyStoreKeyPass')
-    inputFile = jar.archivePath
-    outputFile = jar.archivePath
+            // Recommended logging level for the console
+            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.
+            args '--mod', 'rootsclassic', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+
+            mods {
+                rootsclassic {
+                    source sourceSets.main
+                }
+            }
+        }
+    }
 }
-// Runs this task automatically when build is ran. 
-// build.dependsOn signJar
+
+// Include resources generated by data generators.
+sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    maven { // JEI & Tinkers
-        name 'DVS1 Maven FS'
-        url 'http://dvs1.progwml6.com/files/maven'
-    }
-    maven { // CraftTweaker (aka MineTweaker3), Immersive Engineering
-        name 'jared maven'
-        url "http://blamejared.com/maven"
-    }
-	maven {
-		url "https://maven.mcmoddev.com"
-	}
     maven {
-        url "http://dvs1.progwml6.com/files/maven"
+        // location of the maven that hosts JEI files
+        name = "Progwml6 maven"
+        url = "https://dvs1.progwml6.com/files/maven/"
     }
     maven {
-		url 'http://maven.blamejared.com'
-	}
-	maven {
-		url 'https://maven.mcmoddev.com/'
-	}
-	maven {
-        url = "http://minecraft.curseforge.com/api/maven/"
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.k-4u.nl"
     }
     maven {
-    	name = "Progwml6 maven"
-        url "http://dvs1.progwml6.com/files/maven"
+        name = "CraftTweaker"
+        url "https://maven.blamejared.com"
     }
-   // maven { //Guide API
-	//	url "http://tehnut.info/maven/"
-	//}
-	maven {
-	    // location of a maven mirror for JEI files, as a fallback
-	    name = "ModMaven"
-	    url = "modmaven.k-4u.nl"
-	}
-	maven { url "http://maven.amadornes.com/" }
-	ivy {
-		name 'asie dependency mirror'
-		artifactPattern "http://asie.pl/javadeps/[module]-[revision](-[classifier]).[ext]"
-	}
 }
 
 dependencies {
-  deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
-  deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:${crt_version}"
-}
-
+    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
 
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
+    compileOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
 
-task copyJar(type: Copy) {
-    from jar
-    into "${dist_folder}"
+    compile fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}")
 }
 
-cleanJar {
-  delete 'build/libs'
+// Example for how to get properties into the manifest for reading by the runtime..
+jar {
+    manifest {
+        attributes([
+                "Specification-Title": "rootsclassic",
+                "Specification-Vendor": "elucent",
+                "Specification-Version": "1", // We are version 1 of ourselves
+                "Implementation-Title": project.name,
+                "Implementation-Version": "${version}",
+                "Implementation-Vendor" :"elucent",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
+    }
 }
 
+jar.finalizedBy('reobfJar')

gradle.properties

@@ -1,12 +1,17 @@
+# 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
-forge_version=14.23.5.2847
-mc_version=1.12.2
-mod_version=1.1.7
+org.gradle.daemon=false
 
-crt_version=1.12-4.1.9.478
-jei_version=4.13.1.225
+# Base info
+mc_version=1.16.5
+forge_version=36.2.2
+mcp_channel=snapshot
+mcp_mappings=20210309-1.16.5
 
-mappings_version=stable_39
+# Version
+version=1.1.7
 
-
-dist_folder=c:/temp
+# Dependencies
+crafttweaker_version=7.1.1.395
+jei_version=7.7.0.107

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip