Yatopia 2 Electric Boogaloo [Yatopia Reforged]

.github/workflows/build.yml

@@ -41,40 +41,55 @@ jobs:
       uses: styfle/cancel-workflow-action@0.4.1
       with:
         access_token: ${{ github.token }}
+
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
-    - name: Pull Maven Cache
+
+    - name: Pull Gradle Cache
       uses: actions/cache@v2
-      id: maven-cache
+      id: gradle-cache
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-maven-
-    - uses: s4u/maven-settings-action@v2.1.0
-      name: Use ${{ matrix.java }} as the java target
-      with:
-        properties: '[{"maven.compiler.target": "${{ matrix.java }}"}]'
+        path: ~/.gradle
+        key: ${{ runner.os }}-maven-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}-java-${{ matrix.java }}
+
     - name: Setup Yatopia Project
       run: |
          git config --global user.email "ci@github.com"
          git config --global user.name "Github CI"
-         sudo chmod -R -f 777 scripts
-         ./yatopia init
+         git config --global gc.auto 0
+         sudo chmod -R -f 777 ./gradlew
+         ./gradlew initGitSubmodules
+
     - name: Get MC Version
-      run: echo "::set-output name=mcver::$(cat "Tuinity/Paper/work/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)" 
+      run: echo "::set-output name=mcver::$(cat "Paper/work/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)" 
       id: mcver
+
     - name: Pull Minecraft Decompile Cache
       uses: actions/cache@v2
       id: decompile-cache
       with:
-        path: Tuinity/Paper/work/Minecraft/${{ steps.mcver.outputs.mcver }}
-        key: ${{ steps.mcver.outputs.mcver }}-${{ runner.os }}-minecraft-decomp
+        path: Paper/work/Minecraft/${{ steps.mcver.outputs.mcver }}
+        key: ${{ steps.mcver.outputs.mcver }}-${{ runner.os }}-java-${{ matrix.java }}-minecraft-decomp
+
+    - name: Apply Patches
+      run: |
+        ./gradlew setupUpstream
+        ./gradlew applyPatches
+
+    - name: Pull Maven Cache
+      uses: actions/cache@v2
+      id: maven-cache
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+
     - name: Build Yatopia
       run: |
-        ./yatopia full
+        ./gradlew paperclip
+
     - name: Upload Artifact
       if: github.ref != 'refs/heads/ver/1.16.4'
       uses: actions/upload-artifact@v2

.gitignore

@@ -1,34 +1,62 @@
-Spigot
+# JVM crash related
+core.*
+hs_err_pid*
+
+# Intellij
+.idea/
+*.iml
+*.ipr
+*.iws
+out/
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# netbeans
+nbproject/
+nbactions.xml
+
+# Gradle
+!gradle-wrapper.jar
+.gradle/
+build/
+*/build/
+
+# we use maven!
+build.xml
+
+# Maven
+log/
+target/
+dependency-reduced-pom.xml
+
+# various other potential build files
+build/
+bin/
+dist/
+manifest.mf
+
+# Mac
+.DS_Store/
+.DS_Store
+
+# vim
+.*.sw[a-p]
+
+# Linux temp files
+*~
+
+# other stuff
+run/
+docs/build/
+
 Yatopia-Server
 Yatopia-API
 mc-dev
