1.16.1 Port

.gitignore

@@ -1,63 +1,25 @@
-## gradle
-/.gradle
-/build
-
-## eclipse
-/.settings
-/.metadata
-/.classpath
-/.project
-/bin
-/run
-/eclipse
-
+# eclipse
+bin
 *.launch
+.settings
+.metadata
+.classpath
+.project
 
-#####=== JetBrains ===#####
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
-
-*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
+# idea
+out
 *.ipr
 *.iws
+*.iml
+.idea
 
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
+# gradle
+build
+.gradle
 
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
+# other
+eclipse
+run
 
+# Files from Forge MDK
+forge*changelog.txt

build.gradle

@@ -1,54 +1,93 @@
 buildscript {
     repositories {
+        maven { url = 'https://files.minecraftforge.net/maven' }
         jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
+apply plugin: 'idea'
+
 
 Properties props = new Properties()
-props.load(new BufferedReader(new FileReader(file('../gradle.properties'))))
+props.load(new BufferedReader(new FileReader(file('gradle.properties'))))
 
-version = "${props.get('mc_version')}-1.4.0"
-group = "mrriegel.blockdrops"
-archivesBaseName = "blockdrops"
+version = "${props.get('mc_version')}-2.0.2"
+group = 'kdp.blockdrops'
+archivesBaseName = 'blockdrops'
 
-sourceCompatibility = targetCompatibility = '1.8'
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-}
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
 minecraft {
-    version = "${props.get('forge_version')}"
-    runDir = "run"
-    mappings = "${props.get('mapping')}"
-}
+    mappings channel: 'snapshot', version: "${props.get('mapping')}"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg')
+    runs {
+        client {
+            workingDirectory project.file('run')
 
-dependencies {
-	deobfCompile "${props.get('jei_version')}"
-}
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
-processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+            property 'forge.logging.console.level', 'debug'
 
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+            mods {
+                blockdrops {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        server {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                blockdrops {
+                    source sourceSets.main
+                }
+            }
+        }
     }
 }
 
-
 repositories {
     maven {
-        url "http://dvs1.progwml6.com/files/maven"
+        name = "Progwml6 maven"
+        url = "https://dvs1.progwml6.com/files/maven/"
     }
+    maven {
+        name = "ModMaven"
+        url = "https://modmaven.k-4u.nl"
+    }
+}
+
+dependencies {
+    minecraft "net.minecraftforge:forge:${props.get('mc_version')}-${props.get('forge_version')}"
+    compile fg.deobf("mezz.jei:jei-${props.get('mc_version')}:${props.get('jei_version')}")
 }
 
+def reobfFile = file("$buildDir/reobfJar/output.jar")
+def reobfArtifact = artifacts.add('default', reobfFile) {
+    type 'jar'
+    builtBy 'reobfJar'
+}
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact reobfArtifact
+        }
+    }
+    repositories {
+        maven {
+            url "file:///${project.projectDir}/mcmodsrepo"
+        }
+    }
+}

gradle.properties

@@ -1,3 +1,9 @@
 # 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
+
+mapping=20200723-1.16.1
+mc_version=1.16.1
+forge_version=32.0.108
+jei_version=7.0.1.10

gradle/wrapper/gradle-wrapper.properties

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