From 383d24c17aaee14f675849f4c3d07e39d32e6a22 Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Thu, 9 Dec 2021 13:29:11 -0500 Subject: [PATCH 1/4] Update Upstream (Airplane) --- gradle.properties | 2 +- patches/server/0001-Pufferfish-branding.patch | 4 +- .../0004-Revert-Sentry-Logging-Support.patch | 139 ++++++++++++++++++ ...Add-Sentry.patch => 0005-Add-Sentry.patch} | 0 ...=> 0006-Add-option-to-disable-books.patch} | 2 +- ...0007-Optimize-entity-coordinate-key.patch} | 2 +- ....patch => 0008-Optimize-suffocation.patch} | 0 ...patch => 0009-Optimize-mob-spawning.patch} | 0 8 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 patches/server/0004-Revert-Sentry-Logging-Support.patch rename patches/server/{0004-Add-Sentry.patch => 0005-Add-Sentry.patch} (100%) rename patches/server/{0005-Add-option-to-disable-books.patch => 0006-Add-option-to-disable-books.patch} (95%) rename patches/server/{0006-Optimize-entity-coordinate-key.patch => 0007-Optimize-entity-coordinate-key.patch} (95%) rename patches/server/{0007-Optimize-suffocation.patch => 0008-Optimize-suffocation.patch} (100%) rename patches/server/{0008-Optimize-mob-spawning.patch => 0009-Optimize-mob-spawning.patch} (100%) diff --git a/gradle.properties b/gradle.properties index b7a82c146..7aa58cbfd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ group=gg.pufferfish.pufferfish version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 packageVersion=1_17_1_R1 -airplaneRef=dd8d0c77d4f124b55077e1ddb92976ae91c9a4d5 +airplaneRef=f06583d53a0c6e0f4f69cfcdbe70e08811fedac3 diff --git a/patches/server/0001-Pufferfish-branding.patch b/patches/server/0001-Pufferfish-branding.patch index 8535ef8b9..b552e1026 100644 --- a/patches/server/0001-Pufferfish-branding.patch +++ b/patches/server/0001-Pufferfish-branding.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Pufferfish branding Update branding diff --git a/build.gradle.kts b/build.gradle.kts -index fd3528be3d90733e826bcbeae967b95cedf92dfe..3f6898e43ea4578fdb9ee06301148dee5650623a 100644 +index 4c26f466af0e1cf07245e2d0b57a54574d5472d4..c59e4260e474f4c1e35bd24a4d4f90f4ee980ff8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ repositories { @@ -18,7 +18,7 @@ index fd3528be3d90733e826bcbeae967b95cedf92dfe..3f6898e43ea4578fdb9ee06301148dee implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") -@@ -82,7 +82,7 @@ tasks.jar { +@@ -84,7 +84,7 @@ tasks.jar { "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", "Implementation-Version" to "git-Paper-$implementationVersion", diff --git a/patches/server/0004-Revert-Sentry-Logging-Support.patch b/patches/server/0004-Revert-Sentry-Logging-Support.patch new file mode 100644 index 000000000..27e6a7c9f --- /dev/null +++ b/patches/server/0004-Revert-Sentry-Logging-Support.patch @@ -0,0 +1,139 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kevin Raneri +Date: Thu, 9 Dec 2021 13:27:56 -0500 +Subject: [PATCH] Revert "Sentry Logging Support" + +This reverts commit 74c0b90cc6569a2b367c63482bbc79688ae6fb2d. + +diff --git a/build.gradle.kts b/build.gradle.kts +index c59e4260e474f4c1e35bd24a4d4f90f4ee980ff8..3f6898e43ea4578fdb9ee06301148dee5650623a 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -64,8 +64,6 @@ dependencies { + } // Airplane - more config + implementation("com.github.technove:Flare:2c4a2114a0") // Airplane - flare + +- implementation("io.sentry:sentry:5.4.0") // Airplane +- + testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test + testImplementation("junit:junit:4.13.1") + testImplementation("org.hamcrest:hamcrest-library:1.3") +diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java +index f34327d578ea8acfd4bb8f6f933af5d4f0f49c90..2b654e6adfe331a5fa68c1aea7d6d6cea1f3567d 100644 +--- a/src/main/java/gg/airplane/AirplaneConfig.java ++++ b/src/main/java/gg/airplane/AirplaneConfig.java +@@ -2,7 +2,6 @@ package gg.airplane; + + import co.technove.air.AIR; + import co.technove.air.ValueType; +-import io.sentry.Sentry; + import net.minecraft.core.Registry; + import gg.airplane.flare.FlareCommand; + import net.minecraft.server.MinecraftServer; +@@ -254,33 +253,5 @@ public class AirplaneConfig { + config.setComment("misc", "Settings for things that don't belong elsewhere"); + } + +- public static boolean usingSentry = false; +- public static Level sentryLevel; +- +- private static void sentrySetup() { +- if (Sentry.isEnabled()) { +- Sentry.endSession(); +- Sentry.close(); +- } +- +- String sentryDsn = getString("sentry.dsn", ""); +- if (sentryDsn.isEmpty()) { +- usingSentry = false; +- Sentry.close(); +- return; +- } +- +- sentryLevel = Level.valueOf(getString("sentry.log-level", Level.WARN.name())); +- +- usingSentry = true; +- Sentry.init(sentryDsn); +- } +- +- public static void reportException(Throwable e) { +- if (usingSentry) { +- Sentry.captureException(e); +- } +- } +- + + } +diff --git a/src/main/java/gg/airplane/AirplaneSentryAppender.java b/src/main/java/gg/airplane/AirplaneSentryAppender.java +deleted file mode 100644 +index eb83e44fc384e1b17291066d58512803834bf4ed..0000000000000000000000000000000000000000 +--- a/src/main/java/gg/airplane/AirplaneSentryAppender.java ++++ /dev/null +@@ -1,35 +0,0 @@ +-package gg.airplane; +- +-import io.sentry.Sentry; +-import org.apache.logging.log4j.core.Appender; +-import org.apache.logging.log4j.core.Core; +-import org.apache.logging.log4j.core.LogEvent; +-import org.apache.logging.log4j.core.appender.AbstractAppender; +-import org.apache.logging.log4j.core.config.plugins.Plugin; +-import org.apache.logging.log4j.core.config.plugins.PluginFactory; +- +-@Plugin( +- name = "AirplaneSentry", +- category = Core.CATEGORY_NAME, +- elementType = Appender.ELEMENT_TYPE +-) +-public class AirplaneSentryAppender extends AbstractAppender { +- protected AirplaneSentryAppender() { +- super("AirplaneSentry", null, null); +- } +- +- @Override +- public void append(LogEvent event) { +- if (AirplaneConfig.usingSentry && event.getLevel().isMoreSpecificThan(AirplaneConfig.sentryLevel)) { +- Throwable thrown = event.getThrown(); +- if (thrown != null) { +- Sentry.captureException(thrown); +- } +- } +- } +- +- @PluginFactory +- public static AirplaneSentryAppender createAppender() { +- return new AirplaneSentryAppender(); +- } +-} +diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java +index 1233c2d6b58a36a87e84cc73de7a71980431b9ca..b9a618eba86656289e20d051c3f0023ec93bb733 100644 +--- a/src/main/java/net/minecraft/CrashReport.java ++++ b/src/main/java/net/minecraft/CrashReport.java +@@ -30,7 +30,6 @@ public class CrashReport { + private final SystemReport systemReport = new SystemReport(); + + public CrashReport(String message, Throwable cause) { +- gg.airplane.AirplaneConfig.reportException(cause); // Airplane + io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper + this.title = message; + this.exception = cause; +diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml +index 77d71eaac32a2d33d7659134114c79415da64cd8..74ccc67e3c12dc5182602fb691ef3ddeb5b53280 100644 +--- a/src/main/resources/log4j2.xml ++++ b/src/main/resources/log4j2.xml +@@ -42,7 +42,6 @@ + + + +- + + + +@@ -50,7 +49,6 @@ + + + +- + + + diff --git a/patches/server/0004-Add-Sentry.patch b/patches/server/0005-Add-Sentry.patch similarity index 100% rename from patches/server/0004-Add-Sentry.patch rename to patches/server/0005-Add-Sentry.patch diff --git a/patches/server/0005-Add-option-to-disable-books.patch b/patches/server/0006-Add-option-to-disable-books.patch similarity index 95% rename from patches/server/0005-Add-option-to-disable-books.patch rename to patches/server/0006-Add-option-to-disable-books.patch index 4d3f5f6c8..7ad4df60b 100644 --- a/patches/server/0005-Add-option-to-disable-books.patch +++ b/patches/server/0006-Add-option-to-disable-books.patch @@ -29,7 +29,7 @@ index 5a74fbfbb5dd7ec4f617ac553e5a95cbec435b2b..95b05af7935cbe9d280a1e2cf7d8e384 + } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 744f7b717f14a070d5a4be0b35e7f422694fb407..e0dce4d1820041aa6f85933611d261a4b72f6817 100644 +index 621ec8e8a197323da6b423fee57c816ac9d7c875..e45dbc2daba8e975f62542decb46481267f76497 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1096,6 +1096,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0006-Optimize-entity-coordinate-key.patch b/patches/server/0007-Optimize-entity-coordinate-key.patch similarity index 95% rename from patches/server/0006-Optimize-entity-coordinate-key.patch rename to patches/server/0007-Optimize-entity-coordinate-key.patch index 5841307c2..69568f1fe 100644 --- a/patches/server/0006-Optimize-entity-coordinate-key.patch +++ b/patches/server/0007-Optimize-entity-coordinate-key.patch @@ -24,7 +24,7 @@ index b5be0486d1cffe60808948b4b0bfd709664b2ae4..32ed9432998764c20147d6060314a2da public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aac9dd19237d0708990960d03328e7530cd7bc8e..cd7b868149390570dbb3455b7085998e25f218b3 100644 +index 2cad495e834300cdd3ee65cdf43d28ae602c9625..e7d3ae3875cebe7f9b924ebcfae57516eea6bba1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -223,7 +223,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0007-Optimize-suffocation.patch b/patches/server/0008-Optimize-suffocation.patch similarity index 100% rename from patches/server/0007-Optimize-suffocation.patch rename to patches/server/0008-Optimize-suffocation.patch diff --git a/patches/server/0008-Optimize-mob-spawning.patch b/patches/server/0009-Optimize-mob-spawning.patch similarity index 100% rename from patches/server/0008-Optimize-mob-spawning.patch rename to patches/server/0009-Optimize-mob-spawning.patch From 1db3bc541b1e576418135b2915a4292861c9dd84 Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Thu, 9 Dec 2021 13:57:27 -0500 Subject: [PATCH 2/4] Fix remapper --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 136856004..6e5baa1bc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ paperweight { withStandardPatcher { baseName("Airplane") - remapRepo.set("https://maven.quiltmc.org/repository/release/") + remapRepo.set("https://maven.fabricmc.net/") decompileRepo.set("https://files.minecraftforge.net/maven/") apiPatchDir.set(layout.projectDirectory.dir("patches/api")) From 15b612e95ead7713cc2e476e45768c21a6e0738a Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Sat, 11 Dec 2021 01:51:26 -0500 Subject: [PATCH 3/4] Update Upstream (Airplane) --- gradle.properties | 2 +- patches/server/0001-Pufferfish-branding.patch | 4 ++-- patches/server/0004-Revert-Sentry-Logging-Support.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7aa58cbfd..e98f37591 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ group=gg.pufferfish.pufferfish version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 packageVersion=1_17_1_R1 -airplaneRef=f06583d53a0c6e0f4f69cfcdbe70e08811fedac3 +airplaneRef=485436ce14c769584100214232fa325bfb771d65 diff --git a/patches/server/0001-Pufferfish-branding.patch b/patches/server/0001-Pufferfish-branding.patch index b552e1026..994a76abf 100644 --- a/patches/server/0001-Pufferfish-branding.patch +++ b/patches/server/0001-Pufferfish-branding.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Pufferfish branding Update branding diff --git a/build.gradle.kts b/build.gradle.kts -index 4c26f466af0e1cf07245e2d0b57a54574d5472d4..c59e4260e474f4c1e35bd24a4d4f90f4ee980ff8 100644 +index 889aa2d4fbdd85db00c6d711181cb1832fd9daa5..2f9bef70be115c09a22594f704841b70d8e8aab0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ repositories { @@ -18,7 +18,7 @@ index 4c26f466af0e1cf07245e2d0b57a54574d5472d4..c59e4260e474f4c1e35bd24a4d4f90f4 implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") -@@ -84,7 +84,7 @@ tasks.jar { +@@ -85,7 +85,7 @@ tasks.jar { "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", "Implementation-Version" to "git-Paper-$implementationVersion", diff --git a/patches/server/0004-Revert-Sentry-Logging-Support.patch b/patches/server/0004-Revert-Sentry-Logging-Support.patch index 27e6a7c9f..4df419259 100644 --- a/patches/server/0004-Revert-Sentry-Logging-Support.patch +++ b/patches/server/0004-Revert-Sentry-Logging-Support.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Revert "Sentry Logging Support" This reverts commit 74c0b90cc6569a2b367c63482bbc79688ae6fb2d. diff --git a/build.gradle.kts b/build.gradle.kts -index c59e4260e474f4c1e35bd24a4d4f90f4ee980ff8..3f6898e43ea4578fdb9ee06301148dee5650623a 100644 +index 2f9bef70be115c09a22594f704841b70d8e8aab0..9102d29622f93e824525eeef3420a6aa2b7ebb30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -64,8 +64,6 @@ dependencies { +@@ -65,8 +65,6 @@ dependencies { } // Airplane - more config implementation("com.github.technove:Flare:2c4a2114a0") // Airplane - flare From 2bc442f1c62ac906ba96b462adcb11401633e3ac Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Tue, 14 Dec 2021 14:12:12 -0500 Subject: [PATCH 4/4] Update log4j --- patches/server/0010-Update-log4j.patch | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 patches/server/0010-Update-log4j.patch diff --git a/patches/server/0010-Update-log4j.patch b/patches/server/0010-Update-log4j.patch new file mode 100644 index 000000000..d96a088fe --- /dev/null +++ b/patches/server/0010-Update-log4j.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kevin Raneri +Date: Tue, 14 Dec 2021 14:11:48 -0500 +Subject: [PATCH] Update log4j + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 9102d29622f93e824525eeef3420a6aa2b7ebb30..090493ec8d35f3120be90579f653aeb0c9d178b3 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -33,12 +33,12 @@ dependencies { + all its classes to check if they are plugins. + Scanning takes about 1-2 seconds so adding this speeds up the server start. + */ +- implementation("org.apache.logging.log4j:log4j-core:2.15.0") // Paper - implementation +- annotationProcessor("org.apache.logging.log4j:log4j-core:2.15.0") // Paper - Needed to generate meta for out hex color converter plugin ++ implementation("org.apache.logging.log4j:log4j-core:2.16.0") // Paper - implementation // Pufferfish ++ annotationProcessor("org.apache.logging.log4j:log4j-core:2.16.0") // Paper - Needed to generate meta for out hex color converter plugin // Pufferfish + // Paper end +- implementation("org.apache.logging.log4j:log4j-iostreams:2.15.0") // Paper +- implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0") // Paper +- implementation("org.apache.logging.log4j:log4j-api:2.15.0") // Paper ++ implementation("org.apache.logging.log4j:log4j-iostreams:2.16.0") // Paper // Pufferfish ++ implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0") // Paper // Pufferfish ++ implementation("org.apache.logging.log4j:log4j-api:2.16.0") // Paper // Pufferfish + implementation("org.ow2.asm:asm:9.2") + implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation + implementation("com.googlecode.json-simple:json-simple:1.1.1") {