rebase c2me port

Author: Simon Gardling

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '15', '16' ]
+        java: [ '11', '15', '16' ]
       fail-fast: false
     steps:
     - uses: actions/checkout@v2

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
     stages {
         stage('Cleanup') {
             tools {
-                jdk "OpenJDK 8"
+                jdk "OpenJDK 11"
             }
             steps {
                 scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*')
@@ -29,7 +29,7 @@ pipeline {
         }
         stage('Init project & submodules') {
             tools {
-                jdk "OpenJDK 8"
+                jdk "OpenJDK 11"
             }
             steps {
                 withMaven(
@@ -43,7 +43,7 @@ pipeline {
         }
         stage('Decompile & apply patches') {
             tools {
-                jdk "OpenJDK 8"
+                jdk "OpenJDK 11"
             }
             steps {
                 withMaven(
@@ -60,7 +60,7 @@ pipeline {
         }
         stage('Build') {
             tools {
-                jdk "OpenJDK 8"
+                jdk "OpenJDK 11"
             }
             steps {
                 withMaven(
@@ -76,7 +76,8 @@ pipeline {
                         paperworkdir="$basedir/Paper/work"
                         mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
                         
-                        patchedJarPath="$basedir/Yatopia-Server/build/libs/yatopia-server-$mcver-R0.1-SNAPSHOT.jar"
+                        patchedJarPath=$(find "$basedir/Yatopia-Server/build/libs/" -type f -name "*.jar" | grep -v '\\-sources.jar$')
+
                         vanillaJarPath="$paperworkdir/Minecraft/$mcver/$mcver.jar"
 
                         cd "$paperworkdir/Paperclip"

PATCHES.md

@@ -105,6 +105,7 @@ This is an overview over all patches that are currently used.
 | server |  Breedable Polar Bears      | William Blake Galbreath |  |
 | api |  Bring back server name      | William Blake Galbreath |  |
 | server |  Bring back server name      | William Blake Galbreath |  |
+| server |  C2ME Port      | ishland | Simon Gardling |
 | server |  Cache climbing check for activation      | Paul Sauve |  |
 | server |  Cache coordinate key for micro opt      | Paul Sauve |  |
 | server |  Cache entityhuman display name      | Paul Sauve |  |
@@ -229,6 +230,7 @@ This is an overview over all patches that are currently used.
 | server |  Fix the dead lagging the server      | William Blake Galbreath |  |
 | server |  Fix vanilla command permission handler      | William Blake Galbreath |  |
 | server |  Flying squids! Oh my!      | William Blake Galbreath |  |
+| server |  Force world save      | ishland |  |
 | api |  Full netherite armor grants fire resistance      | BillyGalbreath |  |
 | server |  Full netherite armor grants fire resistance      | BillyGalbreath |  |
 | server |  Gamemode extra permissions      | BillyGalbreath |  |
@@ -293,6 +295,7 @@ This is an overview over all patches that are currently used.
 | server |  Movement options for armor stands      | Mariell Hoversholm |  |
 | server |  Multi-Threaded Server Ticking Vanilla      | Spottedleaf |  |
 | server |  Multi-Threaded ticking CraftBukkit      | Spottedleaf |  |
+| server |  Multi-threaded World Upgrade      | ishland |  |
 | server |  Name craft scheduler threads according to the plugin using      | Spottedleaf |  |
 | server |  New nbt cache      | Hugo Planque | ishland |
 | server |  Nuke streams off BlockPosition      | Ivan Pekov |  |
@@ -439,11 +442,14 @@ This is an overview over all patches that are currently used.
 | server |  Zombie horse naturally spawn      | William Blake Galbreath |  |
 | server |  add config for logging login location      | Simon Gardling |  |
 | server |  dont load chunks for physics      | Aikar |  |
+| api |  java 11      | Simon Gardling |  |
+| server |  java 11      | Simon Gardling |  |
 | server |  lithium DataTrackerMixin      | JellySquid | tr7zw |
 | server |  lithium HashedList      | JellySquid |  |
 | server |  lithium MixinBox      | JellySquid |  |
 | server |  lithium MixinDirection      | JellySquid |  |
 | server |  lithium MixinGoalSelector      | JellySquid |  |
+| server |  lithium MultiNoiseBiomeSourceMixin      | ishland |  |
 | server |  lithium NoiseChunkGeneratorMixin      | JellySquid |  |
 | server |  lithium PerlinNoiseSamplerMixin      | JellySquid | Bud Gidiere |
 | server |  lithium VoronoiBiomeAccessTypeMixin      | JellySquid |  |

build.gradle.kts

@@ -59,10 +59,10 @@ subprojects {
     }
 
     java {
-        if(JavaVersion.VERSION_1_8 > JavaVersion.current()){
-            error("This build must be run with Java 8 or better")
+        if(JavaVersion.VERSION_11 > JavaVersion.current()){
+            error("This build must be run with Java 11 or later")
         }
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.current()
         withSourcesJar()
     }

patches/api/0009-java-11.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Simon Gardling <[email protected]>
+Date: Fri, 23 Apr 2021 11:11:13 -0400
+Subject: [PATCH] java 11
+
+
+diff --git a/pom.xml b/pom.xml
+index cc3149a51f5780b73c11492e13dbe7eb86d83e6c..6143478e7e4bfb12208b290b64eee0f95a84f445 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -19,8 +19,8 @@
+ 
+     <properties>
+         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
+-        <maven.compiler.source>1.8</maven.compiler.source>
+-        <maven.compiler.target>1.8</maven.compiler.target>
++        <maven.compiler.source>11</maven.compiler.source>
++        <maven.compiler.target>11</maven.compiler.target>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+         <adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
+     </properties>