Fix merge conflicts for world-god-class

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+# Current Lead
+*		@theglitch76
+
+# Maintainers of specific modules.
+# Add the current lead to the end of each, because specific overrules general.
+# Any org member is encouraged to add themselves to this file when creating a new module,
+# but it's not required.
+/patchwork-enum-hacks/ 	@NuclearFarts @theglitch76
+/patchwork-fake-players/ @williambl @theglitch76

.github/workflows/build.yml

@@ -8,57 +8,40 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        java-version: [1.8, 11, 14]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 8
-      # https://github.com/actions/cache/blob/master/examples.md#java---gradle
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-build-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          java-version: ${{ matrix.java-version }}
       - uses: eskatos/gradle-command-action@v1
         with:
-          arguments: remapJar
+          gradle-version: wrapper
+          arguments: build -x check
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: false
       # Artifact publishing
       - uses: actions/upload-artifact@v2
+        # In theory we could publish the j11 or even j14 jar, but let's not take any chances
+        if: ${{ matrix.java-version == 1.8 }}
         with:
+          name: Jar Download
           path: ./build/libs/patchwork-api-?.?.?.jar
 
-  checkstyle:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-checkstyle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - uses: eskatos/gradle-command-action@v1
-        with:
-          arguments: checkstyleMain
 
-  license:
+  check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 8
-      - uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-license-${{ hashFiles('**/*.gradle*') }}-license
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          java-version: 11
       - uses: eskatos/gradle-command-action@v1
         with:
-          arguments: checkLicenses
+          gradle-version: wrapper
+          arguments: licenseCheck checkstyleMain
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: false

.github/workflows/publish.yml

@@ -8,16 +8,6 @@ env:
   bintray_key: ${{ secrets.bintray_key }}
 
 jobs:
-#  bintray:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v1
-#      - uses: actions/setup-java@v1
-#        with:
-#          java-version: 8
-#      - uses: eskatos/gradle-command-action@v1
-#        with:
-#          arguments: bintrayUpload
   release:
     runs-on: ubuntu-latest
     steps:
@@ -27,12 +17,10 @@ jobs:
           java-version: 8
       - uses: eskatos/gradle-command-action@v1
         with:
-          arguments: remapJar
-      - name: Delete -dev jar
-        run: rm ./build/libs/patchwork-api-*-dev.jar
-      - uses: ncipollo/[email protected]
+          arguments: build
+      - uses: ncipollo/release-action@v1
         with:
-          artifacts: ./build/libs/patchwork-api-*.jar
+          artifacts: ./build/libs/patchwork-api-?.?.?.jar
           token: ${{ secrets.GITHUB_TOKEN }}
   bintray:
     runs-on: ubuntu-latest
@@ -43,4 +31,7 @@ jobs:
           java-version: 8
       - uses: eskatos/gradle-command-action@v1
         with:
+          gradle-version: wrapper
           arguments: bintrayUpload
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: false

build.gradle

@@ -3,7 +3,7 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'maven-publish'
-	id 'fabric-loom' version '0.4-SNAPSHOT' apply false
+	id 'fabric-loom' version '0.5-SNAPSHOT' apply false
 	id 'net.minecrell.licenser' version '0.4.1'
 	id "org.ajoberstar.grgit" version "3.1.1"
 	id 'com.jfrog.bintray' version '1.8.4'
