Started 1.16 port

build.gradle

@@ -1,82 +1,183 @@
+import org.w3c.dom.Element
+
 buildscript {
-	repositories {
-		jcenter()
-		maven { url = "http://files.minecraftforge.net/maven" }
-	}
-	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-	}
+    repositories {
+        maven { url = 'https://files.minecraftforge.net/maven' }
+        mavenCentral()
+    }
+    dependencies {
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+    }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 repositories {
-	maven {
-		name "CurseForge"
-		url "https://minecraft.curseforge.com/api/maven/"
-	}
+    maven {
+        name 'LDTTeam - Modding'
+        url 'https://ldtteam.jfrog.io/ldtteam/modding/'
+    }
+    maven {
+        url "https://maven.tehnut.info"
+    }
+    maven {
+        url "https://www.cursemaven.com"
+    }
+    maven {
+        url "http://harleyoconnor.com/maven"
+    }
+    flatDir {
+        dirs("libs")
+    }
 }
 
-configurations {
-	provided
-	shade
-	compile.extendsFrom shade
-}
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'maven-publish'
 
-idea {
-	module {
-		scopes.PROVIDED.plus += [configurations.provided]
-	}
+ext.configFile = file "gradle.properties"
+configFile.withReader {
+    def prop = new Properties()
+    prop.load(it)
+    ext.config = new ConfigSlurper().parse prop
 }
 
-jar {
-	configurations.shade.each { dep ->
-		from(project.zipTree(dep)) {
-			exclude 'META-INF', 'META-INF/**'
-		}
-	}
+version = "${config.mc_version}-${config.mod_version}"
+group = config.package_group
+archivesBaseName = config.mod_name
+
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+
+minecraft {
+    mappings channel: 'official', version: config.mc_version
+
+    runs {
+        client {
+            workingDirectory project.file('run')
 
-	from sourceSets.api.output
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.console.level', 'debug'
+
+            properties 'mixin.env.disableRefMap' : 'true'
+
+            mods {
+                dtbop {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        server {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.console.level', 'debug'
+
+            properties 'mixin.env.disableRefMap' : 'true'
+
+            mods {
+                dtbop {
+                    source sourceSets.main
+                }
+            }
+        }
+    }
 }
 
-apply from: 'dependencies.gradle'
+dependencies {
+    // Not sure if we need this one, what is a "forge" anyway?
+    minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}"
+
+    // Compile Hwyla API, but don't include in runtime.
+    compileOnly fg.deobf("mcp.mobius.waila:Hwyla:${config.hwyla_version}:api")
+    // At runtime, use the full Hwyla mod.
+    runtimeOnly fg.deobf("mcp.mobius.waila:Hwyla:${config.hwyla_version}")
+
+    // Compile JEI API, but don't include in runtime.
+    compileOnly fg.deobf("mezz.jei:jei-1.16.4:${config.jei_version}:api")
+    // At runtime, use the full JEI mod.
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.4:${config.jei_version}")
+
+    // Compile Dynamic Trees, of course.
+    implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-${config.mc_version}:${config.dynamic_trees_version}")
+    // Compile Dynamic Trees Plus
+    runtimeOnly fg.deobf("com.ferreusveritas.dynamictreesplus:DynamicTreesPlus-${config.mc_version}:${config.dynamic_trees_plus_version}")
+
+    implementation fg.deobf("curse.maven:biomes-o-plenty-220318:3291182")
 
-version = "${mc_version}-${mod_version}"
-group = package_group
-archivesBaseName = mod_name
+    runtimeOnly fg.deobf("curse.maven:cc-tweaked-282001:3236650")
 
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-compileJava {
-	sourceCompatibility = targetCompatibility = '1.8'
+    // At runtime, use suggestion provider fix mod.
+    runtimeOnly fg.deobf("com.harleyoconnor.suggestionproviderfix:SuggestionProviderFix:${config.mc_version}-${config.suggestion_provider_fix_version}")
 }
 
-minecraft {
-	version = "${mc_version}-${forge_version}"
-	runDir = "run"
-
-	replace "1.12.2-9999.9999.9999z", project.version
-	replaceIn "ModConstants.java"
-
-	makeObfSourceJar = false
-
-	if (project.hasProperty('mappings_version'))
-		mappings = project.mappings_version
+jar {
+    manifest {
+        attributes([
+                "Specification-Title": project.name,
+                "Specification-Vendor": "mangoose",
+                "Specification-Version": "1",
+                "Implementation-Title": project.name,
+                "Implementation-Version": version,
+                "Implementation-Vendor" : "mangoose",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
+    }
 }
 
-dependencies {
-
+task sourcesJar(type: Jar) {
+    archiveClassifier.set("sources")
+    from sourceSets.main.allJava
 }
 
-processResources {
-	inputs.property "version", project.version
-	inputs.property "mcversion", project.minecraft.version
+jar.finalizedBy('reobfJar')
 
-	from(sourceSets.main.resources.srcDirs) {
-		include 'mcmod.info'
-		expand 'version':project.version, 'mcversion':project.minecraft.version
-	}
+java {
+    withSourcesJar()
+}
 
-	from(sourceSets.main.resources.srcDirs) {
-		exclude 'mcmod.info'
-	}
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            setArtifactId("${config.mod_name}-${config.mc_version}")
+            setVersion(config.mod_version)
+
+            from components.java
+
+            pom {
+                url = "https://github.com/supermassimo/${config.mod_name}"
+                licenses {
+                    license {
+                        name = 'MIT'
+                        url = 'https://mit-license.org'
+                    }
+                }
+                scm {
+                    connection = "scm:git:git://github.com/supermassimo/${config.mod_name}.git"
+                    developerConnection = "scm:git:ssh://github.com/supermassimo/${config.mod_name}.git"
+                    url = "https://github.com/supermassimo/${config.mod_name}"
+                }
+            }
+
+            pom.withXml { xmlProvider ->
+                final Element element = xmlProvider.asElement();
+
+                // Clear dependencies.
+                element.getChildNodes().each { node ->
+                    if (node.getNodeName() == "dependencies")
+                        element.removeChild(node)
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            url "file:///${project.projectDir}/mcmodsrepo"
+        }
+    }
+}
+
+idea {
+    module {
+        downloadSources = true
+    }
 }

gradle.properties

@@ -1,9 +1,15 @@
 mod_name=DynamicTreesBOP
-mod_version=1.5.1
-package_group=com.mangoose.dtbop
+mod_version=2.0.0
+package_group=therealeststu.dtbop
 
-mc_version=1.12.2
-forge_version=14.23.5.2838
-mappings_version=snapshot_20171003
+mc_version=1.16.5
+forge_version=36.1.0
+
+dynamic_trees_version=0.10.0-Beta7.1
+dynamic_trees_plus_version=0.1.0-Beta7
+hwyla_version=1.10.11-B78_1.16.2
+jei_version=7.6.1.71
+suggestion_provider_fix_version=1.0.0
 
 org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 02 22:35:51 UYT 2021
+#Wed May 05 22:01:13 UYT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip