Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@8f0f20d Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-07-18 01:45:34 +03:00
parent 08248075f6
commit 451eb3ec0b
14 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build.gradle.kts
View File

@@ -86,4 +86,24 @@ paperweight {
outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
}
}
}
}
tasks.generateDevelopmentBundle {
apiCoordinates = "space.bxteam.divinemc:divinemc-api"
libraryRepositories.set(
listOf(
"https://repo.maven.apache.org/maven2/",
paperMavenPublicUrl
)
)
}
publishing {
if (project.providers.gradleProperty("publishDevBundle").isPresent) {
publications.create<MavenPublication>("devBundle") {
artifact(tasks.generateDevelopmentBundle) {
artifactId = "dev-bundle"
}
}
}
}

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.21
version = 1.21-R0.1-SNAPSHOT
purpurRef = bf63cfab4dfa92afc5c2a12c2c6f4cb1ddfa32df
purpurRef = 8f0f20df9acdb4e46b4bf36444ff5ddaf5f0413a
org.gradle.caching = true
org.gradle.parallel = true

0
patches/server/0049-Improve-biome-temperature-cache.patch → patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch
View File

17
patches/server/0001-Divine-Branding.patch
View File

@@ -209,19 +209,6 @@ index 710477ae27ebc5afdf0012ef0867d05efd293c24..972391f88d9a5fbf6e28ddbf853d610b
public CrashReport(String message, Throwable cause) {
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7115c04cacfd373b2d9ce0e34460aa695bb65bcd..f2a099a3ff87789a2138cc1d6b7506d0f68bf628 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1032,7 +1032,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
shutdownThread = Thread.currentThread();
org.spigotmc.WatchdogThread.doStop(); // Paper
if (!isSameThread()) {
- MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO DIVINEMC)"); // DivineMC
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
index 8f74c2ec5252b6265549589310d742337c91cb2c..1f4c965531393dd81246de487bc86f6d6f73b723 100644
--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
@@ -254,10 +241,10 @@ index 8f74c2ec5252b6265549589310d742337c91cb2c..1f4c965531393dd81246de487bc86f6d
servergui.runFinalizers();
}
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
index 0615fd82b71efb9a397de01615050e6d906c2844..64b2608ae81373acb67e3e0453c61822c0d03087 100644
index 40689256711cc94a806ca1da346f4f62eda31526..f1beaa44a0f24b829923c351d0a0687b8138b6f9 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -146,7 +146,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
@@ -177,7 +177,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
// Paper start
private static void printOversizedLog(String msg, Path file, int x, int z) {

4
patches/server/0002-Divine-Configuration.patch
View File

@@ -34,7 +34,7 @@ index 39a7abeeff53a608774dc34226e9b5e12bd5b5d2..6833a7710cfb2716c8522d8a841bee66
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 5ab33a2531cd7853d4a33fa1569d0181d967bac6..2dec9557c6f9e33b4cecb5c53ce3fa3ff2304c15 100644
index ba2254ef7688177eff2ed8115726b7b551620560..27a52e96f5bc97c1e1aceb88088595db93a35b20 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -83,6 +83,7 @@ import net.minecraft.world.phys.AABB;
@@ -53,7 +53,7 @@ index 5ab33a2531cd7853d4a33fa1569d0181d967bac6..2dec9557c6f9e33b4cecb5c53ce3fa3f
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -690,6 +692,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -732,6 +734,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur

4
patches/server/0025-Remove-Spigot-tick-limiter.patch
View File

@@ -7,7 +7,7 @@ Original code by Titaniumtown, modified by NONPLAYT
You can find the original code on https://gitlab.com/Titaniumtown/JettPack
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 2dec9557c6f9e33b4cecb5c53ce3fa3ff2304c15..2e60f4d92b8d26eff7efe9c99480c33649bec789 100644
index 27a52e96f5bc97c1e1aceb88088595db93a35b20..24511ef4a618348b7a6fceefc5e6cdb359bb6655 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -178,8 +178,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -19,7 +19,7 @@ index 2dec9557c6f9e33b4cecb5c53ce3fa3ff2304c15..2e60f4d92b8d26eff7efe9c99480c336
private int tileTickPosition;
public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
@@ -771,8 +769,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -813,8 +811,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
});
// CraftBukkit end
this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings

36
patches/server/0028-Delete-Timings.patch
View File