-*.iml
-.settings/org.eclipse.m2e.core.prefs
-.project
-.idea
-yatopia-paperclip.jar
-
-target
-
-target/site/surefire-report.html
-/patches/Akarin/**
-/patches/Purpur/**
-/patches/Empirecraft/**
-/patches/Rainforest/**
-/patches/Origami/**
-/patches/AirplaneLite/**
-!/patches/Purpur/server.txt
-!/patches/Purpur/api.txt
-!/patches/Empirecraft/server.txt
-!/patches/Empirecraft/api.txt
-!/patches/Akarin/server.txt
-!/patches/Akarin/api.txt
-!/patches/Rainforest/server.txt
-!/patches/Rainforest/api.txt
-!/patches/Origami/server.txt
-!/patches/Origami/api.txt
-!/patches/AirplaneLite/server.txt
-!/patches/AirplaneLite/api.txt
-*.jar
-
-/testserver/**
+yatopia-launcher.jar
+*clip.jar
+last-paper
+!upstreamConfig/*
+!upstreamCommits/*

.gitmodules

@@ -1,23 +1,39 @@
-[submodule "Tuinity"]
-	path = Tuinity
-	url = https://github.com/YatopiaMC/Yatopia-Tuninty.git
+[submodule "Paper"]
+	path = Paper
+	url = https://github.com/PaperMC/Paper.git
+
+[submodule "upstream/Tuinity"]
+	path = upstream/Tuinity
+	url = https://github.com/Spottedleaf/Tuinity
+	branch = master
+
+[submodule "upstream/Purpur"]
+	path = upstream/Purpur
+	url = https://github.com/pl3xgaming/Purpur.git
 	branch = ver/1.16.5
-[submodule "Akarin"]
-	path = Akarin
+
+[submodule "upstream/AirplaneLite"]
+	path = upstream/AirplaneLite
+	url = https://github.com/Technove/AirplaneLite.git
+	branch = master
+
+[submodule "upstream/Akarin"]
+	path = upstream/Akarin
 	url = https://github.com/Akarin-project/Akarin.git
 	branch = ver/1.16.4
-[submodule "Purpur"]
-	path = Purpur
-	url = https://github.com/pl3xgaming/Purpur.git
-	branch = ver/1.16.5
-[submodule "Empirecraft"]
-	path = Empirecraft
+
+[submodule "upstream/Empirecraft"]
+	path = upstream/Empirecraft
 	url = https://github.com/starlis/empirecraft.git
 	branch = master
-[submodule "Origami"]
-	path = Origami
+
+[submodule "upstream/Origami"]
+	path = upstream/Origami
 	url = https://github.com/Minebench/Origami.git
 	branch = 1.16
-[submodule "AirplaneLite"]
-	path = AirplaneLite
-	url = https://github.com/Technove/AirplaneLite.git
+
+[submodule "Yatopia-API"]
+	path = Yatopia-API
+
+[submodule "Yatopia-Server"]
+	path = Yatopia-Server

Jenkinsfile

@@ -6,15 +6,14 @@ pipeline {
             steps {
                 scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*')
                 sh 'rm -rf ./target'
-                sh 'rm -rf ./Tuinity/Paper/Paper-API ./Tuinity/Paper/Paper-Server ./Tuinity/Paper/work/Spigot/Spigot-API ./Tuinity/Paper/work/Spigot/Spigot-Server'
-                sh 'rm -rf ./Tuinity/Tuinity-API ./Tuinity/Tuinity-Server ./Tuinity/mc-dev'
+                sh 'rm -rf ./Paper/Paper-API ./Paper/Paper-Server ./Paper/work/Spigot/Spigot-API ./Paper/work/Spigot/Spigot-Server'
                 sh 'rm -rf ./Yatopia-API ./Yatopia-Server'
-                sh 'chmod +x ./scripts/*.sh'
+                sh 'chmod +x ./gradlew'
             }
         }
         stage('Init project & submodules') {
             steps {
-                sh './yatopia init'
+                sh './gradlew initGitSubmodules'
             }
         }
         stage('Decompile & apply patches') {
@@ -28,17 +27,13 @@ pipeline {
                     publisherStrategy: 'EXPLICIT',
                 ) {
                     sh '''
-                        set -e
-                        source "./scripts/functions.sh"
-                        basedir
-                        $scriptdir/updateUpstream.sh "$basedir" false true || exit 1
-                        set -e
-                        $scriptdir/applyPatches.sh "$basedir" || exit 1
+                    ./gradlew setupUpstream
+                    ./gradlew applyPatches
                     '''
                 }
             }
         }
-        stage('Build API') {
+        stage('Build') {
             tools {
                 jdk "OpenJDK 8"
             }
@@ -48,23 +43,10 @@ pipeline {
                     mavenLocalRepo: '.repository',
                     publisherStrategy: 'EXPLICIT'
                 ) {
-                    sh 'mvn -N install org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy'
-                    sh 'cd Yatopia-API && mvn install org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy'
-                    sh 'cd ./Tuinity/Paper/Paper-MojangAPI && mvn install'
-                }
-            }
-        }
-        stage('Build Server') {
-            tools {
-                jdk "OpenJDK 8"
-            }
-            steps {
-                withMaven(
-                    maven: '3',
-                    mavenLocalRepo: '.repository',
-                    publisherStrategy: 'EXPLICIT'
-                ) {
-                    sh 'cd Yatopia-Server && mvn install org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy -DaltDeploymentRepository=codemc-snapshots::default::https://repo.codemc.org/repository/nms-local/'
+                    sh '''
+                    ./gradlew build
+                    ./gradlew publish
+                    '''
                 }
             }
         }
@@ -79,18 +61,10 @@ pipeline {
                     publisherStrategy: 'EXPLICIT'
                 ) {
                     sh '''
-                        basedir=$(pwd)
-                        paperworkdir="$basedir/Tuinity/Paper/work"
-                        mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
-                        serverjar="$basedir/Yatopia-Server/target/yatopia-$mcver.jar"
-                        vanillajar="$paperworkdir/Minecraft/$mcver/$mcver.jar"
-                        (
-                            cd "$paperworkdir/Paperclip"
-                            mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$serverjar" "-Dvanillajar=$vanillajar"
-                        )
                         mkdir -p "./target"
-                        cp "$paperworkdir/Paperclip/assembly/target/paperclip-$mcver.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
-                    '''
+                        ./gradlew paperclip
+                        cp "yatopia-$mcver-paperclip.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
+                        '''
                 }
             }
             post {

Licensing/LICENSE.md

@@ -1,11 +1,5 @@
-The project (Everything that is not a .patch file) is licensed under the MIT license found [here](https://github.com/YatopiaMC/Yatopia/blob/ver/1.16.2/Licensing/MIT.md).
-
-All patches (.patch files) marked with "lithium" are licensed under LGPL3 found [here](https://github.com/jellysquid3/lithium-fabric/blob/1.16.x/dev/LICENSE.txt).
-
-All patches (.patch files) marked with "tic-tacs" are licensed under LGPL3 found [here](https://github.com/gegy1000/tic-tacs/blob/1.16.2/LICENSE).
-
-All patches (.patch files) marked with "gluelist" are licensed under Apache 2.0 found [here](https://github.com/ertugrulcetin/GlueList/blob/master/Readme.md).
-
-All other patches (.patch files) included in this repo are licensed under the MIT license found [here](https://github.com/YatopiaMC/Yatopia/blob/ver/1.16.2/Licensing/MIT.md).
-
-See [EMC](https://github.com/starlis/empirecraft/blob/master/README.md), [Akarin](https://github.com/Akarin-project/Akarin/blob/1.16.3/LICENSE.md), [Purpur](https://github.com/pl3xgaming/Purpur/blob/ver/1.16.3/LICENSE), [Rainforest](https://github.com/Proximyst/Rainforest), [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 when built.
+The project without the build tools (Everything that is not a .patch file or in the buildSrc folder) are licensed under the MIT license found [here](MIT.md).<br>
+All files in the buildSrc folder are licensed under MIT found [here](../buildSrc/license.txt)<br>
+All patches (.patch files) marked with "lithium" are licensed under LGPL3 found [here](https://github.com/jellysquid3/lithium-fabric/blob/1.16.x/dev/LICENSE.txt).<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.3/LICENSE.md), [Purpur](https://github.com/pl3xgaming/Purpur/blob/ver/1.16.5/LICENSE), [AirplaneLite](https://github.com/Technove/AirplaneLite/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.

Licensing/MIT.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 YatopiaMC
+Copyright (c) 2020 - 2021 YatopiaMC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal