aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitattributes9
-rw-r--r--.gitignore5
-rw-r--r--build-data/additional-spigot-member-mappings.csrg24
-rw-r--r--build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch17
-rw-r--r--build-data/craftbukkit-patch-patches/ChunkProviderServer.patch.patch40
-rw-r--r--build-data/library-imports.txt5
-rw-r--r--build-data/mappings-patch.tiny76
-rw-r--r--build.gradle.kts83
-rw-r--r--gradle.properties3
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin0 -> 59203 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties5
-rwxr-xr-xgradlew185
-rw-r--r--gradlew.bat89
-rwxr-xr-xpaper258
-rw-r--r--pom.xml55
-rw-r--r--settings.gradle.kts11
16 files changed, 552 insertions, 313 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..948b5d0ef5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+
+* text=auto
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary
+
diff --git a/.gitignore b/.gitignore
index b1e563f223..5c7e1f2db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.gradle/
+build/
+
# Eclipse stuff
.classpath
.project
@@ -63,3 +66,5 @@ Paperclip.jar
paperclip.jar
paperclip-*.jar
paperclip.properties
+
+!gradle/wrapper/gradle-wrapper.jar
diff --git a/build-data/additional-spigot-member-mappings.csrg b/build-data/additional-spigot-member-mappings.csrg
new file mode 100644
index 0000000000..199b5419bf
--- /dev/null
+++ b/build-data/additional-spigot-member-mappings.csrg
@@ -0,0 +1,24 @@
+# CraftBukkit maps all of (mojmap names):
+# Merchant.getLevel()
+# Hopper.getLevel()
+# Entity.getCommandSenderWorld()
+# to getWorld(), which confuses our ability to map this method properly. This patch disambiguates it
+net/minecraft/world/level/block/entity/IHopper v ()Lnet/minecraft/world/level/World; getLevel
+net/minecraft/world/entity/vehicle/EntityMinecartHopper v ()Lnet/minecraft/world/level/World; getLevel
+net/minecraft/world/item/trading/IMerchant eV ()Lnet/minecraft/world/level/World; getLevel
+net/minecraft/world/entity/npc/EntityVillagerAbstract eV ()Lnet/minecraft/world/level/World; getLevel
+
+# CraftBukkit mappings sometimes have mappings for child classes and not parent classes
+# We handle this fine for deobf but this breaks reobf. These Patches fix those cases
+
+# BossBattle -> BossBattleServer
+net/minecraft/world/BossBattle a (F)V setProgress
+net/minecraft/world/BossBattle c (Z)Lnet/minecraft/world/BossBattle; setCreateFog
+net/minecraft/world/BossBattle a (Z)Lnet/minecraft/world/BossBattle; setDarkenSky
+net/minecraft/world/BossBattle b (Z)Lnet/minecraft/world/BossBattle; setPlayMusic
+
+# IChunkProvider -> ChunkProviderServer
+net/minecraft/world/level/chunk/IChunkProvider b (II)Z isLoaded
+
+# BehaviorWorkComposter -> BehaviorWork
+net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter a (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/entity/npc/EntityVillager;)V doWork
diff --git a/build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch b/build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch
new file mode 100644
index 0000000000..a35b59fd5d
--- /dev/null
+++ b/build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch
@@ -0,0 +1,17 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
++++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
+@@ -1,14 +1,5 @@
+ --- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java
+ +++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java
+-@@ -24,7 +24,7 @@
+- public BehaviorWorkComposter() {}
+-
+- @Override
+-- protected void a(WorldServer worldserver, EntityVillager entityvillager) {
+-+ protected void doWork(WorldServer worldserver, EntityVillager entityvillager) { // PAIL
+- Optional<GlobalPos> optional = entityvillager.getBehaviorController().getMemory(MemoryModuleType.JOB_SITE);
+-
+- if (optional.isPresent()) {
+ @@ -43,7 +43,7 @@
+ BlockPosition blockposition = globalpos.getBlockPosition();
+
diff --git a/build-data/craftbukkit-patch-patches/ChunkProviderServer.patch.patch b/build-data/craftbukkit-patch-patches/ChunkProviderServer.patch.patch
new file mode 100644
index 0000000000..0372012c03
--- /dev/null
+++ b/build-data/craftbukkit-patch-patches/ChunkProviderServer.patch.patch
@@ -0,0 +1,40 @@
+--- a/net/minecraft/server/level/ChunkProviderServer.patch
++++ b/net/minecraft/server/level/ChunkProviderServer.patch
+@@ -74,8 +74,8 @@
+ + return playerchunk == null || playerchunk.oldTicketLevel > i; // CraftBukkit using oldTicketLevel for isLoaded checks
+ }
+
+- public boolean isLoaded(int i, int j) {
+-@@ -282,19 +308,19 @@
++ @Override
++@@ -283,19 +309,19 @@
+ public boolean a(Entity entity) {
+ long i = ChunkCoordIntPair.pair(MathHelper.floor(entity.locX()) >> 4, MathHelper.floor(entity.locZ()) >> 4);
+
+@@ -98,7 +98,7 @@
+ }
+
+ private boolean a(long i, Function<PlayerChunk, CompletableFuture<Either<Chunk, PlayerChunk.Failure>>> function) {
+-@@ -316,11 +342,31 @@
++@@ -317,11 +343,31 @@
+
+ @Override
+ public void close() throws IOException {
+@@ -131,7 +131,7 @@
+ public void tick(BooleanSupplier booleansupplier) {
+ this.world.getMethodProfiler().enter("purge");
+ this.chunkMapDistance.purgeTickets();
+-@@ -340,12 +386,12 @@
++@@ -341,12 +387,12 @@
+ this.lastTickTime = i;
+ WorldData worlddata = this.world.getWorldData();
+ boolean flag = this.world.isDebugWorld();
+@@ -146,7 +146,7 @@
+
+ this.world.getMethodProfiler().enter("naturalSpawnCount");
+ int l = this.chunkMapDistance.b();
+-@@ -532,12 +578,18 @@
++@@ -533,12 +579,18 @@
+
+ @Override
+ protected boolean executeNext() {
diff --git a/build-data/library-imports.txt b/build-data/library-imports.txt
new file mode 100644
index 0000000000..68b9b8022c
--- /dev/null
+++ b/build-data/library-imports.txt
@@ -0,0 +1,5 @@
+authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+datafixerupper com/mojang/datafixers/DataFixerBuilder.java
+datafixerupper com/mojang/datafixers/util/Either.java
+datafixerupper com/mojang/serialization/codecs/KeyDispatchCodec.java
+datafixerupper com/mojang/serialization Dynamic.java
diff --git a/build-data/mappings-patch.tiny b/build-data/mappings-patch.tiny
new file mode 100644
index 0000000000..0833ee00b0
--- /dev/null
+++ b/build-data/mappings-patch.tiny
@@ -0,0 +1,76 @@
+tiny 2 0 spigot mojang+yarn
+
+# Originally DistanceManager, which also implements DistanceManager, so clashes since the implemented class
+# is imported and not fully qualified. Easiest fix is to just change the name
+c net/minecraft/server/level/PlayerChunkMap$a net/minecraft/server/level/ChunkMap$ChunkDistanceManager
+
+# CraftBukkit adds the getServer() method, clashes with a Mojang method
+c net/minecraft/world/level/World net/minecraft/world/level/Level
+ m ()Lorg/bukkit/craftbukkit/CraftServer; getServer getCraftServer
+
+# CraftBukkit adds the server field, clashes with a Mojang field
+c net/minecraft/server/network/PlayerConnection net/minecraft/server/network/ServerGamePacketListenerImpl
+ f Lorg/bukkit/craftbukkit/CraftServer; server craftServer
+
+# CraftBukkit adds the player field, clashes with a Mojang field
+c net/minecraft/world/inventory/ContainerWorkbench net/minecraft/world/inventory/CraftingMenu
+ f Lnet/minecraft/world/entity/player/PlayerInventory; player playerInventory
+
+# CraftBukkit adds the getType() method, clashes with a Mojang method
+c net/minecraft/world/entity/EntityAreaEffectCloud net/minecraft/world/entity/AreaEffectCloud
+ m ()Ljava/lang/String; getType getTypeCb
+
+# CraftBukkit adds the getType() method, clashes with a Mojang method
+c net/minecraft/world/entity/projectile/EntityTippedArrow net/minecraft/world/entity/projectile/Arrow
+ m ()Ljava/lang/String; getType getTypeCb
+
+# CraftBukkit adds the getLevel() method, clashes with original method
+c net/minecraft/world/level/block/entity/TileEntityBeacon net/minecraft/world/level/block/entity/BeaconBlockEntity
+ m ()I getLevel getLevelCb
+
+# CraftBukkit adds the getLootTable() method, clashes with original method
+c net/minecraft/world/entity/EntityInsentient net/minecraft/world/entity/Mob
+ m ()Lnet/minecraft/resources/MinecraftKey; getLootTable getLootTableCb
+
+# CraftBukkit adds the canCollideWith() method, clashes with original method
+c net/minecraft/world/entity/Entity net/minecraft/world/entity/Entity
+ m (Lnet/minecraft/world/entity/Entity;)Z canCollideWith canCollideWithCb
+
+# CraftBukkit adds a new `a` method which allows passing the Entity parameter
+# It uses `a` to match the original method (with just 1 param), so this patch makes them match
+c net/minecraft/server/level/WorldServer net/minecraft/server/level/ServerLevel
+ m (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/entity/Entity;)V a makeObsidianPlatform
+
+# CraftBukkit adds `getMinecraftWorld()` to `GeneratorAccess`, which matches `WorldAccess.getMinecraftWorld()`
+# But that method in `WorldAccess` is called `getLevel()` in Mojang mappings
+c net/minecraft/world/level/GeneratorAccess net/minecraft/world/level/LevelAccessor
+ m ()Lnet/minecraft/server/level/WorldServer; getMinecraftWorld getLevel
+
+# SpecialSource2 automatically maps methods to the name of synthetic methods that point to it in an attempt to
+# normalize method names with what is expected by the super class. This is _extremely_ stupid and flawed however
+# because synthetic methods by definition have different descriptors than the base method, which means method
+# signature clashes become possible, which is what happens here.
+#
+# LootEntryAbstract$Serializer has a synthetic method pointing to the base serialize() method with the following descriptor:
+#
+# (JsonObject,Object,JsonSerializationContext)V <-- ProGuard names this method `a`
+#
+# and this synthetic method points to another method with the specialized descriptor:
+#
+# (JsonObject,LootEntryAbstract,JsonSerializationContext)V <-- ProGuard names this method `b`
+#
+# SpecialSource2 automatically maps the second method name to the name of the first method, in this case `a`.
+#
+# LootEntryAbstract$Serializer also has another method with the same descriptor as serialize(), which Spigot calls
+# serializeCustom(). Of course ProGuard strips the names and since this method is the first time it's seen this
+# descriptor, it renamed that method also to `a`.
+#
+# This is allowed because the synthetic method for serialize() has a different descriptor, using Object as the second
+# parameter. This breaks when SpecialSource2 does it's "magic" of course. This patch manually fixes this case by adding
+# both correct mappings
+c net/minecraft/world/level/storage/loot/entries/LootEntryAbstract$Serializer net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Serializer
+ m (Lcom/google/gson/JsonObject;Lnet/minecraft/world/level/storage/loot/entries/LootEntryAbstract;Lcom/google/gson/JsonSerializationContext;)V a serialize
+ p 0 json
+ p 1 entry
+ p 2 context
+ m (Lcom/google/gson/JsonObject;Lnet/minecraft/world/level/storage/loot/entries/LootEntryAbstract;Lcom/google/gson/JsonSerializationContext;)V serializeType serializeCustom
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000..73ef53616c
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,83 @@
+plugins {
+ java
+ id("com.github.johnrengelman.shadow") version "6.1.0" apply false
+ id("io.papermc.paperweight") version "1.0.0-LOCAL-SNAPSHOT"
+}
+
+group = "com.destroystokyo.paper"
+version = providers.gradleProperty("projectVersion").forUseAtConfigurationTime().get()
+
+val mcVersion = providers.gradleProperty("mcVersion")
+val packageVersion = providers.gradleProperty("packageVersion")
+
+allprojects {
+ apply(plugin = "java")
+
+ java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(11))
+ }
+ }
+}
+
+subprojects {
+ tasks.withType<JavaCompile>().configureEach {
+ options.encoding = "UTF-8"
+ options.release.set(8)
+ }
+
+ if (name == "Paper-MojangAPI") {
+ return@subprojects
+ }
+
+ repositories {
+ mavenCentral()
+ maven("https://repo1.maven.org/maven2/")
+ maven("https://oss.sonatype.org/content/groups/public/")
+ maven("https://papermc.io/repo/repository/maven-public/")
+ maven("https://ci.emc.gs/nexus/content/groups/aikar/")
+ maven("https://repo.md-5.net/content/repositories/releases/")
+ maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+ }
+}
+
+repositories {
+ mavenLocal()
+
+ maven("https://wav.jfrog.io/artifactory/repo/") {
+ content {
+ onlyForConfigurations("paperclip")
+ }
+ }
+ maven("https://maven.quiltmc.org/repository/release/") {
+ content {
+ onlyForConfigurations("paramMappings", "remapper")
+ }
+ }
+ maven("https://files.minecraftforge.net/maven/") {
+ content {
+ onlyForConfigurations("decompiler")
+ }
+ }
+}
+
+dependencies {
+ paramMappings("org.quiltmc:yarn:1.16.5+build.6:mergedv2")
+ remapper("org.quiltmc:tiny-remapper:0.3.2:fat@jar")
+ decompiler("net.minecraftforge:forgeflower:1.5.498.5@jar")
+ paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar")
+}
+
+paperweight {
+ minecraftVersion.set(mcVersion)
+ versionPackage.set(packageVersion)
+ serverProject.set(project(":Paper-Server"))
+
+ paper {
+ mappingsPatch.set(file("build-data/mappings-patch.tiny"))
+
+ additionalSpigotMemberMappings.set(file("build-data/additional-spigot-member-mappings.csrg"))
+
+ craftBukkitPatchPatchesDir.set(file("build-data/craftbukkit-patch-patches"))
+ }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..1cd3e39671
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+mcVersion = 1.16.5
+projectVersion = 1.16.5-R0.1-SNAPSHOT
+packageVersion = 1_16_R3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..e708b1c023
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..442d9132ea
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000..4f906e0c81
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/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=`expr $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"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..107acd32c4
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/paper b/paper
deleted file mode 100755
index a397d2786b..0000000000
--- a/paper
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/usr/bin/env bash
-
-# resolve shell-specifics
-case "$(echo "$SHELL" | sed -E 's|/usr(/local)?||g')" in
- "/bin/zsh")
- RCPATH="$HOME/.zshrc"
- SOURCE="${BASH_SOURCE[0]:-${(%):-%N}}"
- ;;
- *)
- RCPATH="$HOME/.bashrc"
- if [[ -f "$HOME/.bash_aliases" ]]; then
- RCPATH="$HOME/.bash_aliases"
- fi
- SOURCE="${BASH_SOURCE[0]}"
- ;;
-esac
-
-# get base dir regardless of execution location
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- SOURCE="$(readlink "$SOURCE")"
- [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-SOURCE=$([[ "$SOURCE" = /* ]] && echo "$SOURCE" || echo "$PWD/${SOURCE#./}")
-basedir=$(dirname "$SOURCE")
-gitcmd="git -c commit.gpgsign=false"
-
-source "$basedir/scripts/functions.sh"
-
-"$basedir"/scripts/requireDeps.sh || exit 1
-
-failed=0
-case "$1" in
- "rb" | "rbp" | "rebuild")
- (
- set -e
- cd "$basedir"
- scripts/rebuildPatches.sh "$basedir" $2 || exit 1
- ) || failed=1
- ;;
- "rbf" | "rbfull")
- (
- set -e
- cd "$basedir"
- scripts/rebuildPatches.sh "$basedir" "nofilter" || exit 1
- ) || failed=1
- ;;
- "p" | "patch")
- (
- set -e
- cd "$basedir"
- scripts/build.sh "$basedir" || exit 1
- ) || failed=1
- ;;
- "j" | "jar")
- (
- set -e
- cd "$basedir"
- scripts/build.sh "$basedir" "--jar" || exit 1
- ) || failed=1
- ;;
- "b" | "build")
- (
- set -e
- cd "$basedir"
- scripts/build.sh "$basedir" || exit 1
- (cd Paper-API ; mvn clean install) || exit 1
- (cd Paper-MojangAPI ; mvn clean install) || exit 1
- (cd Paper-Server ; mvn clean package) || exit 1
- echo "Paper jar successfully built"
- ls -la Paper-Server/target/paper*.jar
- ) || failed=1
- ;;
- "i" | "install")
- (
- set -e
- cd "$basedir"
- scripts/build.sh "$basedir" || exit 1
- mvn clean install || exit 1
- echo "Paper jar successfully built and installed to local repo"
- ) || failed=1
- ;;
- "pc" | "paperclip")
- (
- set -e
- cd "$basedir"
- scripts/paperclip.sh "$basedir" || exit 1
- ) || failed=1
- ;;
- "make")
- (
- if [[ "$2" = "bacon" ]] ; then
- set -e
- cd "$basedir"
- scripts/build.sh "$basedir" "--jar"
- fi
- )
- ;;
- "m" | "mcdev")
- (
- set -e
- cd "$basedir"
- scripts/makemcdevsrc.sh "$basedir"
- )
- ;;
- "t" | "test" | "testserver")
- (
- cd "$basedir"
- shift
- scripts/testServer.sh "$basedir" "$@"
- )
- ;;
- "td" | "testdir")
- cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
- ;;
- "u" | "up" | "upstream")
- (
- cd "$basedir"
- scripts/upstreamMerge.sh "$basedir" "$2"
- )
- ;;
- "cu" | "commitup" | "commitupstream" | "upc" | "upcommit" | "upstreamcommit")
- (
- cd "$basedir"
- shift
- scripts/upstreamCommit.sh "$@"
- )
- ;;
- "r" | "root")
- cd "$basedir"
- ;;
- "a" | "api")
- cd "$basedir/Paper-API"
- ;;
- "s" | "server")
- cd "$basedir/Paper-Server"
- ;;
- "c" | "clean")
- rm -rf Paper-API
- rm -rf Paper-Server
- rm -rf work
- echo "Cleaned build files"
- ;;
- "con" | "continue")
- if [ -d ".git/rebase-apply" ]; then
- git -c commit.gpgsign=false am --continue
- elif [ -d ".git/rebase-merge" ]; then
- git -c commit.gpgsign=false rebase --continue
- fi
- ;;
- "e" | "edit")
- case "$2" in
- "s" | "server")
- mkdir -p "$basedir/work/Temp"
- echo "$basedir/Paper-Server" > "$basedir/work/Temp/PAPER_LAST_EDIT"
- cd "$basedir/Paper-Server"
- (
- set -e
-
- paperstash
- $gitcmd rebase -i upstream/upstream
- paperunstash
- )
- ;;
- "a" | "api")
- mkdir -p "$basedir/work/Temp"
- echo "$basedir/Paper-API" > "$basedir/work/Temp/PAPER_LAST_EDIT"
- cd "$basedir/Paper-API"
- (
- set -e
-
- paperstash
- $gitcmd rebase -i upstream/upstream
- paperunstash
- )
- ;;
- "c" | "continue")
- cd "$( < "$basedir/work/Temp/PAPER_LAST_EDIT")"
- rm -f "$basedir/work/Temp/PAPER_LAST_EDIT"
- (
- set -e
-
- $gitcmd add .
- $gitcmd commit --amend
- $gitcmd rebase --continue
-
- cd "$basedir"
- scripts/rebuildPatches.sh "$basedir"
- )
- ;;
- *)
- echo "You must edit either the api or server."
- ;;
- esac
- ;;
- "setup")
- if [[ -f "$RCPATH" ]] ; then
- NAME="paper"
- if [[ ! -z "${2+x}" ]] ; then
- NAME="$2"
- fi
- (grep "alias $NAME=" "$RCPATH" > /dev/null) && (sed -i "s|alias $NAME=.*|alias $NAME='. $SOURCE'|g" "$RCPATH") || (echo "alias $NAME='. $SOURCE'" >> "$RCPATH")
- alias "$NAME=. $SOURCE"
- echo "You can now just type '$NAME' at any time to access the paper tool."
- else
- echo "We were unable to setup the paper build tool alias: $RCPATH is missing"
- fi
- ;;
- *)
- echo "PaperMC build tool command. This provides a variety of commands to build and manage the PaperMC build"
- echo "environment. For all of the functionality of this command to be available, you must first run the"
- echo "'setup' command. View below for details. For essential building and patching, you do not need to do the setup."
- echo ""
- echo " Normal commands:"
- echo " * rb, rebuild | Rebuild patches, can be called from anywhere."
- echo " * p, patch | Apply all patches to the project without building it. Can be run from anywhere."
- echo " * j, jar | Apply all patches and build the project, paperclip.jar will be output. Can be run from anywhere."
- echo " * i, install | Build and install paper into the local repo. Can be run from anywhere."
- echo " * m, mcdev | Setup decompiled sources for non-modified NMS files to be imported into an IDE. Can be run from anywhere."
- echo " * u, up, upstream | Updates the submodules used by Paper to their latest upstream versions."
- echo " * upc, upstreamcommit | Creates the correctly-formatted upstream commit after updating upstream."
- echo " * c, clean | Removes all generated files, Paper-API, Paper-Server, and work."
- echo " * t, testserver | Run the test server with the set of plugins Paper uses as a basis for server tests."
- echo " * con, continue | Shortcut command for running git am --continue, or git rebase --continue."
- echo ""
- echo " These commands require the setup command before use:"
- echo " * r, root | Change directory to the root of the project."
- echo " * a. api | Move to the Paper-API directory."
- echo " * s, server | Move to the Paper-Server directory."
- echo " * td, testdirectory | Move to the test-server directory."
- echo " * e, edit | Use to edit a specific patch, give it the argument \"server\" or \"api\""
- echo " | respectively to edit the correct project. Use the argument \"continue\" after"
- echo " | the changes have been made to finish and rebuild patches. Can be called from anywhere."
- echo ""
- echo " * setup | Add an alias to $RCPATH to allow full functionality of this script. Run as:"
- echo " | . ./paper setup"
- echo " | After you run this command you'll be able to just run 'paper' from anywhere."
- echo " | The default name for the resulting alias is 'paper', you can give an argument to override"
- echo " | this default, such as:"
- echo " | . ./paper setup example"
- echo " | Which will allow you to run 'example' instead."
- ;;
-esac
-
-unset RCPATH
-unset SOURCE
-unset basedir
-unset -f color
-unset -f colorend
-unset -f paperstash
-unset -f paperunstash
-if [[ "$failed" == "1" ]]; then
- unset failed
- false
-else
- unset failed
- true
-fi
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 4ddd1eb648..0000000000
--- a/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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>
-
- <!-- Avoid making changes to this file, it has to be deployed manually -->
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-parent</artifactId>
- <version>dev-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Paper-Parent</name>
- <description>Parent project for all Paper modules.</description>
- <url>https://github.com/PaperMC/Paper</url>
-
- <modules>
- <module>Paper-API</module>
- <module>Paper-MojangAPI</module>
- <module>Paper-Server</module>
- </modules>
-
- <build>
- <defaultGoal>clean install</defaultGoal>
- </build>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>md_5-releases</id>
- <url>https://repo.md-5.net/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>aikar</id>
- <url>https://repo.aikar.co/content/groups/aikar/</url>
- </repository>
- <repository>
- <id>destroystokyo-repo</id>
- <url>https://papermc.io/repo/repository/maven-public/</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>papermc-releases</id>
- <url>https://papermc.io/repo/repository/maven-releases/</url>
- </repository>
- <snapshotRepository>
- <id>papermc-snapshots</id>
- <url>https://papermc.io/repo/repository/maven-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-</project>
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000000..e834a22024
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,11 @@
+pluginManagement {
+ repositories {
+ gradlePluginPortal()
+ maven("https://wav.jfrog.io/artifactory/repo/")
+ mavenLocal()
+ }
+}
+
+rootProject.name = "Paper"
+
+include("Paper-API", "Paper-Server")
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 17:32:27 +0000