diff --git a/README.md b/README.md index adb2da2..2ab336e 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,6 @@ Read our [documentation](https://divinemc.bx-team.space/docs/dev/contributing) t ### Compiling Use the command `./gradlew build` to build the API and server. Compiled JARs will be placed under `DivineMC-API/build/libs` and `DivineMC-Server/build/libs`. **These JARs are not used to start a server**. -To compile a server-ready paperclip jar, run `./gradlew createReobfPaperclipJar`. The compiled paperclip jar will be in `build/libs/` in the main root. +To compile a server-ready paperclip jar, run `./gradlew createMojmapPaperclipJar`. The compiled paperclip jar will be in `build/libs/` in the main root. ###### We don't steal logo from YatopiaMC! [List of all forks](https://gist.github.com/NONPLAYT/48742353af8ae36bcef5d1c36de9730a) diff --git a/docs/docs/admin/getting-started.md b/docs/docs/admin/getting-started.md index 7e22cc6..cc707ef 100644 --- a/docs/docs/admin/getting-started.md +++ b/docs/docs/admin/getting-started.md @@ -30,7 +30,7 @@ DivineMC is a drop in replacement for both CraftBukkit and Spigot, you don't nee DivineMC provides runnable server jars directly from [releases tab](https://github.com/DivineMC/DivineMC/releases/latest) on GitHub. -Click on the _DivineMC-paperclip-VERSION-reobf.jar_ to download a runnable paperclip jar. +Click on the _DivineMC-paperclip-VERSION-mojmap.jar_ to download a runnable paperclip jar. ## Running The Server diff --git a/patches/server/0021-lithium-precompute-shape-arrays.patch b/patches/removed/1.21/server/0021-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0021-lithium-precompute-shape-arrays.patch rename to patches/removed/1.21/server/0021-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0022-vmp-spawn_density_cap.patch b/patches/server/0021-vmp-spawn_density_cap.patch similarity index 100% rename from patches/server/0022-vmp-spawn_density_cap.patch rename to patches/server/0021-vmp-spawn_density_cap.patch diff --git a/patches/server/0023-lithium-cached_hashcode.patch b/patches/server/0022-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0023-lithium-cached_hashcode.patch rename to patches/server/0022-lithium-cached_hashcode.patch diff --git a/patches/server/0024-lithium-math.sine_lut.patch b/patches/server/0023-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0024-lithium-math.sine_lut.patch rename to patches/server/0023-lithium-math.sine_lut.patch diff --git a/patches/server/0025-Don-t-save-Fireworks.patch b/patches/server/0024-Don-t-save-Fireworks.patch similarity index 100% rename from patches/server/0025-Don-t-save-Fireworks.patch rename to patches/server/0024-Don-t-save-Fireworks.patch diff --git a/patches/server/0026-Remove-Spigot-tick-limiter.patch b/patches/server/0025-Remove-Spigot-tick-limiter.patch similarity index 97% rename from patches/server/0026-Remove-Spigot-tick-limiter.patch rename to patches/server/0025-Remove-Spigot-tick-limiter.patch index 872d818..e2fa86d 100644 --- a/patches/server/0026-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0025-Remove-Spigot-tick-limiter.patch @@ -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 721fe9c6c3a6700d5d91d4078bfd79dd01ef32f3..975cd21cfe3199a3cf29439443c85d3f4ac5140e 100644 +index 7438db40910f0d332fd82a67ad8396674e291dfa..20d9b85fdf6bcf570c97c9bbf9787918d81cc9be 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -177,8 +177,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0027-Make-entity-goals-public.patch b/patches/server/0026-Make-entity-goals-public.patch similarity index 100% rename from patches/server/0027-Make-entity-goals-public.patch rename to patches/server/0026-Make-entity-goals-public.patch diff --git a/patches/server/0028-Optimize-Paper-Event-Manager.patch b/patches/server/0027-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/server/0028-Optimize-Paper-Event-Manager.patch rename to patches/server/0027-Optimize-Paper-Event-Manager.patch diff --git a/patches/server/0029-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch similarity index 100% rename from patches/server/0029-Delete-Timings.patch rename to patches/server/0028-Delete-Timings.patch diff --git a/patches/server/0030-Fix-sprint-glitch.patch b/patches/server/0029-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0030-Fix-sprint-glitch.patch rename to patches/server/0029-Fix-sprint-glitch.patch diff --git a/patches/server/0031-Boat-Settings.patch b/patches/server/0030-Boat-Settings.patch similarity index 100% rename from patches/server/0031-Boat-Settings.patch rename to patches/server/0030-Boat-Settings.patch diff --git a/patches/server/0032-Despawn-shulker-bullets-on-owner-death.patch b/patches/server/0031-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0032-Despawn-shulker-bullets-on-owner-death.patch rename to patches/server/0031-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0033-Reduce-sensor-work.patch b/patches/server/0032-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0033-Reduce-sensor-work.patch rename to patches/server/0032-Reduce-sensor-work.patch diff --git a/patches/server/0034-Snowball-and-Egg-knockback.patch b/patches/server/0033-Snowball-and-Egg-knockback.patch similarity index 100% rename from patches/server/0034-Snowball-and-Egg-knockback.patch rename to patches/server/0033-Snowball-and-Egg-knockback.patch diff --git a/patches/server/0035-Make-minecart-hopper-work-without-players.patch b/patches/server/0034-Make-minecart-hopper-work-without-players.patch similarity index 100% rename from patches/server/0035-Make-minecart-hopper-work-without-players.patch rename to patches/server/0034-Make-minecart-hopper-work-without-players.patch diff --git a/patches/server/0036-Fix-possible-NPE-during-creating-GUI-graph.patch b/patches/server/0035-Fix-possible-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0036-Fix-possible-NPE-during-creating-GUI-graph.patch rename to patches/server/0035-Fix-possible-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0037-Optimize-CraftServer.getWorld-UUID.patch b/patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch similarity index 100% rename from patches/server/0037-Optimize-CraftServer.getWorld-UUID.patch rename to patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch diff --git a/patches/server/0038-Block-Log4Shell-exploit.patch b/patches/server/0037-Block-Log4Shell-exploit.patch similarity index 93% rename from patches/server/0038-Block-Log4Shell-exploit.patch rename to patches/server/0037-Block-Log4Shell-exploit.patch index 943276f..7453af8 100644 --- a/patches/server/0038-Block-Log4Shell-exploit.patch +++ b/patches/server/0037-Block-Log4Shell-exploit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Block Log4Shell exploit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1c41ad915ad5f1ef63fea96fefe53fd037174ac3..cb1b861df277abdb0985f978f4e2d5419d279d2a 100644 +index 29d69101326017f68b10329f51dd6b93c1bf1d60..5365ce5da2b78be0001e3dba39feb969801603e0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2353,6 +2353,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -33,7 +33,7 @@ index 1c41ad915ad5f1ef63fea96fefe53fd037174ac3..cb1b861df277abdb0985f978f4e2d541 for (int i = 0; i < message.length(); ++i) { if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 61ae7f9d871bb2747c928e91eb07496b862a4975..20e77d90bbe97e2c711a9f4ef6d47906595d99d7 100644 +index 41863584c3a85068b807a5aeb93c3da70f133b47..f99dadddead3a820cc747ecbace8c1119a263061 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -751,6 +751,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0039-Option-to-disable-non-editable-sign-warning.patch b/patches/server/0038-Option-to-disable-non-editable-sign-warning.patch similarity index 100% rename from patches/server/0039-Option-to-disable-non-editable-sign-warning.patch rename to patches/server/0038-Option-to-disable-non-editable-sign-warning.patch diff --git a/patches/server/0040-Suppress-errors-from-dirty-attributes.patch b/patches/server/0039-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/server/0040-Suppress-errors-from-dirty-attributes.patch rename to patches/server/0039-Suppress-errors-from-dirty-attributes.patch diff --git a/patches/server/0041-Carpet-Fixes-RecipeManager-Optimize.patch b/patches/server/0040-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from patches/server/0041-Carpet-Fixes-RecipeManager-Optimize.patch rename to patches/server/0040-Carpet-Fixes-RecipeManager-Optimize.patch diff --git a/patches/server/0042-Carpet-Fixes-getBiome-Optimize.patch b/patches/server/0041-Carpet-Fixes-getBiome-Optimize.patch similarity index 100% rename from patches/server/0042-Carpet-Fixes-getBiome-Optimize.patch rename to patches/server/0041-Carpet-Fixes-getBiome-Optimize.patch diff --git a/patches/server/0043-C2ME-reduce_allocs.patch b/patches/server/0042-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0043-C2ME-reduce_allocs.patch rename to patches/server/0042-C2ME-reduce_allocs.patch diff --git a/patches/server/0044-Carpet-AMS-Addition-Optimized-dragon-respawn.patch b/patches/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch similarity index 100% rename from patches/server/0044-Carpet-AMS-Addition-Optimized-dragon-respawn.patch rename to patches/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch diff --git a/patches/server/0045-C2ME-opts-math.patch b/patches/server/0044-C2ME-opts-math.patch similarity index 100% rename from patches/server/0045-C2ME-opts-math.patch rename to patches/server/0044-C2ME-opts-math.patch diff --git a/patches/server/0046-Parchment-Make-FixLight-use-action-bar.patch b/patches/server/0045-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from patches/server/0046-Parchment-Make-FixLight-use-action-bar.patch rename to patches/server/0045-Parchment-Make-FixLight-use-action-bar.patch diff --git a/patches/server/0047-Async-Pathfinding.patch b/patches/server/0046-Async-Pathfinding.patch similarity index 100% rename from patches/server/0047-Async-Pathfinding.patch rename to patches/server/0046-Async-Pathfinding.patch diff --git a/patches/server/0048-Improve-biome-temperature-cache.patch b/patches/server/0047-Improve-biome-temperature-cache.patch similarity index 100% rename from patches/server/0048-Improve-biome-temperature-cache.patch rename to patches/server/0047-Improve-biome-temperature-cache.patch diff --git a/patches/server/0049-Carpet-Fixes-Sheep-Optimization.patch b/patches/server/0048-Carpet-Fixes-Sheep-Optimization.patch similarity index 100% rename from patches/server/0049-Carpet-Fixes-Sheep-Optimization.patch rename to patches/server/0048-Carpet-Fixes-Sheep-Optimization.patch diff --git a/patches/server/0050-No-chat-sign.patch b/patches/server/0049-No-chat-sign.patch similarity index 100% rename from patches/server/0050-No-chat-sign.patch rename to patches/server/0049-No-chat-sign.patch