@@ -12,10 +12,13 @@ plugins {
 def ENV = System.getenv()
 
 class Globals {
-	static def baseVersion = "0.7.0"
+	static def baseVersion = "0.9.1"
 	static def mcVersion = "1.14.4"
 	static def yarnVersion = "+build.16"
 }
+version = Globals.baseVersion //+ "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local") + "-" + getBranch()
+
+logger.lifecycle("Building Patchwork: " + version)
 
 def getSubprojectVersion(project, version) {
 	if (grgit == null) {
@@ -46,17 +49,25 @@ allprojects {
 	apply plugin: 'maven-publish'
 	apply plugin: 'fabric-loom'
 	apply plugin: 'net.minecrell.licenser'
-
+	apply plugin: 'com.jfrog.bintray'
 	sourceCompatibility = 1.8
 	targetCompatibility = 1.8
 
 	group = "net.patchworkmc.patchwork-api"
 
+	loom {
+		shareCaches = true
+	}
+
+	repositories {
+		maven { url 'https://dl.bintray.com/patchworkmc/Patchwork-Maven/' }
+	}
+
 	dependencies {
 		minecraft "com.mojang:minecraft:$Globals.mcVersion"
 		mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}:v2"
-		modCompile "net.fabricmc:fabric-loader:0.8.4+build.198"
-		modCompile "net.fabricmc.fabric-api:fabric-api:0.4.2+build.246-1.14"
+		modImplementation "net.fabricmc:fabric-loader:0.10.0+build.208"
+		modImplementation "net.fabricmc.fabric-api:fabric-api:0.15.1+build.260-1.14"
 
 		implementation 'net.patchworkmc:patchwork-eventbus:2.0.1:all'
 		implementation 'com.google.code.findbugs:jsr305:3.0.2'
@@ -69,10 +80,6 @@ allprojects {
 		dev
 	}
 
-	repositories {
-		maven { url 'https://dl.bintray.com/patchworkmc/Patchwork-Maven/' }
-	}
-
 	jar {
 		classifier = "dev"
 	}
@@ -113,7 +120,7 @@ allprojects {
 
 	checkstyle {
 		configFile = rootProject.file("checkstyle.xml")
-		toolVersion = '8.25'
+		toolVersion = '8.36.2'
 	}
 }
 
@@ -136,39 +143,50 @@ subprojects {
 
 	publishing {
 		publications {
-			mavenJava(MavenPublication) {
-				artifact(file("${project.buildDir}/libs/$archivesBaseName-${version}-maven.jar")) {
-					builtBy remapMavenJar
-				}
-				artifact(sourcesJar) {
-					builtBy remapSourcesJar
+			create("${archivesBaseName}_mavenJava", MavenPublication) {
+				afterEvaluate {
+					artifact(file("${project.buildDir}/libs/$archivesBaseName-${version}-maven.jar")) {
+						builtBy remapMavenJar
+					}
+					artifact(sourcesJar) {
+						builtBy remapSourcesJar
+					}
 				}
 			}
 		}
+	}
 
-		repositories {
-			maven {
-				url "http://mavenupload.modmuss50.me/"
-				if (project.hasProperty('mavenPass')) {
-					credentials {
-						username 'buildslave'
-						password project.getProperty('mavenPass')
-					}
-				}
+	bintray {
+		user = project.hasProperty('bintrayUser') ? project.getProperty('bintrayUser') : System.getenv('bintray_user')
+		key = project.hasProperty('bintrayKey') ? project.getProperty('bintrayKey') : System.getenv('bintray_key')
+		publish = true
+		override = true
+		publications = ["${archivesBaseName}_mavenJava"]
+		pkg {
+			repo = project.bintrayRepo
+			name = archivesBaseName
+			user = bintray.user
+			userOrg = project.repoOwner
+			licenses = [project.codeLicense]
+			desc = project.description
+			websiteUrl = "https://github.com/${project.repoOwner}/${project.repoName}"
+			issueTrackerUrl = "https://github.com/${project.repoOwner}/${project.repoName}/issues"
+			vcsUrl = "https://github.com/${project.repoOwner}/${project.repoName}.git"
+			publicDownloadNumbers = true
+
+			githubRepo = "${project.repoOwner}/${project.repoName}"
+			version {
+				name = project.version
+				released = new Date()
 			}
 		}
 	}
 
 	javadoc.enabled = false
 }
 
-task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) {
-	afterEvaluate {
-		input = file("${project.buildDir}/libs/${archivesBaseName}-${version}-dev.jar")
-		archiveName = "${archivesBaseName}-${version}-maven.jar"
-		addNestedDependencies = false
-	}
-}
+subprojects.each { bintrayUpload.dependsOn("${it.path}:bintrayUpload") }
+
 bintray {
 	user = project.hasProperty('bintrayUser') ? project.getProperty('bintrayUser') : System.getenv('bintray_user')
 	key = project.hasProperty('bintrayKey') ? project.getProperty('bintrayKey') : System.getenv('bintray_key')
@@ -193,7 +211,18 @@ bintray {
 			released = new Date()
 		}
 	}
+
+	javadoc.enabled = false
+}
+
+task remapMavenJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: jar) {
+	afterEvaluate {
+		input = file("${project.buildDir}/libs/${archivesBaseName}-${version}-dev.jar")
+		archiveName = "${archivesBaseName}-${version}-maven.jar"
+		addNestedDependencies = false
+	}
 }
+
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
@@ -220,6 +249,7 @@ publishing {
 task licenseFormatAll
 subprojects {p -> licenseFormatAll.dependsOn("${p.path}:licenseFormat")}
 subprojects.each {remapJar.dependsOn("${it.path}:remapJar")}
+
 repositories {
 	flatDir {
 		dirs 'jars'
@@ -238,35 +268,25 @@ dependencies {
 
 	minecraft "com.mojang:minecraft:$Globals.mcVersion"
 	mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}:v2"
-	modCompile "net.fabricmc:fabric-loader:0.8.4+build.198"
-	modCompile "net.fabricmc.fabric-api:fabric-api:0.4.2+build.246-1.14"
+	modImplementation "net.fabricmc:fabric-loader:0.10.0+build.208"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:0.15.1+build.260-1.14"
 
 	implementation 'com.electronwill.night-config:toml:3.6.2'
 	include 'com.electronwill.night-config:core:3.6.2'
 	include 'com.electronwill.night-config:toml:3.6.2'
 	include 'net.patchworkmc:patchwork-eventbus:2.0.0:all'
+}
 
-	fileTree(dir: 'jars', include: '*.jar').each {
-		String baseName = it.name.replace(".jar", "")
-		String version = "0.1.0"
-		int split = baseName.lastIndexOf('-')
-
-		if (split != -1) {
-			version = baseName.substring(split + 1)
-			baseName = baseName.substring(0, split)
-		}
-
-		String name = "testmod:${baseName}:${version}"
+loom {
+	shareCaches = true
+}
 
-		System.out.println("Found test mod: " + it.name.replace(".jar", "") + " -> " + name)
 
-		modCompileOnly name
-		modRuntime name
+task copyIdeaFiles(type: Copy) {
+	if (file(".idea/").exists()) {
+		from "idea-docs/"
+		into ".idea/"
 	}
 }
 
-version = Globals.baseVersion //+ "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local") + "-" + getBranch()
-
-logger.lifecycle("Building Patchwork: " + version)
-
-apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
+copyIdeaFiles

gradle.properties

@@ -1,4 +1,8 @@
-org.gradle.jvmargs=-Xmx2G
+# Gradle needs a lot of memory to build in parallel.
+# If you're starved, you can reduce this to 1G and disable parallel building.
+org.gradle.jvmargs=-Xmx3G
+org.gradle.parallel=true
+org.gradle.daemon=false
 repoName=patchwork-api
 repoOwner=patchworkmc
 bintrayRepo=Patchwork-Maven

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

idea-docs/checkstyle-idea.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="CheckStyle-IDEA">
+        <option name="configuration">
+            <map>
+                <entry key="active-configuration" value="LOCAL_FILE:$PROJECT_DIR$/checkstyle.xml:patchwork-api" />
+                <entry key="checkstyle-version" value="8.36.2" />
+                <entry key="copy-libs" value="false" />
+                <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+                <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+                <entry key="location-2" value="LOCAL_FILE:$PROJECT_DIR$/checkstyle.xml:patchwork-api" />
+                <entry key="scan-before-checkin" value="false" />
+                <entry key="scanscope" value="JavaOnly" />
+                <entry key="suppress-errors" value="true" />
+            </map>
+        </option>
+    </component>
+</project>