From 39007a5eb3fe75195cb66373622cd2e1af9036b7 Mon Sep 17 00:00:00 2001 From: Sotr Date: Tue, 14 Apr 2020 04:45:27 +0700 Subject: [PATCH] Add more arguments --- akarin | 12 ++- patches/api/0001-POM-Changes.patch | 2 +- patches/api/0002-Server-Config.patch | 2 +- patches/server/0001-POM-Changes.patch | 84 +++++++++++++++++++ ...changes.patch => 0002-Brand-changes.patch} | 2 +- ...e-I-O-operation-on-load-player-file.patch} | 2 +- ...table-Refresh-for-non-player-intera.patch} | 2 +- ...05-Never-drop-items-on-command-give.patch} | 2 +- ....patch => 0006-Save-json-list-async.patch} | 2 +- ...0007-Remove-method-profiler-callers.patch} | 2 +- ...ooper.patch => 0008-Disable-Snooper.patch} | 2 +- ...-Config.patch => 0009-Server-Config.patch} | 2 +- ...nder.patch => 0010-Async-pathfinder.patch} | 2 +- ...h => 0011-Optimizations-for-network.patch} | 2 +- ...ps-the-predicate-order-of-collision.patch} | 2 +- ...etrics.patch => 0013-Akarin-Metrics.patch} | 2 +- scripts/importSources.sh | 2 +- scripts/updateUpstream.sh | 4 +- 18 files changed, 109 insertions(+), 21 deletions(-) create mode 100644 patches/server/0001-POM-Changes.patch rename patches/server/{0001-Brand-changes.patch => 0002-Brand-changes.patch} (97%) rename patches/server/{0002-Avoid-double-I-O-operation-on-load-player-file.patch => 0003-Avoid-double-I-O-operation-on-load-player-file.patch} (96%) rename patches/server/{0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch => 0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch} (94%) rename patches/server/{0004-never-drop-items-on-command-give.patch => 0005-Never-drop-items-on-command-give.patch} (93%) rename patches/server/{0005-Save-json-list-async.patch => 0006-Save-json-list-async.patch} (95%) rename patches/server/{0006-Remove-method-profiler-callers.patch => 0007-Remove-method-profiler-callers.patch} (99%) rename patches/server/{0007-Disable-Snooper.patch => 0008-Disable-Snooper.patch} (95%) rename patches/server/{0008-Server-Config.patch => 0009-Server-Config.patch} (99%) rename patches/server/{0009-Async-pathfinder.patch => 0010-Async-pathfinder.patch} (99%) rename patches/server/{0010-Optimizations-for-network.patch => 0011-Optimizations-for-network.patch} (99%) rename patches/server/{0011-Swaps-the-predicate-order-of-collision.patch => 0012-Swaps-the-predicate-order-of-collision.patch} (97%) rename patches/server/{0012-Akarin-Metrics.patch => 0013-Akarin-Metrics.patch} (94%) diff --git a/akarin b/akarin index d160ac13a..c69cdee78 100755 --- a/akarin +++ b/akarin @@ -7,8 +7,12 @@ source "./scripts/functions.sh" function setupUpstreamAndPatch { basedir - if [ "$1" != "skipPaper" ]; then - $scriptdir/updateUpstream.sh "$basedir" 0 || exit 1 # not update submodule + if [ "$1" == "--updatePaper" ]; then + $scriptdir/updateUpstream.sh "$basedir" 1 || exit 1 + else + if [ "$1" != "--skipPaper" ]; then + $scriptdir/updateUpstream.sh "$basedir" 0 || exit 1 # not update submodule + fi fi $scriptdir/applyPatches.sh "$basedir" || exit 1 } @@ -91,7 +95,7 @@ case "$1" in # Create the upstream branch in Paper project with current state $gitcmd checkout master # possibly already in $gitcmd branch -D upstream || true - $gitcmd branch -f upstream HEAD + $gitcmd branch -f upstream HEAD cd "$basedir/Akarin-Server" $gitcmd rebase -i upstream/upstream gitunstash @@ -108,7 +112,7 @@ case "$1" in # Create the upstream branch in Paper project with current state $gitcmd checkout master # possibly already in $gitcmd branch -D upstream || true - $gitcmd branch -f upstream HEAD + $gitcmd branch -f upstream HEAD cd "$basedir/Akarin-API" $gitcmd rebase -i upstream/upstream gitunstash diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index c551fbeb4..5242d85c9 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 797408840291c6ecfc8b9dffcea027450de59ec4 Mon Sep 17 00:00:00 2001 +From 5164a9653a05ff9d79c10ed60825a616f174885d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 14 Dec 2018 21:52:29 -0800 diff --git a/patches/api/0002-Server-Config.patch b/patches/api/0002-Server-Config.patch index 45dd274fb..0bc50062a 100644 --- a/patches/api/0002-Server-Config.patch +++ b/patches/api/0002-Server-Config.patch @@ -1,4 +1,4 @@ -From 37df93f498a1bca3f535bb44b51f84a9b2eb645d Mon Sep 17 00:00:00 2001 +From 8ccacdb4c8de5ae9a3ae3132375149688878f3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 3 Apr 2020 15:18:38 +0800 diff --git a/patches/server/0001-POM-Changes.patch b/patches/server/0001-POM-Changes.patch new file mode 100644 index 000000000..ff56d9ac6 --- /dev/null +++ b/patches/server/0001-POM-Changes.patch @@ -0,0 +1,84 @@ +From 1a3f35fc04d57551d3e2577b1fa5c12225f996b9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= + +Date: Fri, 14 Dec 2018 21:53:58 -0800 +Subject: [PATCH] POM Changes + + +diff --git a/pom.xml b/pom.xml +index 55679af92..19f87edb5 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -1,12 +1,11 @@ +- + 4.0.0 +- paper ++ akarin + jar + 1.15.2-R0.1-SNAPSHOT +- Paper +- https://papermc.io +- ++ Akarin-Server ++ https://github.com/Akarin-project/Akarin + + + UTF-8 +@@ -21,16 +20,16 @@ + + + +- com.destroystokyo.paper +- paper-parent ++ io.akarin.server ++ akarin-parent + dev-SNAPSHOT + ../pom.xml + + + + +- com.destroystokyo.paper +- paper-api ++ io.akarin.server ++ akarin-api + ${project.version} + compile + +@@ -143,15 +142,15 @@ + + + +- paper-${minecraft.version} +- clean install ++ akarin-${minecraft.version} ++ install + + + com.lukegb.mojo + gitdescribe-maven-plugin + 1.3 + +- git-Paper- ++ git-Akarin- + .. + + +diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +index 674096cab..9a7235b8e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +@@ -11,7 +11,7 @@ public final class Versioning { + public static String getBukkitVersion() { + String result = "Unknown-Version"; + +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties"); ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.akarin.server/akarin-api/pom.properties"); // Akarin + Properties properties = new Properties(); + + if (stream != null) { +-- +2.25.1.windows.1 + diff --git a/patches/server/0001-Brand-changes.patch b/patches/server/0002-Brand-changes.patch similarity index 97% rename from patches/server/0001-Brand-changes.patch rename to patches/server/0002-Brand-changes.patch index 26a4de39d..ae635dab0 100644 --- a/patches/server/0001-Brand-changes.patch +++ b/patches/server/0002-Brand-changes.patch @@ -1,4 +1,4 @@ -From 3ad2ef931970cfedbccf1da452c3c0de86026aad Mon Sep 17 00:00:00 2001 +From 456a8f61c85faeb41f873a8211651064471b2109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Tue, 18 Dec 2018 06:27:02 -0800 diff --git a/patches/server/0002-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch similarity index 96% rename from patches/server/0002-Avoid-double-I-O-operation-on-load-player-file.patch rename to patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch index 3ac818015..29a4d92fa 100644 --- a/patches/server/0002-Avoid-double-I-O-operation-on-load-player-file.patch +++ b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch @@ -1,4 +1,4 @@ -From 3c1079a542bb29f234c3d0206925b9f338a1d67e Mon Sep 17 00:00:00 2001 +From 74d31cd6b32b770b43f2c63338b2d6a26c8fbb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:29:08 +0800 diff --git a/patches/server/0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch similarity index 94% rename from patches/server/0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch rename to patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch index b79d50435..9f9fa14f6 100644 --- a/patches/server/0003-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch +++ b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch @@ -1,4 +1,4 @@ -From dff42f66084dc49d68797eab5e37d730e1e15df8 Mon Sep 17 00:00:00 2001 +From 65f6aacd03bc7cc2d25ae740ae56c6f8d40e2562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:43:20 +0800 diff --git a/patches/server/0004-never-drop-items-on-command-give.patch b/patches/server/0005-Never-drop-items-on-command-give.patch similarity index 93% rename from patches/server/0004-never-drop-items-on-command-give.patch rename to patches/server/0005-Never-drop-items-on-command-give.patch index 1c510117b..a72332936 100644 --- a/patches/server/0004-never-drop-items-on-command-give.patch +++ b/patches/server/0005-Never-drop-items-on-command-give.patch @@ -1,4 +1,4 @@ -From 9c894a616b9cf91d563b4d56461326c02562e8aa Mon Sep 17 00:00:00 2001 +From 0406f79f227b3dde70fc3b30d197d2ba9e51bf3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:35:19 +0800 diff --git a/patches/server/0005-Save-json-list-async.patch b/patches/server/0006-Save-json-list-async.patch similarity index 95% rename from patches/server/0005-Save-json-list-async.patch rename to patches/server/0006-Save-json-list-async.patch index f6dd84447..8529c25c9 100644 --- a/patches/server/0005-Save-json-list-async.patch +++ b/patches/server/0006-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From 67d60aab4aa2fb03013ac21e4561424ddf35f844 Mon Sep 17 00:00:00 2001 +From 02beac4a905ffda03bb2efb06d02b91c784364c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:16:18 +0800 diff --git a/patches/server/0006-Remove-method-profiler-callers.patch b/patches/server/0007-Remove-method-profiler-callers.patch similarity index 99% rename from patches/server/0006-Remove-method-profiler-callers.patch rename to patches/server/0007-Remove-method-profiler-callers.patch index 31c6c6824..d72f53448 100644 --- a/patches/server/0006-Remove-method-profiler-callers.patch +++ b/patches/server/0007-Remove-method-profiler-callers.patch @@ -1,4 +1,4 @@ -From 26bf028609cb41f18f1a2c7f87452a634316dac0 Mon Sep 17 00:00:00 2001 +From 59e944b32e5353a4e945beffe859c95e9fa9bbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 12:30:35 +0800 diff --git a/patches/server/0007-Disable-Snooper.patch b/patches/server/0008-Disable-Snooper.patch similarity index 95% rename from patches/server/0007-Disable-Snooper.patch rename to patches/server/0008-Disable-Snooper.patch index add066165..1a85c54ae 100644 --- a/patches/server/0007-Disable-Snooper.patch +++ b/patches/server/0008-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From 182dbbfd403360666165f4891c327bd192f72cb3 Mon Sep 17 00:00:00 2001 +From 809f59a025b5cf347b5700c693819cef18b32c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 14:03:29 +0800 diff --git a/patches/server/0008-Server-Config.patch b/patches/server/0009-Server-Config.patch similarity index 99% rename from patches/server/0008-Server-Config.patch rename to patches/server/0009-Server-Config.patch index dbb976fd7..621915480 100644 --- a/patches/server/0008-Server-Config.patch +++ b/patches/server/0009-Server-Config.patch @@ -1,4 +1,4 @@ -From 349848cf30419fd7efb71994947772fd2e53e82a Mon Sep 17 00:00:00 2001 +From b984fef56747270b30953faf9d55ae86e61157a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 3 Apr 2020 14:59:22 +0800 diff --git a/patches/server/0009-Async-pathfinder.patch b/patches/server/0010-Async-pathfinder.patch similarity index 99% rename from patches/server/0009-Async-pathfinder.patch rename to patches/server/0010-Async-pathfinder.patch index 50afaf975..da95e0d16 100644 --- a/patches/server/0009-Async-pathfinder.patch +++ b/patches/server/0010-Async-pathfinder.patch @@ -1,4 +1,4 @@ -From 99a39146d21bcc43e19d390ba38b0e68fee07a4f Mon Sep 17 00:00:00 2001 +From 99ba10d891b0357bc2d7ae7ee9ee8ecc6a362812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sun, 5 Apr 2020 13:01:13 +0800 diff --git a/patches/server/0010-Optimizations-for-network.patch b/patches/server/0011-Optimizations-for-network.patch similarity index 99% rename from patches/server/0010-Optimizations-for-network.patch rename to patches/server/0011-Optimizations-for-network.patch index b2491375d..f186c32c5 100644 --- a/patches/server/0010-Optimizations-for-network.patch +++ b/patches/server/0011-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From ebdb668fecb4645da404f049e490dc8445a9e0ce Mon Sep 17 00:00:00 2001 +From 0052685f681e2e326d5374c01e4ad097979f8707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sun, 5 Apr 2020 14:59:10 +0800 diff --git a/patches/server/0011-Swaps-the-predicate-order-of-collision.patch b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch similarity index 97% rename from patches/server/0011-Swaps-the-predicate-order-of-collision.patch rename to patches/server/0012-Swaps-the-predicate-order-of-collision.patch index 90b8222ee..eabf794d3 100644 --- a/patches/server/0011-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch @@ -1,4 +1,4 @@ -From fdece31a81ccf54cfdac946d08c3fdf763cff360 Mon Sep 17 00:00:00 2001 +From 289ac1a22489e624cd0766e6a1414c92a8afe120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 10 Apr 2020 15:47:15 +0800 diff --git a/patches/server/0012-Akarin-Metrics.patch b/patches/server/0013-Akarin-Metrics.patch similarity index 94% rename from patches/server/0012-Akarin-Metrics.patch rename to patches/server/0013-Akarin-Metrics.patch index aea9ff597..9f6bc9a64 100644 --- a/patches/server/0012-Akarin-Metrics.patch +++ b/patches/server/0013-Akarin-Metrics.patch @@ -1,4 +1,4 @@ -From 7a2c1555aecec9486babe0ee4b39fc65446336ed Mon Sep 17 00:00:00 2001 +From 41e534adf59d6772d86194362a40aa935659d350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Mon, 13 Apr 2020 13:18:27 +0800 diff --git a/scripts/importSources.sh b/scripts/importSources.sh index d17285b08..2c3bef40c 100755 --- a/scripts/importSources.sh +++ b/scripts/importSources.sh @@ -117,7 +117,7 @@ done cd "$paperserverdir" # rm -rf nms-patches git add . &> /dev/null - echo -e "Extra dev imports of Akarin:\n\n$IMPORT_LOG" | git commit src -F - &> /dev/null + echo -e "Extra dev imports of Akarin\n\n$IMPORT_LOG" | git commit src -F - &> /dev/null echo " $(bashcolor 1 32)Succeed$(bashcolorend) - Sources have been imported to Paper/Paper-Server" if [[ $maintask != "0" ]]; then # this is magical diff --git a/scripts/updateUpstream.sh b/scripts/updateUpstream.sh index 8c7905171..4ac2dcdcc 100755 --- a/scripts/updateUpstream.sh +++ b/scripts/updateUpstream.sh @@ -47,8 +47,8 @@ paperVer=$(gethead Paper) paperdir ./paper patch -cd "Paper-Server" -mcVer=$(mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }') +#cd "Paper-Server" +#mcVer=$(mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }') #echo " $(bashcolor 1 32)(1/$subtasks)$(bashcolorend) - Import necessary sources.." #basedir