Skip to content

Commit 4e20baa

Browse files
grannygranny
committed
first 9 patches 👀
1 parent 9f67bbe commit 4e20baa

6 files changed

+76
-76
lines changed

‎patches/unapplied-server/0003-Rebrand.patch‎ renamed to ‎patches/server/0001-Rebrand.patch‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ Subject: [PATCH] Rebrand
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 6c1b5b2ae207c0139d097c5ca857dd662a63f997..535b0c6a750cc77fb9340d6e080932f3eb3bde17 100644
8+
index 9966576652ed6007d2228237f292c1dc83ede485..c8c44df62289accad53d436383adbed134539049 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
1212
val alsoShade: Configuration by configurations.creating
1313

1414
dependencies {
15-
- implementation(project(":pufferfish-api")) // Pufferfish // Paper
15+
- implementation(project(":paper-api"))
1616
+ implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur
1717
// Paper start
1818
implementation("org.jline:jline-terminal-jansi:3.21.0")
1919
implementation("net.minecrell:terminalconsoleappender:1.3.0")
20-
@@ -54,6 +54,10 @@ dependencies {
21-
}
22-
// Pufferfish end
20+
@@ -47,6 +47,10 @@ dependencies {
21+
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
22+
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
2323

2424
+ implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
2525
+ implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
@@ -28,27 +28,27 @@ index 6c1b5b2ae207c0139d097c5ca857dd662a63f997..535b0c6a750cc77fb9340d6e080932f3
2828
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
2929
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
3030
testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
31-
@@ -100,14 +104,14 @@ tasks.jar {
31+
@@ -81,14 +85,14 @@ tasks.jar {
3232
val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
3333
attributes(
3434
"Main-Class" to "org.bukkit.craftbukkit.Main",
35-
- "Implementation-Title" to "Pufferfish", // Pufferfish
35+
- "Implementation-Title" to "Paper",
3636
+ "Implementation-Title" to "Purpur", // Pufferfish // Purpur
3737
"Implementation-Version" to implementationVersion,
3838
"Implementation-Vendor" to date, // Paper
39-
- "Specification-Title" to "Pufferfish", // Pufferfish
39+
- "Specification-Title" to "Paper",
4040
+ "Specification-Title" to "Purpur", // Pufferfish // Purpur
4141
"Specification-Version" to project.version,
42-
- "Specification-Vendor" to "Pufferfish Studios LLC", // Pufferfish
43-
- "Brand-Id" to "pufferfish:pufferfish", // Pufferfish
44-
- "Brand-Name" to "Pufferfish", // Pufferfish
42+
- "Specification-Vendor" to "Paper Team",
43+
- "Brand-Id" to "papermc:paper",
44+
- "Brand-Name" to "Paper",
4545
+ "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur
4646
+ "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur
4747
+ "Brand-Name" to "Purpur", // Pufferfish // Purpur
4848
"Build-Number" to (build ?: ""),
4949
"Build-Time" to Instant.now().toString(),
5050
"Git-Branch" to gitBranch, // Paper
51-
@@ -168,7 +172,7 @@ fun TaskContainer.registerRunTask(
51+
@@ -149,7 +153,7 @@ fun TaskContainer.registerRunTask(
5252
name: String,
5353
block: JavaExec.() -> Unit
5454
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -151,40 +151,40 @@ index 6ee39b534b8d992655bc0cef3c299d12cbae0034..90b3526479320064378f2cde6c2f2b8e
151151
.completer(new ConsoleCommandCompleter(this.server))
152152
.option(LineReader.Option.COMPLETE_IN_WORD, true);
153153
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
154-
index bf1aacdfac2d501c62038a22cb9eac7f9b946619..3099c21ee589acf6edff5903a23673adf489024f 100644
154+
index 790bad0494454ca12ee152e3de6da3da634d9b20..a6e5950b5875cafd734300cdfbf58f5d3736f3c8 100644
155155
--- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
156156
+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
157-
@@ -32,6 +32,7 @@ public record ServerBuildInfoImpl(
157+
@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
158+
private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
158159

159160
private static final String BRAND_PAPER_NAME = "Paper";
160-
private static final String BRAND_PUFFERFISH_NAME = "Pufferfish"; // Purpur
161161
+ private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur
162162

163163
private static final String BUILD_DEV = "DEV";
164164

165-
@@ -43,9 +44,9 @@ public record ServerBuildInfoImpl(
165+
@@ -42,9 +43,9 @@ public record ServerBuildInfoImpl(
166166
this(
167167
getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
168168
.map(Key::key)
169-
- .orElse(BRAND_PUFFERFISH_ID), // Purpur
169+
- .orElse(BRAND_PAPER_ID),
170170
+ .orElse(BRAND_PURPUR_ID), // Purpur
171171
getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
172-
- .orElse(BRAND_PUFFERFISH_NAME), // Purpur
172+
- .orElse(BRAND_PAPER_NAME),
173173
+ .orElse(BRAND_PURPUR_NAME), // Purpur
174174
SharedConstants.getCurrentVersion().getId(),
175175
SharedConstants.getCurrentVersion().getName(),
176176
getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
177-
@@ -62,7 +63,7 @@ public record ServerBuildInfoImpl(
177+
@@ -61,7 +62,7 @@ public record ServerBuildInfoImpl(
178178

179179
@Override
180180
public boolean isBrandCompatible(final @NotNull Key brandId) {
181-
- return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur
182-
+ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID); // Purpur
181+
- return brandId.equals(this.brandId);
182+
+ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur
183183
}
184184

185185
@Override
186186
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
187-
index b24265573fdef5d9a964bcd76146f34542c420cf..710477ae27ebc5afdf0012ef0867d05efd293c24 100644
187+
index 589a8bf75be6ccc59f1e5dd5d8d9afed41c4772d..7eabcb453ef655741c4802d2f574932d6d741631 100644
188188
--- a/src/main/java/net/minecraft/CrashReport.java
189189
+++ b/src/main/java/net/minecraft/CrashReport.java
190190
@@ -32,6 +32,7 @@ public class CrashReport {
@@ -214,10 +214,10 @@ index b24265573fdef5d9a964bcd76146f34542c420cf..710477ae27ebc5afdf0012ef0867d05e
214214

215215
public SystemReport getSystemReport() {
216216
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
217-
index 40689256711cc94a806ca1da346f4f62eda31526..4c178b234bc1118a577d0e016f4b986e9197e99d 100644
217+
index 2d5c1b91b814316bf9f2f22bcd30adacc8970b01..82a661db5fc88e4e06befc0abf720d3e9fb8da97 100644
218218
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
219219
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
220-
@@ -177,7 +177,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
220+
@@ -243,7 +243,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
221221

222222
// Paper start
223223
private static void printOversizedLog(String msg, Path file, int x, int z) {
@@ -254,49 +254,49 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee
254254

255255
@Override
256256
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
257-
index 2f4d6b56301195f8d39ed50dffe842464065bfe1..30ddb35140ae4a6faba98c191bb8eadbafc35377 100644
257+
index 5fc88196b2c873427c817e9802ad3b12009f265f..4178f48c1614af8e6796cf07fd018b9c6e67dcd0 100644
258258
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
259259
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
260260
@@ -492,7 +492,7 @@ public class CraftScheduler implements BukkitScheduler {
261261
this.parsePending();
262262
} else {
263-
// this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
263+
// this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(this.currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
264264
- task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Paper"); // Paper
265265
+ task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
266266
// We don't need to parse pending
267267
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
268268
}
269269
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
270-
index 8fa2b2a67891d34ec95f7eed2a4118ddd8a5be15..5505c13d0e602f39fe02dde350082c11a2f2a2e0 100644
270+
index bc53c263682ada9eebcaccc13e741844d310a7a6..8a96f77d16eb0c977fd6212bece419ef4860e95e 100644
271271
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
272272
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
273273
@@ -489,7 +489,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
274274

275275
@Override
276276
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
277-
- return new gg.pufferfish.pufferfish.PufferfishVersionFetcher(); // Pufferfish
277+
- return new com.destroystokyo.paper.PaperVersionFetcher();
278278
+ return new com.destroystokyo.paper.PaperVersionFetcher(); // Pufferfish // Purpur
279279
}
280280

281281
@Override
282282
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
283-
index 80553face9c70c2a3d897681e7761df85b22d464..99597258e8e88cd9e2c901c4ac3ff7faeeabee2b 100644
283+
index 774556a62eb240da42e84db4502e2ed43495be17..99597258e8e88cd9e2c901c4ac3ff7faeeabee2b 100644
284284
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
285285
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
286286
@@ -11,7 +11,7 @@ public final class Versioning {
287287
public static String getBukkitVersion() {
288288
String result = "Unknown-Version";
289289

290-
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish
290+
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
291291
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
292292
Properties properties = new Properties();
293293

294294
if (stream != null) {
295295
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
296-
index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..f51cc3de3ca935ef90f7f0e9dd0506b856fc55f3 100644
296+
index 529df2a41dd93d6e1505053bd04032dbf0cdaa31..c0aa9f4bfaa1d6fb81823363e3ac3f1ff06efc3d 100644
297297
--- a/src/main/java/org/spigotmc/WatchdogThread.java
298298
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
299-
@@ -96,7 +96,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
299+
@@ -23,7 +23,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
300300

301301
private WatchdogThread(long timeoutTime, boolean restart)
302302
{
@@ -305,7 +305,7 @@ index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..f51cc3de3ca935ef90f7f0e9dd0506b8
305305
this.timeoutTime = timeoutTime;
306306
this.restart = restart;
307307
earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
308-
@@ -155,14 +155,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
308+
@@ -80,14 +80,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
309309
if (isLongTimeout) {
310310
// Paper end
311311
log.log( Level.SEVERE, "------------------------------" );
@@ -323,7 +323,7 @@ index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..f51cc3de3ca935ef90f7f0e9dd0506b8
323323
//
324324
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
325325
{
326-
@@ -184,12 +184,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
326+
@@ -109,12 +109,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
327327
// Paper end
328328
} else
329329
{
@@ -336,9 +336,9 @@ index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..f51cc3de3ca935ef90f7f0e9dd0506b8
336336
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
337337
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
338338
ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
339-
this.dumpTickingInfo(); // Paper - log detailed tick information
340339
WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
341-
@@ -205,7 +205,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
340+
log.log( Level.SEVERE, "------------------------------" );
341+
@@ -129,7 +129,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
342342
WatchdogThread.dumpThread( thread, log );
343343
}
344344
} else {

0 commit comments

Comments
 (0)