From 987ba064aaa68c6e41b373097ea21099b877122b Mon Sep 17 00:00:00 2001 From: Blast-MC Date: Sun, 12 Jan 2025 20:33:40 -0500 Subject: [PATCH] Build Changes --- .../advancement/AdvancementDisplay.java.patch | 11 ----------- fork-api/src/main/java/ForkFile.java | 2 -- .../features/0001-feature-patch.patch | 18 ------------------ .../google/common/annotations/Beta.java.patch | 7 ------- .../sources/net/minecraft/BlockUtil.java.patch | 10 ---------- .../features/0001-feature-1.patch | 18 ------------------ .../block/CraftBlockSoundGroup.java.patch | 10 ---------- fork-server/src/main/java/ForkServerFile.java | 2 -- .../build.gradle.kts.patch | 0 .../build.gradle.kts.patch | 4 ++-- 10 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 fork-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch delete mode 100644 fork-api/src/main/java/ForkFile.java delete mode 100644 fork-server/minecraft-patches/features/0001-feature-patch.patch delete mode 100644 fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch delete mode 100644 fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch delete mode 100644 fork-server/paper-patches/features/0001-feature-1.patch delete mode 100644 fork-server/paper-patches/files/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java.patch delete mode 100644 fork-server/src/main/java/ForkServerFile.java rename {fork-api => parchment-api}/build.gradle.kts.patch (100%) rename {fork-server => parchment-server}/build.gradle.kts.patch (93%) diff --git a/fork-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch b/fork-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch deleted file mode 100644 index 2bf7c4b..0000000 --- a/fork-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java -+++ b/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java -@@ -27,7 +_,7 @@ - * - * @return the frame type - */ -- Frame frame(); -+ Frame frame(); // patch - - /** - * Gets the advancement title. diff --git a/fork-api/src/main/java/ForkFile.java b/fork-api/src/main/java/ForkFile.java deleted file mode 100644 index 46ca2b8..0000000 --- a/fork-api/src/main/java/ForkFile.java +++ /dev/null @@ -1,2 +0,0 @@ -public class ForkFile { -} diff --git a/fork-server/minecraft-patches/features/0001-feature-patch.patch b/fork-server/minecraft-patches/features/0001-feature-patch.patch deleted file mode 100644 index 89f4e2d..0000000 --- a/fork-server/minecraft-patches/features/0001-feature-patch.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Wed, 11 Dec 2024 19:23:25 -0700 -Subject: [PATCH] 'feature patch' - - -diff --git a/net/minecraft/DefaultUncaughtExceptionHandler.java b/net/minecraft/DefaultUncaughtExceptionHandler.java -index 6341da454460aa6c00075f82163b97286f760eee..a8bc94121a0209faa8dd293ff3c0862dac280cdb 100644 ---- a/net/minecraft/DefaultUncaughtExceptionHandler.java -+++ b/net/minecraft/DefaultUncaughtExceptionHandler.java -@@ -12,6 +12,7 @@ public class DefaultUncaughtExceptionHandler implements UncaughtExceptionHandler - - @Override - public void uncaughtException(Thread thread, Throwable exception) { -+ System.out.println("im a feature"); - this.logger.error("Caught previously unhandled exception :", exception); - } - } diff --git a/fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch b/fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch deleted file mode 100644 index 047831e..0000000 --- a/fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/com/google/common/annotations/Beta.java -+++ b/com/google/common/annotations/Beta.java -@@ -44,3 +_,4 @@ - @Documented - @GwtCompatible - public @interface Beta {} -+// comment diff --git a/fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch b/fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch deleted file mode 100644 index a2792a0..0000000 --- a/fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/BlockUtil.java -+++ b/net/minecraft/BlockUtil.java -@@ -16,6 +_,7 @@ - public static BlockUtil.FoundRectangle getLargestRectangleAround( - BlockPos centerPos, Direction.Axis axis1, int max1, Direction.Axis axis2, int max2, Predicate posPredicate - ) { -+ System.out.println("hello"); - BlockPos.MutableBlockPos mutableBlockPos = centerPos.mutable(); - Direction direction = Direction.get(Direction.AxisDirection.NEGATIVE, axis1); - Direction opposite = direction.getOpposite(); diff --git a/fork-server/paper-patches/features/0001-feature-1.patch b/fork-server/paper-patches/features/0001-feature-1.patch deleted file mode 100644 index 254c4f6..0000000 --- a/fork-server/paper-patches/features/0001-feature-1.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Sun, 15 Dec 2024 00:07:29 -0700 -Subject: [PATCH] feature 1 - - -diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java -index 054ee606e7c36712e474e2b7093b436e043e6262..9d395898511ed5b408dacfb9c796baacb18b9430 100644 ---- a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java -+++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java -@@ -20,6 +20,7 @@ public class CraftBlockSoundGroup implements BlockSoundGroup { - @Override - public Sound getStepSound() { - // file patch -+ // feature patch - return CraftSound.minecraftToBukkit(soundEffectType.getStepSound()); - } - diff --git a/fork-server/paper-patches/files/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java.patch b/fork-server/paper-patches/files/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java.patch deleted file mode 100644 index cb56c8a..0000000 --- a/fork-server/paper-patches/files/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java -+++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java -@@ -19,6 +_,7 @@ - - @Override - public Sound getStepSound() { -+ // file patch - return CraftSound.minecraftToBukkit(soundEffectType.getStepSound()); - } - diff --git a/fork-server/src/main/java/ForkServerFile.java b/fork-server/src/main/java/ForkServerFile.java deleted file mode 100644 index 0d86f14..0000000 --- a/fork-server/src/main/java/ForkServerFile.java +++ /dev/null @@ -1,2 +0,0 @@ -public class ForkServerFile { -} diff --git a/fork-api/build.gradle.kts.patch b/parchment-api/build.gradle.kts.patch similarity index 100% rename from fork-api/build.gradle.kts.patch rename to parchment-api/build.gradle.kts.patch diff --git a/fork-server/build.gradle.kts.patch b/parchment-server/build.gradle.kts.patch similarity index 93% rename from fork-server/build.gradle.kts.patch rename to parchment-server/build.gradle.kts.patch index 347c989..65387dc 100644 --- a/fork-server/build.gradle.kts.patch +++ b/parchment-server/build.gradle.kts.patch @@ -8,7 +8,7 @@ + upstream.patchDir("paperServer") { + upstreamPath = "paper-server" + excludes = setOf("src/minecraft", "patches", "build.gradle.kts") -+ patchesDir = rootDirectory.dir("fork-server/paper-patches") ++ patchesDir = rootDirectory.dir("parchment-server/paper-patches") + outputDir = rootDirectory.dir("paper-server") + } + } @@ -48,7 +48,7 @@ dependencies { - implementation(project(":paper-api")) -+ implementation(project(":fork-api")) ++ implementation(project(":parchment-api")) implementation("ca.spottedleaf:concurrentutil:0.0.2") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21