@@ -730,7 +730,7 @@ index 24121a43aeb5e9bce013f30c92dddd15f99736c6..791cb04a13597eee4dbd28fabe2835ab
String content = context.getRange().get(context.getInput());
String[] args = org.apache.commons.lang3.StringUtils.split(content, ' '); // fix adjacent spaces (from console/plugins) causing empty array elements
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 69fbb3ff023db00fb82a1c0235c05afdacb47abd..9d7f21cbd3ecaf5a4da3dceb43b223ff086b245b 100644
index ea48befad95da428751dc4a0991f34e6dc7f6d04..e2dd123792983c3ad56702b9f5b807600afa2f2a 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -1,6 +1,5 @@
@@ -740,7 +740,7 @@ index 69fbb3ff023db00fb82a1c0235c05afdacb47abd..9d7f21cbd3ecaf5a4da3dceb43b223ff
import com.mojang.logging.LogUtils;
import io.papermc.paper.configuration.constraint.Constraints;
import io.papermc.paper.configuration.type.number.IntOr;
@@ -91,28 +90,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -91,29 +90,6 @@ public class GlobalConfiguration extends ConfigurationPart {
public boolean useDisplayNameInQuitMessage = false;
}
@@ -749,7 +749,7 @@ index 69fbb3ff023db00fb82a1c0235c05afdacb47abd..9d7f21cbd3ecaf5a4da3dceb43b223ff
-
- @Deprecated(forRemoval = true)
- public class Timings extends ConfigurationPart {
- public boolean enabled = true;
- public boolean enabled = false;
- public boolean verbose = true;
- public String url = "https://timings.aikar.co/";
- public boolean serverNamePrivacy = false;
@@ -766,10 +766,10 @@ index 69fbb3ff023db00fb82a1c0235c05afdacb47abd..9d7f21cbd3ecaf5a4da3dceb43b223ff
- MinecraftTimings.processConfig(this);
- }
- }
+ // DivineMC - Remove timings configuration section
-
public Proxies proxies;
public class Proxies extends ConfigurationPart {
diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
index 0e3bed7a75f8f4611f9f44a1f78fd70cc06eaa54..126ed4bd24d993b598c112c2dbfcb9d662038925 100644
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
@@ -826,7 +826,7 @@ index 01efbc507b3d58f13f78ee286f93df40cdc3f0cb..1f7f68aad97ee73763c042837f239bdc
} catch (Exception exception) {
if (exception instanceof ReportedException) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f2a099a3ff87789a2138cc1d6b7506d0f68bf628..2deb7dc0e5f8337ead5c850729b15c811942040a 100644
index b8628e9ab434feaae40c65f0fa016f6d57352f38..de06e4c2f846179be391f13edf6fb7a64718ff0c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,7 +3,6 @@ package net.minecraft.server;
@@ -846,7 +846,7 @@ index f2a099a3ff87789a2138cc1d6b7506d0f68bf628..2deb7dc0e5f8337ead5c850729b15c81
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system
private static MinecraftServer SERVER; // Paper
@@ -1048,7 +1045,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1039,7 +1036,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -854,7 +854,7 @@ index f2a099a3ff87789a2138cc1d6b7506d0f68bf628..2deb7dc0e5f8337ead5c850729b15c81
// Purpur start
if (upnp) {
if (dev.omega24.upnp4j.UPnP4J.close(this.getPort(), dev.omega24.upnp4j.util.Protocol.TCP)) {
@@ -1620,15 +1616,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1611,15 +1607,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -872,8 +872,8 @@ index f2a099a3ff87789a2138cc1d6b7506d0f68bf628..2deb7dc0e5f8337ead5c850729b15c81
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
@@ -1653,9 +1648,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
@@ -1656,9 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end - Incremental chunk and player saving
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
- //try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) { // Purpur
@@ -883,7 +883,7 @@ index f2a099a3ff87789a2138cc1d6b7506d0f68bf628..2deb7dc0e5f8337ead5c850729b15c81
// Paper end
// Paper start - Server Tick Events
long endTime = System.nanoTime();
@@ -1678,7 +1671,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1681,7 +1674,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.logTickMethodTime(i);
//this.profiler.pop(); // Purpur
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -939,7 +939,7 @@ index c0e19a44de942ed82cdcd5bb1688be2b4cbc0d23..49cd0d502a897b32c185e1437d8fb7eb
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Iterables;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 0f28eabc50366f35b3804b16db8cc4c38777de6e..60a0977aaa43025e22fb7014ceee3d7dd729a3e7 100644
index 665d45ba1129a72a1fb393d524bfa845b7a8189d..aed0e61f9249bb9c3cd966e48322830fe2e646e8 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@
@@ -950,7 +950,7 @@ index 0f28eabc50366f35b3804b16db8cc4c38777de6e..60a0977aaa43025e22fb7014ceee3d7d
import com.google.common.collect.Lists;
import com.mojang.datafixers.DataFixer;
import com.mojang.datafixers.util.Pair;
@@ -1291,9 +1290,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1311,9 +1310,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
currentlyTickingEntity.lazySet(entity);
}
// Paper end - log detailed entity tick information
@@ -960,7 +960,7 @@ index 0f28eabc50366f35b3804b16db8cc4c38777de6e..60a0977aaa43025e22fb7014ceee3d7d
/*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
entity.tickCount++;
timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings
@@ -1316,7 +1313,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1336,7 +1333,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
});*/ // Purpur
//gameprofilerfiller.incrementCounter("tickNonPassenger"); // Purpur
if (isActive) { // Paper - EAR 2
@@ -969,7 +969,7 @@ index 0f28eabc50366f35b3804b16db8cc4c38777de6e..60a0977aaa43025e22fb7014ceee3d7d
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 74c6f43a26ca1b36e7121dddd9f065b2a9254493..95dcf7743e69559bc99487f6b57986bbbb2512c6 100644
index b14e56c6b117b28c604259ad179d10e79f7c4cdd..65a4cb29bb99058e144ee7958970e41f7842c28a 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,5 @@
@@ -1061,7 +1061,7 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1
this.scanRate = senseInterval;
this.timeToTick = (long)RANDOM.nextInt(senseInterval);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 2e60f4d92b8d26eff7efe9c99480c33649bec789..16cd246d7d24a211c09b13aedf2286cb3fdf3c49 100644
index 24511ef4a618348b7a6fceefc5e6cdb359bb6655..6241647a1d85073942c821f66a4812bef15543f2 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1072,7 +1072,7 @@ index 2e60f4d92b8d26eff7efe9c99480c33649bec789..16cd246d7d24a211c09b13aedf2286cb
public static BlockPos lastPhysicsProblem; // Spigot
private int tileTickPosition;
public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
@@ -768,7 +767,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -810,7 +809,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
});
// CraftBukkit end
@@ -1080,7 +1080,7 @@ index 2e60f4d92b8d26eff7efe9c99480c33649bec789..16cd246d7d24a211c09b13aedf2286cb
this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
// Paper start - optimise collisions
this.minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(this);
@@ -1411,9 +1409,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1453,9 +1451,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
}
this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075

