Handle proxy online mode properly

.github/workflows/build.yml

@@ -80,12 +80,12 @@ jobs:
 
     - name: Build Yatopia
       run: |
-        ./gradlew paperclip
+        ./gradlew yatoclip
 
     - name: Upload Artifact
       if: github.ref != 'refs/heads/ver/1.16.4'
       uses: actions/upload-artifact@v2
       with:
         name: Yatopia-${{ matrix.java }}
-        path: yatopia-1.16.5-paperclip.jar
+        path: yatopia-1.16.5-yatoclip.jar
 

Jenkinsfile

@@ -1,91 +1,74 @@
-pipeline {
-    agent { label 'slave' }
-    options { timestamps() }
-    stages {
-        stage('Cleanup') {
-            steps {
-                scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*')
-                sh 'rm -rf ./target'
-                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 ./gradlew'
-            }
-        }
-        stage('Init project & submodules') {
-            steps {
-                withMaven(
-                    maven: '3',
-                    mavenLocalRepo: '.repository',
-                    publisherStrategy: 'EXPLICIT',
-                ) {
-                    sh './gradlew initGitSubmodules'
-                }
-            }
-        }
-        stage('Decompile & apply patches') {
-            tools {
-                jdk "OpenJDK 8"
-            }
-            steps {
-                withMaven(
-                    maven: '3',
-                    mavenLocalRepo: '.repository',
-                    publisherStrategy: 'EXPLICIT',
-                ) {
-                    sh '''
-                    ./gradlew setupUpstream
-                    ./gradlew applyPatches
-                    '''
-                }
-            }
-        }
-        stage('Build') {
-            tools {
-                jdk "OpenJDK 8"
-            }
-            steps {
-                withMaven(
-                    maven: '3',
-                    mavenLocalRepo: '.repository',
-                    publisherStrategy: 'EXPLICIT'
-                ) {
-                    withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
-                        sh '''
-                        ./gradlew build
-                        ./gradlew publish
-                        '''
-                    }
-                }
-            }
-        }
-        stage('Build Launcher') {
-            tools {
-                jdk "OpenJDK 8"
-            }
-            steps {
-                withMaven(
-                    maven: '3',
-                    mavenLocalRepo: '.repository',
-                    publisherStrategy: 'EXPLICIT'
-                ) {
-                    sh '''
-                        mkdir -p "./target"
-                        ./gradlew paperclip
-                        basedir=$(pwd)
-                        paperworkdir="$basedir/Paper/work"
-                        mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
-                        cp "yatopia-$mcver-paperclip.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
-                        '''
-                }
-            }
-            post {
-                success {
-                    archiveArtifacts "target/*.jar"
-                }
-                failure {
-                    cleanWs()
-                }
-            }
-        }
-    }
-}
+pipeline {
+    agent { label 'slave' }
+    options { timestamps() }
+    stages {
+        stage('Cleanup') {
+            steps {
+                scmSkip(deleteBuild: true, skipPattern:'.*\\[CI-SKIP\\].*')
+                sh 'rm -rf ./target'
+                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 ./gradlew'
+            }
+        }
+        stage('Init project & submodules') {
+            steps {
+                withMaven(
+                    maven: '3',
+                    mavenLocalRepo: '.repository',
+                    publisherStrategy: 'EXPLICIT',
+                ) {
+                    sh './gradlew initGitSubmodules'
+                }
+            }
+        }
+        stage('Decompile & apply patches') {
+            tools {
+                jdk "OpenJDK 8"
+            }
+            steps {
+                withMaven(
+                    maven: '3',
+                    mavenLocalRepo: '.repository',
+                    publisherStrategy: 'EXPLICIT',
+                ) {
+                    sh '''
+                    ./gradlew setupUpstream
+                    ./gradlew applyPatches
+                    '''
+                }
+            }
+        }
+        stage('Build') {
+            tools {
+                jdk "OpenJDK 8"
+            }
+            steps {
+                withMaven(
+                    maven: '3',
+                    mavenLocalRepo: '.repository',
+                    publisherStrategy: 'EXPLICIT'
+                ) {
+                    withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
+                        sh '''
+                        ./gradlew clean yatoclip publish
+                        mkdir -p "./target"
+                        basedir=$(pwd)
+                        paperworkdir="$basedir/Paper/work"
+                        mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
+                        cp "yatopia-$mcver-yatoclip.jar" "./target/yatopia-$mcver-yatoclip-b$BUILD_NUMBER.jar"
+                        '''
+                    }
+                }
+            }
+            post {
+                success {
+                    archiveArtifacts "target/*.jar"
+                }
+                failure {
+                    cleanWs()
+                }
+            }
+        }
+    }
+}

PATCHES.md

@@ -8,6 +8,7 @@ This is an overview over all patches that are currently used.
 
 | Side | Patch        | Author           | CoAuthors  |
 | ----- | ------------- |:-------------:| -----:|
