C2ME Port

.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"

Licensing/LICENSE.md

@@ -3,6 +3,7 @@ All files in the buildSrc folder are licensed under MIT found [here](../buildSrc
 All patches (.patch files) marked with "lithium" are licensed under LGPL3 found [here](https://github.com/CaffeineMC/lithium-fabric/blob/1.16.x/dev/LICENSE.txt).<br>
 All patches (.patch files) marked with "hydrogen" are licensed under LGPL3 found [here](https://github.com/CaffeineMC/hydrogen-fabric/blob/1.16.x/LICENSE.txt).<br>
 All patches (.patch files) marked with "krypton" are licensed under MIT found [here](https://github.com/astei/krypton/blob/master/LICENSE).<br>
+All patches (.patch files) marked with "Cadmium" are licensed under MIT found [here](https://github.com/LucilleTea/cadmium-fabric/blob/1.16.x/dev-my-fork/LICENSE.txt).<br>
 All patches (.patch files) marked with "Tic-Tacs" are licensed under LGPLv3 found [here](https://github.com/Gegy/tic-tacs/blob/1.16.4/LICENSE).<br>
 All other patches (.patch files) included in this repo are licensed under the MIT license found [here](MIT.md).<br>
 See [EMC](https://github.com/starlis/empirecraft/blob/master/README.md), [Akarin](https://github.com/Akarin-project/Akarin/blob/1.16.5/LICENSE.md), [Purpur](https://github.com/pl3xgaming/Purpur/blob/ver/1.16.5/LICENSE), [Airplane](https://github.com/Technove/Airplane/blob/master/PATCHES-LICENSE), [Origami](https://github.com/Minebench/Origami/blob/1.16/PATCHES-LICENSE), and [Tuinity](https://github.com/Spottedleaf/Tuinity/blob/master/PATCHES-LICENSE) for the license of patches automatically pulled during upstream updates.

README.md

@@ -18,6 +18,7 @@ Yatopia combines the code from many [Paper](https://github.com/PaperMC/Paper) fo
 * [Origami](https://github.com/Minebench/Origami)
 * [Purpur](https://github.com/pl3xgaming/Purpur)
 * [Airplane](https://github.com/Technove/Airplane)
+* [Cadmium](https://github.com/LucilleTea/cadmium-fabric)
 * [Tic-Tacs](https://github.com/Gegy/tic-tacs)
 
 

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 <titaniumtown@gmail.com>
+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>