4
patches/server/0050-No-chat-sign.patch → patches/server/0049-No-chat-sign.patch
View File

@@ -147,10 +147,10 @@ index fac2fb82c381d245f77b7288c34920660ac2c3af..b3ca62843b17c536840cb4edb700f9c2
if (packet == null || this.processedDisconnect) { // Spigot
return;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 95dcf7743e69559bc99487f6b57986bbbb2512c6..d4541b7b3123c4be2af06152bc527ce35eecef68 100644
index 65a4cb29bb99058e144ee7958970e41f7842c28a..278018c0f0a19d76337ab073340e91e85c4eacb5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1437,7 +1437,7 @@ public abstract class PlayerList {
@@ -1450,7 +1450,7 @@ public abstract class PlayerList {
}
public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public

0
patches/server/0051-Remove-vanilla-username-check.patch → patches/server/0050-Remove-vanilla-username-check.patch
View File

0
patches/server/0052-Akarin-Save-Json-list-asynchronously.patch → patches/server/0051-Akarin-Save-Json-list-asynchronously.patch
View File

0
patches/server/0053-Fix-MC-223153.patch → patches/server/0052-Fix-MC-223153.patch
View File

4
patches/server/0054-Fix-MC-119417.patch → patches/server/0053-Fix-MC-119417.patch
View File

@@ -7,10 +7,10 @@ Original bug on Mojira: https://bugs.mojang.com/browse/MC-119417
Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0082-Fix-MC-119417.patch
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c8ccf4b847ba3803b48c26ad6e6acecb327c76c5..3751cd99e408fe02b0c8d0a065a0129e1872a9c2 100644
index 4b5d0ccd37534bd987d997338033e363a7a56b76..ee616d091d4755c6959e3aee19ecd08fa148a799 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2254,6 +2254,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -2255,6 +2255,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
if (gameMode == GameType.SPECTATOR) {
this.removeEntitiesOnShoulder();

0
patches/server/0055-Fix-MC-200418.patch → patches/server/0054-Fix-MC-200418.patch
View File

0
patches/server/0056-Option-to-disable-moved-wrongly-threshold.patch → patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch
View File