+| server |  (PaperPR) Inline shift direction fields      | Andrew Steinborn |  |
 | server |  AFK API      | William Blake Galbreath |  |
 | api |  AFK API      | William Blake Galbreath |  |
 | server |  Ability to re-add farmland mechanics from Alpha      | Yive |  |
@@ -131,6 +132,8 @@ This is an overview over all patches that are currently used.
 | server |  Delay chunk unloads      | Spottedleaf |  |
 | server |  Despawn rate config options per projectile type      | jmp |  |
 | server |  Detail more information in watchdog dumps      | Spottedleaf |  |
+| server |  Detailed lag and crash reports      | ishland |  |
+| api |  Detailed lag and crash reports      | ishland |  |
 | server |  Disable loot drops on death by cramming      | William Blake Galbreath |  |
 | server |  Disable outdated build check      | William Blake Galbreath |  |
 | api |  Disable reload command      | Ivan Pekov |  |
@@ -185,6 +188,7 @@ This is an overview over all patches that are currently used.
 | api |  Full netherite armor grants fire resistance      | BillyGalbreath |  |
 | server |  Giants AI settings      | William Blake Galbreath |  |
 | server |  Global Eula file      | tr7zw |  |
+| server |  Handle proxy online mode properly      | ishland |  |
 | server |  Heavily optimize furnance fuel and recipe lookups      | tr7zw | Mykyta Komarn |
 | server |  Heavily optimize recipe lookups in CraftingManager      | Mykyta Komarn | Ivan Pekov, ishland |
 | server |  Highly optimise single and multi-AABB VoxelShapes and      | Spottedleaf |  |
@@ -240,6 +244,7 @@ This is an overview over all patches that are currently used.
 | server |  Multi-Threaded Server Ticking Vanilla      | Spottedleaf |  |
 | server |  Multi-Threaded ticking CraftBukkit      | Spottedleaf |  |
 | server |  Name craft scheduler threads according to the plugin using      | Spottedleaf |  |
+| server |  New nbt cache      | Hugo Planque |  |
 | server |  Nuke streams off BlockPosition      | Ivan Pekov |  |
 | server |  Nuke streams off SectionPosition      | Ivan Pekov |  |
 | server |  Optimise EntityInsentient#checkDespawn      | Spottedleaf |  |
@@ -374,3 +379,4 @@ This is an overview over all patches that are currently used.
 | server |  lithium VoronoiBiomeAccessTypeMixin      | JellySquid |  |
 | server |  lithium enum_values      | JellySquid |  |
 | server |  lithium reduce allocations      | JellySquid | Mykyta Komarnytskyy |
+| server |  lithium: cache chunk gen sea level      | SuperCoder7979 |  |

Yatoclip/build.gradle.kts

@@ -0,0 +1,11 @@
+repositories {
+    mavenCentral()
+    maven("https://jitpack.io/")
+}
+
+dependencies {
+    implementation("com.github.ishlandbukkit:jbsdiff:deff66b794")
+    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("commons-io:commons-io:2.8.0")
+}
+

Yatoclip/src/main/java/org/yatopia/yatoclip/PatchesMetadata.java

@@ -0,0 +1,51 @@
+package org.yatopia.yatoclip;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+public class PatchesMetadata {
+
+    public final Set<PatchMetadata> patches;
+    public final Set<Relocation> relocations;
+    public final Set<String> copyExcludes;
+
+    public PatchesMetadata(Set<PatchMetadata> patches, Set<Relocation> relocations, Set<String> copyExcludes) {
+        Objects.requireNonNull(copyExcludes);
+        this.copyExcludes = Collections.unmodifiableSet(copyExcludes);
+        Objects.requireNonNull(relocations);
+        this.relocations = Collections.unmodifiableSet(relocations);
+        Objects.requireNonNull(patches);
+        this.patches = Collections.unmodifiableSet(patches);
+    }
+
+    public static class PatchMetadata {
+        public final String name;
+        public final String originalHash;
+        public final String targetHash;
+        public final String patchHash;
+
+        public PatchMetadata(String name, String originalHash, String targetHash, String patchHash) {
+            this.name = name;
+            this.originalHash = originalHash;
+            this.targetHash = targetHash;
+            this.patchHash = patchHash;
+        }
+    }
+
+    public static class Relocation implements Serializable {
+
+        public final String from;
+        public final String to;
+        public final boolean includeSubPackages;
+
+        public Relocation(String from, String to, boolean includeSubPackages) {
+            Objects.requireNonNull(from);
+            Objects.requireNonNull(to);
+            this.from = from.replaceAll("\\.", "/");
+            this.to = to.replaceAll("\\.", "/");
+            this.includeSubPackages = includeSubPackages;
+        }
+    }
+}