Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 0b1e48f.

Jenkinsfile

@@ -26,10 +26,6 @@ pipeline {
 
         stage('Build') {
             steps {
-              withCredentials([file(credentialsId: 'MAGMA_GRADLE_PRO', variable: 'MAGMA_GRADLE_PRO'),file(credentialsId: 'MAGMA_KEY_STORE', variable: 'MAGMA_KEY_STORE')]) {
-                sh 'cp \$MAGMA_GRADLE_PRO ./gradle.properties'
-                sh 'cp \$MAGMA_KEY_STORE ./keystore.jks'
-              }
                 sh './gradlew launch4j --console=plain'
             }
         }

README.md

@@ -15,16 +15,6 @@ Magma is based on Forge and Paper, meaning it can run both Craftbukkit/Spigot/Pa
 
 We hope to eliminate all issues with craftbukkit forge servers. In the end, we envision a seamless, low lag Magma experience with support for newer 1.12+ versions of Minecraft.
 
-## Jar Signing
-
-As of November 22th 2020 all published builds will be signed. You can validate the integrity of these builds by comparing their signatures against one of our public fingerprint.
-
-| Hash   | Fingerprint                                                        |
-|--------|--------------------------------------------------------------------|
-| MD5    | `EC8411109B8828FBA1CC26113281C56F`                                 |
-| SHA1   | `1D1A4FD5C6D39591E94E789C8C4C8D725498D8BE`                         |
-| SHA256 | `AD2C1ED3FBE6D4D75C379EBB6ACF1915E602D554939C4D37B593DD20BE8A2103` |
-
 ## Big Paper Update :fireworks:
 
 Magma at the moment **is not** using all of the API/Patches with this update we will have all features of Paper and more optimizations (including Timings v2).

build.gradle

@@ -196,17 +196,21 @@ tasks.withType(JavaCompile) {
 
 task signUniversal(type: SignJar, dependsOn: 'outputJar') {
     onlyIf {
-        project.hasProperty('keyStore')
+        project.hasProperty('jarsigner')
     }
 
+    def jarsigner = [:]
+
+    if (project.hasProperty('jarsigner'))
+        jarsigner = project.jarsigner
+
     alias = 'forge'
     exclude "paulscode/**"
-    keyStore = project.findProperty('keyStore')
-    alias = project.findProperty('keyStoreAlias')
-    storePass = project.findProperty('keyStorePass')
-    keyPass = project.findProperty('keyStoreKeyPass')
-    inputFile = file("build/distributions/${project.name}-${project.version}-server.jar").canonicalPath
-    outputFile = file("build/distributions/${project.name}-${project.version}-server.jar").canonicalPath
+    storePass = jarsigner.storepass
+    keyPass = jarsigner.keypass
+    keyStore = jarsigner.keystore
+    inputFile = outputJar.archivePath
+    outputFile = outputJar.archivePath
 }
 build.dependsOn signUniversal
 installer.dependsOn signUniversal

patches/net/minecraftforge/fml/common/asm/FMLSanityChecker.java.patch

@@ -1,18 +1,5 @@
 --- ../src-base/minecraft/net/minecraftforge/fml/common/asm/FMLSanityChecker.java
 +++ ../src-work/minecraft/net/minecraftforge/fml/common/asm/FMLSanityChecker.java
-@@ -45,9 +45,9 @@
-
- public class FMLSanityChecker implements IFMLCallHook
- {
--    private static final String FMLFINGERPRINT =   "51:0A:FB:4C:AF:A4:A0:F2:F5:CF:C5:0E:B4:CC:3C:30:24:4A:E3:8E".toLowerCase().replace(":", "");
--    private static final String FORGEFINGERPRINT = "E3:C3:D5:0C:7C:98:6D:F7:4C:64:5C:0A:C5:46:39:74:1C:90:A5:57".toLowerCase().replace(":", "");
--    private static final String MCFINGERPRINT =    "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", "");
-+    private static final String FMLFINGERPRINT =   "1D:1A:4F:D5:C6:D3:95:91:E9:4E:78:9C:8C:4C:8D:72:54:98:D8:BE".toLowerCase().replace(":", "");
-+    private static final String FORGEFINGERPRINT = "1D:1A:4F:D5:C6:D3:95:91:E9:4E:78:9C:8C:4C:8D:72:54:98:D8:BE".toLowerCase().replace(":", "");
-+    private static final String MCFINGERPRINT =    "1D:1A:4F:D5:C6:D3:95:91:E9:4E:78:9C:8C:4C:8D:72:54:98:D8:BE".toLowerCase().replace(":", "");
-     private LaunchClassLoader cl;
-     private boolean liveEnv;
-     public static File fmlLocation;
 @@ -171,7 +171,7 @@
          }
          if (!goodFML)