Update README.md

Master

.circleci/config.yml

@@ -1,49 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/Akarin-project/Akarin
-    parallelism: 1
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-    docker:
-    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
-      run: sudo service postgresql start
-    steps:
-    # Machine Setup
-    - checkout
-    # Prepare for artifact
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    - run:
-        working_directory: ~/Akarin-project/Akarin
-        command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
-    # Dependencies
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-        # This branch if available
-        - v1-dep-{{ .Branch }}-
-        # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
-        - v1-dep-
-    - run: git config --global user.email "circle@circleci.com"
-    - run: git config --global user.name "CircleCI"
-    - run: chmod -Rv +x scripts/
-    - run: ./scripts/build.sh 
-    - run: ./scripts/inst.sh --setup --remote
-    # Save dependency cache
-    - save_cache:
-        key: v1-dep-{{ .Branch }}-{{ epoch }}
-        paths:
-        - ~/.m2
-    # Test
-    - run: yes|cp -rf ./akarin-*.jar $CIRCLE_ARTIFACTS
-    # Teardown
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Sat Mar 28 16:11:26 MST 2020
-gradle.version=6.2.2

.travis.yml

@@ -1,25 +0,0 @@
-language: java
-dist: trusty
-jdk:
-  - oraclejdk8
-install: true
-script:
-  - git config --global user.email "circle@circleci.com"
-  - git config --global user.name "CircleCI"
-  - chmod -Rv +x scripts/
-  - ./scripts/build.sh
-  - ./scripts/inst.sh --setup --remote
-after_success:
-  - rm -rf push
-  - mkdir push
-  - cp ./target/*.jar ./push/
-deploy:
-  skip_cleanup: true
-  provider: releases
-  api_key:
-    secure: $Github_token
-  file:
-    - ./push/*
-  file_glob: true
-  on:
-    tags: true

Jenkinsfile

@@ -0,0 +1,24 @@
+pipeline {
+  agent any
+  stages {
+    stage('Init Submodules') {
+      steps {
+        sh 'git submodule update --init --recursive'
+      }
+    }
+
+    stage('Build') {
+      steps {
+        sh 'bash ./scripts/build.sh'
+        sh 'bash ./scripts/inst.sh --setup --fast'
+      }
+    }
+
+    stage('Archive') {
+      steps {
+        archiveArtifacts(artifacts: '*.jar', fingerprint: true)
+      }
+    }
+
+  }
+}

LICENSE.md

@@ -17,4 +17,5 @@ should submit a Pull Request to this project and add their name.
 ```text
 Sotr <kira@kira.moe>
 MatrixTunnel <https://github.com/MatrixTunnel>
+JosephWorks <https://github.com/josephworks>
 ```

README.md

@@ -3,9 +3,8 @@
 [![Powered by](https://img.shields.io/badge/Powered_by-Akarin_project-ee6aa7.svg?style=flat)](https://akarin.app/)
 [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/fw2pJAj)
 [![bStats](https://img.shields.io/badge/bStats-Torch-0099ff.svg?style=flat)](https://bstats.org/plugin/bukkit/Torch)
-[![Build Status](http://josephworks.ddns.net:8080/job/Akarin-project/job/Akarin/badge/icon)](http://josephworks.ddns.net:8080/job/Akarin-project/job/Akarin/)
+![Jenkins](https://img.shields.io/jenkins/build?jobUrl=http%3A%2F%2Fci.josephworks.net%2Fjob%2FAkarin%2Fjob%2Fver%25252F1.14.4%2F)
 [![Patreon](https://img.shields.io/badge/Patreon-Donate-yellow.svg?style=flat)](https://www.patreon.com/akarinproject)
-[![Circle CI](https://circleci.com/gh/Akarin-project/Akarin/tree/master.svg?style=svg)](https://circleci.com/gh/Akarin-project/Akarin)
 
 Akarin is currently **under heavy development** and contributions are welcome!
 
@@ -31,9 +30,7 @@ Get Akarin
 
 #### Recommended
 
-+ [**Circle CI**](https://circleci.com/gh/Akarin-project/Akarin/tree/ver/master) - Checkout the 'Artifacts' tab of the latest build *Login required*
++ [**JosephWorks Jenkins**](http://ci.josephworks.net/job/Akarin/job/ver%252F1.14.4/)
-+ [**JosephWorks Jenkins**](http://josephworks.ddns.net:8080/job/Akarin-project/job/Akarin/)
-+ [**Melon Jenkins**](https://ci.melon.cat/job/Akarin/) - Offline
 
 *Open an [Issue](https://github.com/Akarin-project/Akarin/issues) or a [Pull Request](https://github.com/Akarin-project/Akarin/pulls) if you want to add your website here*
 
@@ -61,7 +58,6 @@ chmod -Rv a+x scripts/
 Demo Servers
 ---
 
-* [Fair Server](https://fairserver.ru)
 * [LoyaltyMC](https://www.loyaltymc.net/)
 * ~~`demo.akarin.io` (official)~~
 

api/pom.xml

@@ -120,7 +120,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

build.gradle

@@ -1,57 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'maven'
-
-group = 'com.destroystokyo.paper'
-version = '1.14.4-R0.1-SNAPSHOT'
-
-description = """Akarin"""
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-tasks.withType(JavaCompile) {
-	options.encoding = 'UTF-8'
-}
-
-repositories {
-        
-     maven { url "https://hub.spigotmc.org/nexus/content/groups/public/" }
-     maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
-     maven { url "https://papermc.io/repo/repository/maven-public/" }
-     maven { url "https://nexus.piratescode.co.uk/" }
-     maven { url "https://repo.spongepowered.org/maven/" }
-     maven { url "https://oss.sonatype.org/content/repositories" }
-     maven { url "https://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-releases/" }
-     maven { url "https://repo.md-5.net/content/repositories/releases/" }
-     maven { url "https://repo.aikar.co/content/groups/aikar/" }
-     maven { url "https://repo.maven.apache.org/maven2" }
-}
-dependencies {
-    compile group: 'com.destroystokyo.paper', name: 'paper-api', version:'1.14.4-R0.1-SNAPSHOT'
-    compile group: 'org.spigotmc', name: 'minecraft-server', version:'1.14.4-SNAPSHOT'
-    compile group: 'net.minecrell', name: 'terminalconsoleappender', version:'1.1.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.8.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version:'2.8.1'
-    compile group: 'org.ow2.asm', name: 'asm', version:'7.1'
-    compile group: 'com.github.ben-manes.caffeine', name: 'caffeine', version:'2.7.0'
-    compile group: 'com.koloboke', name: 'koloboke-api-jdk8', version:'1.0.0'
-    compile group: 'gnu.trove', name: 'trove', version:'3.0.3'
-    compile group: 'org.jetbrains', name: 'annotations', version:'16.0.1'
-    compile group: 'io.netty', name: 'netty-all', version:'4.1.42.Final'
-    runtime group: 'net.java.dev.jna', name: 'jna', version:'4.5.2'
-    runtime group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version:'2.8.1'
-    runtime group: 'com.lmax', name: 'disruptor', version:'3.4.2'
-    runtime group: 'org.xerial', name: 'sqlite-jdbc', version:'3.28.0'
-    runtime group: 'mysql', name: 'mysql-connector-java', version:'5.1.47'
-    runtime group: 'com.koloboke', name: 'koloboke-impl-jdk8', version:'1.0.0'
-    runtime group: 'it.unimi.dsi', name: 'fastutil', version:'8.2.2'
-    runtime group: 'com.google.code.findbugs', name: 'jsr305', version:'1.3.9'
-    runtime group: 'com.google.guava', name: 'guava', version:'21.0'
-    runtime group: 'com.google.code.gson', name: 'gson', version:'2.8.0'
-    runtime group: 'org.jetbrains', name: 'annotations-java5', version:'17.0.0'
-    runtime group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
-    runtime group: 'org.ow2.asm', name: 'asm-commons', version:'7.1'
-    testCompile group: 'junit', name: 'junit', version:'4.12'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
-    compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.16.20'
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

gradlew

@@ -1,188 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>akarin</artifactId>
@@ -209,13 +209,13 @@
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <!-- Akarin -->
-		<repository>
-			<id>papermc</id>
-			<url>https://papermc.io/repo/repository/maven-public/</url>
-		</repository>
         <repository>
-            <id>piratescode</id>
+            <id>josephworks</id>
-            <url>https://nexus.piratescode.co.uk/</url>
+            <url>http://repo.josephworks.net/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
         <repository>
             <id>spongepowered-repo</id>
@@ -225,10 +225,6 @@
             <id>sonatype-nexusg</id>
             <url>https://oss.sonatype.org/content/repositories</url>
         </repository>
-        <repository>
-            <id>tu-darmstadt</id>
-            <url>https://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-releases/</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -311,7 +307,8 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
+                            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
+                            </dependencyReducedPomLocation> <!-- Paper -->
                             <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                             <relocations>
                                 <!-- Cannot be relocated as it breaks translation property keys -->
@@ -327,8 +324,8 @@
                                 </relocation>
                                 <!-- Paper - Don't relocate fastutil in order to prevent api breakage -->
                                 <!--<relocation>-->
-                                    <!--<pattern>it.unimi</pattern>-->
+                                <!--<pattern>it.unimi</pattern>-->
-                                    <!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>-->
+                                <!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>-->
                                 <!--</relocation>-->
                                 <relocation>
                                     <pattern>org.bukkit.craftbukkit</pattern>
@@ -343,10 +340,12 @@
                                 </relocation>
                             </relocations>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/java.sql.Driver</resource>
                                 </transformer>
-                                <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
+                                <transformer
+                                        implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer"/>
                             </transformers>
                         </configuration>
                     </execution>
@@ -362,7 +361,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
                 <dependencies>
                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                     <dependency>

settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'akarin'