diff --git a/build.gradle.kts b/build.gradle.kts index a0547b7..ac92ad8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -86,4 +86,24 @@ paperweight { outputDir = layout.projectDirectory.dir("paper-api-generator/generated") } } -} \ No newline at end of file +} + +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("devBundle") { + artifact(tasks.generateDevelopmentBundle) { + artifactId = "dev-bundle" + } + } + } +} diff --git a/gradle.properties b/gradle.properties index 75562c5..20f030a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/patches/server/0049-Improve-biome-temperature-cache.patch b/patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch similarity index 100% rename from patches/server/0049-Improve-biome-temperature-cache.patch rename to patches/removed/1.21/server/0049-Improve-biome-temperature-cache.patch diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 467a0f2..a57126b 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -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 explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque 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 diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch index 4a390c2..678eb23 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0028-Delete-Timings.patch @@ -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 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 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 diff --git a/patches/server/0050-No-chat-sign.patch b/patches/server/0049-No-chat-sign.patch similarity index 98% rename from patches/server/0050-No-chat-sign.patch rename to patches/server/0049-No-chat-sign.patch index be9ba91..25d8b51 100644 --- a/patches/server/0050-No-chat-sign.patch +++ b/patches/server/0049-No-chat-sign.patch @@ -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 diff --git a/patches/server/0051-Remove-vanilla-username-check.patch b/patches/server/0050-Remove-vanilla-username-check.patch similarity index 100% rename from patches/server/0051-Remove-vanilla-username-check.patch rename to patches/server/0050-Remove-vanilla-username-check.patch diff --git a/patches/server/0052-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0051-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0052-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0051-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0053-Fix-MC-223153.patch b/patches/server/0052-Fix-MC-223153.patch similarity index 100% rename from patches/server/0053-Fix-MC-223153.patch rename to patches/server/0052-Fix-MC-223153.patch diff --git a/patches/server/0054-Fix-MC-119417.patch b/patches/server/0053-Fix-MC-119417.patch similarity index 87% rename from patches/server/0054-Fix-MC-119417.patch rename to patches/server/0053-Fix-MC-119417.patch index c11900d..3cd66a0 100644 --- a/patches/server/0054-Fix-MC-119417.patch +++ b/patches/server/0053-Fix-MC-119417.patch @@ -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(); diff --git a/patches/server/0055-Fix-MC-200418.patch b/patches/server/0054-Fix-MC-200418.patch similarity index 100% rename from patches/server/0055-Fix-MC-200418.patch rename to patches/server/0054-Fix-MC-200418.patch diff --git a/patches/server/0056-Option-to-disable-moved-wrongly-threshold.patch b/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch similarity index 100% rename from patches/server/0056-Option-to-disable-moved-wrongly-threshold.patch rename to patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch