Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Build Changes

Browse Source
This commit is contained in:
Blast-MC
2025-01-12 20:33:40 -05:00
parent a960406cab
commit 987ba064aa
10 changed files with 2 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fork-api/paper-patches/files/src/main/java/io/papermc/paper/advancement/AdvancementDisplay.java.patch
View File

@@ -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.

2
fork-api/src/main/java/ForkFile.java
View File

@@ -1,2 +0,0 @@
public class ForkFile {
}

18
fork-server/minecraft-patches/features/0001-feature-patch.patch
View File

@@ -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);
}
}

7
fork-server/minecraft-patches/sources/com/google/common/annotations/Beta.java.patch
View File

@@ -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

10
fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch
View File

@@ -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<BlockPos> posPredicate
) {
+ System.out.println("hello");
BlockPos.MutableBlockPos mutableBlockPos = centerPos.mutable();
Direction direction = Direction.get(Direction.AxisDirection.NEGATIVE, axis1);
Direction opposite = direction.getOpposite();

18
fork-server/paper-patches/features/0001-feature-1.patch
View File

@@ -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());
}

10
fork-server/paper-patches/files/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java.patch
View File

@@ -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());
}

2
fork-server/src/main/java/ForkServerFile.java
View File

@@ -1,2 +0,0 @@
public class ForkServerFile {
}

0
fork-api/build.gradle.kts.patch → parchment-api/build.gradle.kts.patch
View File

4
fork-server/build.gradle.kts.patch → parchment-server/build.gradle.kts.patch
View File

@@ -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