diff --git a/build.gradle.kts b/build.gradle.kts index 007cfd4..a7c12fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG plugins { java `maven-publish` - id("io.papermc.paperweight.patcher") version "1.7.5" + id("io.papermc.paperweight.patcher") version "1.7.6" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" diff --git a/gradle.properties b/gradle.properties index 15127d2..0b879d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = space.bxteam.divinemc -mcVersion = 1.21.3 -version = 1.21.3-R0.1-SNAPSHOT -purpurRef = 0493ac329ff82fd31412d34bd8f85ab2aababb24 +mcVersion = 1.21.4 +version = 1.21.4-R0.1-SNAPSHOT +purpurRef = 0cff436bd325bb93742f79faa94dcfd73a33f092 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0007-Bump-Dependencies.patch b/patches/api/0007-Bump-Dependencies.patch index 772b154..ce93a6b 100644 --- a/patches/api/0007-Bump-Dependencies.patch +++ b/patches/api/0007-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index b0b9d9d37c86fd409353c8d18551f1ced7fe4272..ed0f69335089c459061241afc8cc93ba82212013 100644 +index bf3e029b5760ce5ee70b9b88bfe0cb079c8100b1..fac9ff73500fb6bf8cac7d17403d407430cecbb6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,11 +9,17 @@ java { @@ -28,26 +28,6 @@ index b0b9d9d37c86fd409353c8d18551f1ced7fe4272..ed0f69335089c459061241afc8cc93ba val apiAndDocs: Configuration by configurations.creating { attributes { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) -@@ -41,8 +47,8 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider { - dependencies { - api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api - // api dependencies are listed transitively to API consumers -- api("com.google.guava:guava:32.1.2-jre") -- api("com.google.code.gson:gson:2.10.1") -+ api("com.google.guava:guava:33.2.1-jre") // DivineMC - Bump Dependencies -+ api("com.google.code.gson:gson:2.11.0") // DivineMC - Bump Dependencies - // Paper start - adventure - api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") { - exclude("com.google.guava", "guava") -@@ -54,7 +60,7 @@ dependencies { - api("com.googlecode.json-simple:json-simple:1.1.1") { - isTransitive = false // includes junit - } -- api("it.unimi.dsi:fastutil:8.5.6") -+ api("it.unimi.dsi:fastutil:8.5.13") // DivineMC - Bump Dependencies - apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) - apiAndDocs("net.kyori:adventure-api") - apiAndDocs("net.kyori:adventure-text-minimessage") @@ -70,23 +76,23 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.7.1") // Paper end @@ -78,19 +58,13 @@ index b0b9d9d37c86fd409353c8d18551f1ced7fe4272..ed0f69335089c459061241afc8cc93ba testImplementation("org.hamcrest:hamcrest:2.2") testImplementation("org.mockito:mockito-core:5.14.1") testImplementation("org.ow2.asm:asm-tree:9.7.1") -@@ -175,12 +181,12 @@ tasks.withType { - options.use() - options.isDocFilesSubDirs = true - options.links( -- "https://guava.dev/releases/32.1.2-jre/api/docs/", -+ "https://guava.dev/releases/33.1.0-jre/api/docs/", // DivineMC - Bump Dependencies - "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", +@@ -180,7 +186,7 @@ tasks.withType { "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat // Paper start - add missing javadoc links -- "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", +- "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html", + "https://javadoc.io/doc/org.joml/joml/latest/index.html", // DivineMC - Bump Dependencies - "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", + "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", "https://jspecify.dev/docs/api/", // Paper end @@ -193,9 +199,9 @@ tasks.withType { diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 9774019..8cb4d7f 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 77602e4445b1b45a17e5552ac6a769e0ed46ebc7..3d0d3a3eb090041b461d65f66e47e39fab27aa82 100644 +index 74d7aaae57e0e9ea9e31c4b2189ba50a0ac83bea..445ccd4ca89e6d5a536897e979366a4c2bde7145 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider { @@ -14,10 +14,10 @@ index 77602e4445b1b45a17e5552ac6a769e0ed46ebc7..3d0d3a3eb090041b461d65f66e47e39f dependencies { - implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur + implementation(project(":divinemc-api")) // DivineMC + implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency // Paper start 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 -@@ -118,14 +118,14 @@ tasks.jar { +@@ -119,14 +119,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -37,7 +37,7 @@ index 77602e4445b1b45a17e5552ac6a769e0ed46ebc7..3d0d3a3eb090041b461d65f66e47e39f "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -270,3 +270,12 @@ tasks.registerRunTask("runReobfPaperclip") { +@@ -271,3 +271,12 @@ tasks.registerRunTask("runReobfPaperclip") { classpath(rootProject.tasks.named("createReobfPaperclipJar").flatMap { it.outputZip }) mainClass.set(null as String?) } diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index ff6f6b4..7d34722 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -34,10 +34,10 @@ index 7a442fb4cf78bcb1268359ee41a6de138edb76b6..924a1b7f444ab78512bb7773faf513a2 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 34e8eb828be517d9ee3973597c74c5cac3d75c99..833983670727fc2844386ea2381358433f646c50 100644 +index 1a808fc381c0c3ea1fc49bbffebddf2c550e817a..346594614b44cc42a3d6a02bb9684812335a41f3 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -85,6 +85,7 @@ import net.minecraft.world.phys.AABB; +@@ -86,6 +86,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.scores.Scoreboard; @@ -45,7 +45,7 @@ index 34e8eb828be517d9ee3973597c74c5cac3d75c99..833983670727fc2844386ea238135843 // CraftBukkit start import java.util.HashMap; -@@ -175,6 +176,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -176,6 +177,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur @@ -53,7 +53,7 @@ index 34e8eb828be517d9ee3973597c74c5cac3d75c99..833983670727fc2844386ea238135843 public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; private org.spigotmc.TickLimiter tileLimiter; -@@ -887,6 +889,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -888,6 +890,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 @@ -113,7 +113,7 @@ index 81922bf93f8a96e6cf05944ca98a82cc5945a6c6..825066dbd54ef753cdc03cbbe9deb654 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 430407b0cf06ba337c59cd576c7e40a8e5fe8229..67723070296f861c477ab484ad7f39db9eba3074 100644 +index c471a8c81ba067abcb22956ad1a30b5a9b64fc87..87b3dfc6faea57093d4a5f6c61d88d9fc780f04b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -190,6 +190,14 @@ public class Main { diff --git a/patches/server/0007-Fix-MC-31819.patch b/patches/server/0007-Fix-MC-31819.patch index df93e40..7539969 100644 --- a/patches/server/0007-Fix-MC-31819.patch +++ b/patches/server/0007-Fix-MC-31819.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index c1d068fa99ec0fd5685bbb627a775e4d1587feab..7aebbadf3a6b1321207d25c016ff9b52680680a1 100644 +index d19b1e127a1018a798eed181d8060a781b589f90..a861e84b959e6f07a51c72b25ea4df0b5df7fd34 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1893,6 +1893,11 @@ public abstract class Player extends LivingEntity { +@@ -1896,6 +1896,11 @@ public abstract class Player extends LivingEntity { } public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) { diff --git a/patches/server/0008-Fix-MC-172801.patch b/patches/server/0008-Fix-MC-172801.patch index f47423c..9ab3d67 100644 --- a/patches/server/0008-Fix-MC-172801.patch +++ b/patches/server/0008-Fix-MC-172801.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801 Original post on Mojira: https://bugs.mojang.com/browse/MC-172801 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f4604e543a980d6aeb485252da5a4e755aa12bfa..dfb2c5812e3d2a2fa58e80240952c07b427c6abd 100644 +index 33fbe0f7a356dd847e546feffb468b2803c6744b..84ac9ee926a9a4b4d2dcd107cb089162637a2576 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3339,7 +3339,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3350,7 +3350,13 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected float getFlyingSpeed() { diff --git a/patches/server/0009-Fix-MC-2025.patch b/patches/server/0009-Fix-MC-2025.patch index 2bbe290..fcb595c 100644 --- a/patches/server/0009-Fix-MC-2025.patch +++ b/patches/server/0009-Fix-MC-2025.patch @@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025 Fix taken from Reddit: https://redd.it/8pgd4q diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aa171a1afb9800e6ec84f6b4f1b28e44177752f7..306fd7d38d359715637aa52f1ba261f5a1d94e07 100644 +index da7ffdf85907c92fe6c4c6a5ebe571ef4666fcb8..7fba17c4802159c50a57f23820a153dcd85a2470 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2722,6 +2722,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2745,6 +2745,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire); } // Purpur end @@ -28,7 +28,7 @@ index aa171a1afb9800e6ec84f6b4f1b28e44177752f7..306fd7d38d359715637aa52f1ba261f5 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2800,6 +2811,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2825,6 +2836,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.reapplyPosition(); } diff --git a/patches/server/0012-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0012-vmp-skip-entity-move-if-movement-is-zero.patch index 6ae9c62..02c28ad 100644 --- a/patches/server/0012-vmp-skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0012-vmp-skip-entity-move-if-movement-is-zero.patch @@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 306fd7d38d359715637aa52f1ba261f5a1d94e07..6e9f3208b9246dc2dec30fb0ec70d0bf2955a0be 100644 +index 7fba17c4802159c50a57f23820a153dcd85a2470..5c3c38c6c5d1ac06848f1709a195c28fb7a3d2a2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -282,6 +282,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -18,7 +18,7 @@ index 306fd7d38d359715637aa52f1ba261f5a1d94e07..6e9f3208b9246dc2dec30fb0ec70d0bf public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1189,6 +1190,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1197,6 +1198,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper end - detailed watchdog information public void move(MoverType type, Vec3 movement) { @@ -31,7 +31,7 @@ index 306fd7d38d359715637aa52f1ba261f5a1d94e07..6e9f3208b9246dc2dec30fb0ec70d0bf final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4468,6 +4475,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4502,6 +4509,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB boundingBox) { diff --git a/patches/server/0017-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/server/0017-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch index 8cc8bb4..a86fd2c 100644 --- a/patches/server/0017-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch +++ b/patches/server/0017-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch @@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index dfb2c5812e3d2a2fa58e80240952c07b427c6abd..989b73037159fa0b2b8431c4092f069a949b2971 100644 +index 84ac9ee926a9a4b4d2dcd107cb089162637a2576..e3f3e23540bc2b8b650b680839a4f06f95e9b7e6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2821,6 +2821,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2832,6 +2832,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void updateSwingTime() { diff --git a/patches/server/0021-Remove-Spigot-tick-limiter.patch b/patches/server/0021-Remove-Spigot-tick-limiter.patch index 9aa1f2c..f0f2016 100644 --- a/patches/server/0021-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0021-Remove-Spigot-tick-limiter.patch @@ -7,10 +7,10 @@ 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 9fd40654eeacf9c5a8fe136e2b58b8a86768588b..9771aee811ddfe1078ca4111f46c3010a8737604 100644 +index 346594614b44cc42a3d6a02bb9684812335a41f3..2078124d0bcb0d17a15087e4c42aecd73b28061c 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 +@@ -179,8 +179,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur public final DivineWorldConfig divinemcConfig; // DivineMC public static BlockPos lastPhysicsProblem; // Spigot @@ -19,7 +19,7 @@ index 9fd40654eeacf9c5a8fe136e2b58b8a86768588b..9771aee811ddfe1078ca4111f46c3010 private int tileTickPosition; public final Map 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 -@@ -966,8 +964,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -967,8 +965,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {} }); // CraftBukkit end diff --git a/patches/server/0022-Make-entity-goals-public.patch b/patches/server/0022-Make-entity-goals-public.patch index 628c6ae..552b20f 100644 --- a/patches/server/0022-Make-entity-goals-public.patch +++ b/patches/server/0022-Make-entity-goals-public.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Make entity goals public diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96efe65ef4 100644 +index 884527c8326c6df3656a4d3a2f5f2847f95b0f63..dd263fcbc63b205e6d837c05f968cf821c36c0fe 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java -@@ -773,7 +773,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { - this.hivePos = pos; +@@ -810,7 +810,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { + return state.is(BlockTags.BEE_ATTRACTIVE) ? ((Boolean) state.getValueOrElse(BlockStateProperties.WATERLOGGED, false) ? false : (state.is(Blocks.SUNFLOWER) ? state.getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.UPPER : true)) : false; } - private class BeeLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur @@ -17,7 +17,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BeeLookControl(final Mob entity) { super(entity); -@@ -809,7 +809,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -846,7 +846,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -26,7 +26,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BeeEnterHiveGoal() { super(); -@@ -914,7 +914,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -951,7 +951,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -34,8 +34,8 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 + public class BeePollinateGoal extends Bee.BaseBeeGoal { // DivineMC - private -> public private static final int MIN_POLLINATION_TICKS = 400; - private final Predicate VALID_POLLINATION_BLOCKS = (iblockdata) -> { -@@ -1096,7 +1096,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { + private static final double ARRIVAL_THRESHOLD = 0.1D; +@@ -1130,7 +1130,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -44,7 +44,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BeeLocateHiveGoal() { super(); -@@ -1325,7 +1325,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1359,7 +1359,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -53,7 +53,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 static final int GROW_CHANCE = 30; -@@ -1394,7 +1394,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1428,7 +1428,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -62,7 +62,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BeeWanderGoal() { this.setFlags(EnumSet.of(Goal.Flag.MOVE)); -@@ -1445,7 +1445,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1479,7 +1479,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -71,7 +71,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BeeHurtByOtherGoal(final Bee entitybee) { super(entitybee); -@@ -1465,7 +1465,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1499,7 +1499,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -80,7 +80,7 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BeeBecomeAngryTargetGoal(Bee bee) { // Objects.requireNonNull(entitybee); // CraftBukkit - decompile error -@@ -1496,7 +1496,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1530,7 +1530,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } @@ -90,10 +90,10 @@ index dc8df0912c1d18176e18a8f4dc43c4f60f81b659..a81d8cee4f8a6b7b0d9a6a64fe8f1b96 BaseBeeGoal() {} diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java -index 4aad4fdc80070f4000e929fff126714fc67050b0..85292bb708fd71237b921893257e7c1de8294aff 100644 +index a418ded306908ee9cb9e375104354a6e031305c9..e507ba827be5924763740f57e9200a711b43f749 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java -@@ -575,7 +575,7 @@ public class Cat extends TamableAnimal implements VariantHolder public static - - private final Raider mob; - private final float hostileRadiusSqr; diff --git a/patches/server/0031-Block-Log4Shell-exploit.patch b/patches/server/0031-Block-Log4Shell-exploit.patch index 7ce9811..8136bae 100644 --- a/patches/server/0031-Block-Log4Shell-exploit.patch +++ b/patches/server/0031-Block-Log4Shell-exploit.patch @@ -5,10 +5,10 @@ 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 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1b9eb4394 100644 +index 9947271607c2b28b6175334c22f08bf49f30fe4c..621202a01415dec318df62b4af1d2ef00c6b36b0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2455,6 +2455,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2514,6 +2514,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit @@ -16,7 +16,7 @@ index 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1 if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) { this.disconnectAsync((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper // Paper - add proper async disconnect } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales -@@ -2486,6 +2487,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2545,6 +2546,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } } @@ -33,7 +33,7 @@ index 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1 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 63065a22ff359c142bab23fccacfd5ebd86f81a5..ab257415665d80a1fc7d877831fc74ad50a6790a 100644 +index 22abd7c837fe35423bd0c9e94107d47156d09266..ee5b34c7d7ed68f87e2f5c1c786031043f462636 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -758,6 +758,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0039-Petal-Reduce-work-done-by-game-event-system.patch b/patches/server/0039-Petal-Reduce-work-done-by-game-event-system.patch index 47db126..007089c 100644 --- a/patches/server/0039-Petal-Reduce-work-done-by-game-event-system.patch +++ b/patches/server/0039-Petal-Reduce-work-done-by-game-event-system.patch @@ -34,10 +34,10 @@ index 4729befa12732a9fd65cce243b33b3b479026c41..4f63d2d9e37be27724eddea2c61f681c LivingEntity entityliving1 = deadEntity.getLastHurtByMob(); diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 5c4843f6cfd13790a44fc0f928f1fbcef8a648ce..bc5d3d1fd50ed1d888bdfa7e086995be566104d7 100644 +index 090e196cf391dced8adcb8106026d67b2aeac6b0..b7f14229bec6efdd72a3d246097d95ae2f99529e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -@@ -83,7 +83,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -84,7 +84,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p private Supplier fullStatus; @Nullable private LevelChunk.PostLoadProcessor postLoad; @@ -57,7 +57,7 @@ index 5c4843f6cfd13790a44fc0f928f1fbcef8a648ce..bc5d3d1fd50ed1d888bdfa7e086995be private final LevelChunkTicks blockTicks; private final LevelChunkTicks fluidTicks; private LevelChunk.UnsavedListener unsavedListener; -@@ -110,7 +121,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -111,7 +122,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p this.unsavedListener = (chunkcoordintpair1) -> { }; this.level = (ServerLevel) world; // CraftBukkit - type @@ -66,7 +66,7 @@ index 5c4843f6cfd13790a44fc0f928f1fbcef8a648ce..bc5d3d1fd50ed1d888bdfa7e086995be Heightmap.Types[] aheightmap_type = Heightmap.Types.values(); int j = aheightmap_type.length; -@@ -268,9 +279,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -273,9 +284,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p Level world = this.level; if (world instanceof ServerLevel worldserver) { @@ -93,7 +93,7 @@ index 5c4843f6cfd13790a44fc0f928f1fbcef8a648ce..bc5d3d1fd50ed1d888bdfa7e086995be } else { return super.getListenerRegistry(ySectionCoord); } -@@ -666,7 +691,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -671,7 +696,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p } private void removeGameEventListenerRegistry(int ySectionCoord) { diff --git a/patches/server/0041-No-chat-sign.patch b/patches/server/0040-No-chat-sign.patch similarity index 96% rename from patches/server/0041-No-chat-sign.patch rename to patches/server/0040-No-chat-sign.patch index 999827c..cdd3dd2 100644 --- a/patches/server/0041-No-chat-sign.patch +++ b/patches/server/0040-No-chat-sign.patch @@ -147,7 +147,7 @@ index 7d276c191b391bca24948ddb36b8b7d0f1f03b03..c1d3a811ca17f303b6a35a4c044cacf1 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 16999fa20c3621e016d1b0fadfb76f2fe03a2a69..05b056f803d2c96fb6bf0f00baa03d2e0c4d4511 100644 +index e1d195ab8b005edd7fcded810ddf903b47c000a1..a46e0d2c4244b7d2c4cc15f76856e5a5be2ead20 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1426,7 +1426,7 @@ public abstract class PlayerList { @@ -160,12 +160,12 @@ index 16999fa20c3621e016d1b0fadfb76f2fe03a2a69..05b056f803d2c96fb6bf0f00baa03d2e // CraftBukkit start diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index bc6642e1a6dd8254efe65cbac1acdcd4462e430b..99532c3a254afa66ee4c6c106b6754471fcbc9e8 100644 +index aaf3afd0fe1f13ed7375d272e2690e9db0410417..261a55a4a5171f4ceb57fda8532bc1f795dc30ed 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -@@ -170,4 +170,9 @@ public class DivineConfig { +@@ -168,4 +168,9 @@ public class DivineConfig { + optimizedDragonRespawn = getBoolean("settings.optimizations.optimized-dragon-respawn", optimizedDragonRespawn); optimizeNoiseGeneration = getBoolean("settings.optimizations.optimize-noise-generation", optimizeNoiseGeneration); - sheepOptimization = getBoolean("settings.optimizations.sheep-optimization", sheepOptimization); } + + public static boolean noChatSign = true; diff --git a/patches/server/0042-Remove-vanilla-username-check.patch b/patches/server/0041-Remove-vanilla-username-check.patch similarity index 97% rename from patches/server/0042-Remove-vanilla-username-check.patch rename to patches/server/0041-Remove-vanilla-username-check.patch index 82b1565..615c2c4 100644 --- a/patches/server/0042-Remove-vanilla-username-check.patch +++ b/patches/server/0041-Remove-vanilla-username-check.patch @@ -32,7 +32,7 @@ index 16069b9cbf6c7679c28a2e9a54e77d23cd10e541..1b33f08b1d4730b28f61435488a1e1c0 && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) { Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username", new Object[0]); diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 99532c3a254afa66ee4c6c106b6754471fcbc9e8..84ee2dbd085b02cf20f14022e2f1997f8d9580a8 100644 +index 261a55a4a5171f4ceb57fda8532bc1f795dc30ed..028589d94e04828686ff09e6a6b1a8fc71f054a0 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java @@ -156,8 +156,10 @@ public class DivineConfig { diff --git a/patches/server/0043-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0042-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0043-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0042-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0044-Fix-MC-223153.patch b/patches/server/0043-Fix-MC-223153.patch similarity index 87% rename from patches/server/0044-Fix-MC-223153.patch rename to patches/server/0043-Fix-MC-223153.patch index 8ffde55..e6aa670 100644 --- a/patches/server/0044-Fix-MC-223153.patch +++ b/patches/server/0043-Fix-MC-223153.patch @@ -7,10 +7,10 @@ Original bug on Mojira: https://bugs.mojang.com/browse/MC-223153 Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0083-Fix-MC-223153.patch diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java -index 63d67d46d30ed8ed57cdc0e59b6cb6b75ab22c1f..247cae73841500dbf161edd0f60f4ea61dd3e8d9 100644 +index 1c34691da51d7f7ba3d54e095a3b58b74a5f2263..331ce13f80a27274446100e9828e19c9385319b9 100644 --- a/src/main/java/net/minecraft/world/level/block/Blocks.java +++ b/src/main/java/net/minecraft/world/level/block/Blocks.java -@@ -6611,6 +6611,7 @@ public class Blocks { +@@ -6600,6 +6600,7 @@ public class Blocks { .mapColor(MapColor.COLOR_ORANGE) .instrument(NoteBlockInstrument.BASEDRUM) .requiresCorrectToolForDrops() diff --git a/patches/server/0045-Fix-MC-119417.patch b/patches/server/0044-Fix-MC-119417.patch similarity index 87% rename from patches/server/0045-Fix-MC-119417.patch rename to patches/server/0044-Fix-MC-119417.patch index 4fce0f4..6ddecd6 100644 --- a/patches/server/0045-Fix-MC-119417.patch +++ b/patches/server/0044-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 07ad39d071cfb16bc9e2560fa1abffe92d42740e..ec691d873736c6f173d1e825c00049f67d4c3a68 100644 +index 8264adc43edfebc2c260c2b915186c20ec3637cc..11ddb8e362f5fcedacc27f01fc7f2bee794784df 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2507,6 +2507,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -2487,6 +2487,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/0046-Fix-MC-200418.patch b/patches/server/0045-Fix-MC-200418.patch similarity index 93% rename from patches/server/0046-Fix-MC-200418.patch rename to patches/server/0045-Fix-MC-200418.patch index a8eec95..35d5a18 100644 --- a/patches/server/0046-Fix-MC-200418.patch +++ b/patches/server/0045-Fix-MC-200418.patch @@ -7,7 +7,7 @@ Original bug on Mojira: https://bugs.mojang.com/browse/MC-200418 Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0081-Fix-MC-200418.patch diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java -index 6f6b32bf7f68d05e4173c31f2e631a409b858a05..620d95056e70c23df5d992562a9a35bbd185b46c 100644 +index cd66ef1d99f3ce4533c2423fd12b2fcadf481a66..1faf14bfa3b579ea5be982a00ca98e362756ca7d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java @@ -326,6 +326,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder { diff --git a/patches/server/0047-Option-to-disable-moved-wrongly-threshold.patch b/patches/server/0046-Option-to-disable-moved-wrongly-threshold.patch similarity index 91% rename from patches/server/0047-Option-to-disable-moved-wrongly-threshold.patch rename to patches/server/0046-Option-to-disable-moved-wrongly-threshold.patch index 678a32f..bd237f9 100644 --- a/patches/server/0047-Option-to-disable-moved-wrongly-threshold.patch +++ b/patches/server/0046-Option-to-disable-moved-wrongly-threshold.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable moved wrongly threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 59d26f63fd6b6df86ae357be3fd530c1b9eb4394..18758042dd5fb4720d43f5e766af15519395d533 100644 +index 621202a01415dec318df62b4af1d2ef00c6b36b0..431505a5ec010f56002ef0f07f22511387162f61 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -590,7 +590,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -592,7 +592,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } // Paper end - Prevent moving into unloaded chunks @@ -16,8 +16,8 @@ index 59d26f63fd6b6df86ae357be3fd530c1b9eb4394..18758042dd5fb4720d43f5e766af1551 + if (!space.bxteam.divinemc.configuration.DivineConfig.disableMovedWronglyThreshold && d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) { // DivineMC - Option to disable moved wrongly threshold // CraftBukkit end ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", new Object[]{entity.getName().getString(), this.player.getName().getString(), d6, d7, d8}); - this.send(new ClientboundMoveVehiclePacket(entity)); -@@ -626,8 +626,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl + this.send(ClientboundMoveVehiclePacket.fromEntity(entity)); +@@ -628,8 +628,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean flag2 = false; @@ -28,7 +28,7 @@ index 59d26f63fd6b6df86ae357be3fd530c1b9eb4394..18758042dd5fb4720d43f5e766af1551 ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)}); } -@@ -1483,7 +1483,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1536,7 +1536,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY, toX, toY, toZ, toYaw, toPitch, true); if (!event.isAllowed()) { @@ -37,7 +37,7 @@ index 59d26f63fd6b6df86ae357be3fd530c1b9eb4394..18758042dd5fb4720d43f5e766af1551 ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8}); this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot()); return; -@@ -1553,7 +1553,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1606,7 +1606,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean movedWrongly = false; // Paper - Add fail move event; rename @@ -47,7 +47,7 @@ index 59d26f63fd6b6df86ae357be3fd530c1b9eb4394..18758042dd5fb4720d43f5e766af1551 io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_WRONGLY, toX, toY, toZ, toYaw, toPitch, true); diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 84ee2dbd085b02cf20f14022e2f1997f8d9580a8..19f3521bad52f8441e484e9c761904bbdf6b9902 100644 +index 028589d94e04828686ff09e6a6b1a8fc71f054a0..9deb9310b6829f2e1bac36327bbb21cee099b22b 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java @@ -157,9 +157,11 @@ public class DivineConfig { diff --git a/patches/server/0048-Implement-Secure-Seed.patch b/patches/server/0047-Implement-Secure-Seed.patch similarity index 97% rename from patches/server/0048-Implement-Secure-Seed.patch rename to patches/server/0047-Implement-Secure-Seed.patch index b8861e6..862840a 100644 --- a/patches/server/0048-Implement-Secure-Seed.patch +++ b/patches/server/0047-Implement-Secure-Seed.patch @@ -52,10 +52,10 @@ index 05e16103af3fd276f0196ddf1a2e5b729b025c34..e0118dfee89d4319f70a0d2f84ba4c21 return GsonHelper.parse(!s1.isEmpty() ? s1 : "{}"); }, new JsonObject()), (String) this.get("level-type", (s1) -> { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 1cb8c9d21eef27492efc4995525c198cbffd4b9b..923fff42046ff5fde7b9a7be3ed19c7f7fa024ce 100644 +index aea9a45c0916501f71018d3250b56da435f5664e..564395b9be9f161dc3ea7956b9b2432dc8bf45fa 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -685,6 +685,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon +@@ -692,6 +692,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon } public ChunkGenerator getGenerator() { @@ -64,10 +64,10 @@ index 1cb8c9d21eef27492efc4995525c198cbffd4b9b..923fff42046ff5fde7b9a7be3ed19c7f } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6a359f1ed07aa7b9c78e470fb00661ea03eaec03..1d824fbf42cca489488ce92ca61ea348aed34787 100644 +index 48d6b3d45d73c8f235f51a9652f33c81b3472a12..d791deb1d345daeab2cfa86d0baee944edb28bc1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -643,6 +643,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -644,6 +644,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe chunkgenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkgenerator, gen); } // CraftBukkit end @@ -96,7 +96,7 @@ index dad4ef9c672eb4247142de5d045678795951164c..c27684064163af48a5401db2efd72c1e // Paper start - Replace rules for Height in Slime Chunks final double maxHeightSlimeChunk = world.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.slimeChunk.maximum; diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java -index a402e2f774cfc062afab8d86969f3e6f38874063..19e26871f007683e762181171f39e9a46a6b5e77 100644 +index f87abb22dd161b2b74401086de80dc95c9ac2dbb..5ca052b94ff9fa36e3241a745229839a1e9bc852 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java @@ -85,6 +85,11 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh @@ -130,10 +130,10 @@ index a402e2f774cfc062afab8d86969f3e6f38874063..19e26871f007683e762181171f39e9a4 @Nullable public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved); diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index b5114f84b2df2f4606702b892d32d484225d9dcf..1c9b0718bcecf0ce138877b87d72688d3ec2d66f 100644 +index e0cb360ece042c4fc6aa0d10106923fe25288f5c..b42ab192fec723a17acd70aeb093895c8938ece2 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -344,7 +344,11 @@ public abstract class ChunkGenerator { +@@ -345,7 +345,11 @@ public abstract class ChunkGenerator { return structure.step().ordinal(); })); List list = (List) this.featuresPerStep.get(); @@ -146,7 +146,7 @@ index b5114f84b2df2f4606702b892d32d484225d9dcf..1c9b0718bcecf0ce138877b87d72688d long i = seededrandom.setDecorationSeed(generatoraccessseed.getSeed(), blockposition.getX(), blockposition.getZ()); Set> set = new ObjectArraySet(); -@@ -583,9 +587,18 @@ public abstract class ChunkGenerator { +@@ -584,9 +588,18 @@ public abstract class ChunkGenerator { ArrayList arraylist = new ArrayList(list.size()); arraylist.addAll(list); @@ -203,7 +203,7 @@ index a20520a6bd28bae1cee82258ac49d9753faba2bd..a0fbcf642f5a2aa6354d4287961d9377 int l = 0; int i1 = 0; diff --git a/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java -index 4e56398a6fb8b97199f4c74ebebc1055fb718dcf..8cb513fcd1a7c9abe82513165153a615ef747566 100644 +index f9aad1b8c02b70e620efdc2a58cadf4fff0f3ed5..261661977c3670d5173c677f041b2305a212718c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java +++ b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java @@ -60,6 +60,7 @@ public final class ChunkStep implements ca.spottedleaf.moonrise.patches.chunk_sy @@ -350,10 +350,10 @@ index 270db8b29cdf65e9bb932637425214eefeca86b7..6cf307b4ddb87ad54ead02dd10290a7a List list2 = Lists.newLinkedList(); double d = (double)k / (double)geodeConfiguration.outerWallDistance.getMaxValue(); diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java b/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java -index 3fbd6e8d23f2e6020532530ef8ad7e64b8047d4b..3711cf43e6a853b68cb9689d496dfb9029094c2e 100644 +index 13f7fce1959c0f44e047616674198176e667067f..23528e2eef5d097cad44e8f51a6199a7bf718044 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java -@@ -233,6 +233,14 @@ public abstract class Structure { +@@ -248,6 +248,14 @@ public abstract class Structure { } private static WorldgenRandom makeRandom(long seed, ChunkPos chunkPos) { @@ -418,7 +418,7 @@ index cbf13e4f2da6a27619e9bc9a7cd73bb6e69cad2a..8aebe917973f65123a3b0744172a307f } diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java -index a59fdf91cb2f17aa2855af0a63a1396ed6179185..3f2ccf2c21411d2a8df39b034b9898a012dbb239 100644 +index 65a0d9e7dd742732974774daabce02e9e52039ac..53e1261ef3ec66d90bcc17e99cb21e7d8ef9ccea 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java @@ -64,7 +64,11 @@ public class JigsawPlacement { @@ -470,7 +470,7 @@ index d57338319e8267fe83ae6578322dfcc1eba336aa..1dacae97862e841fcb1c96dfb6c4fe4e DedicatedServerProperties.WorldDimensionData properties = new DedicatedServerProperties.WorldDimensionData(GsonHelper.parse((creator.generatorSettings().isEmpty()) ? "{}" : creator.generatorSettings()), creator.type().name().toLowerCase(Locale.ROOT)); diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 19f3521bad52f8441e484e9c761904bbdf6b9902..daddaae83c4ff45e04388cd51ed5f80ed8078573 100644 +index 9deb9310b6829f2e1bac36327bbb21cee099b22b..c494d88cda016ff7a4da37ac1cee2a05876e595f 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java @@ -158,10 +158,12 @@ public class DivineConfig { diff --git a/patches/server/0049-Fix-MC-183518.patch b/patches/server/0048-Fix-MC-183518.patch similarity index 100% rename from patches/server/0049-Fix-MC-183518.patch rename to patches/server/0048-Fix-MC-183518.patch diff --git a/patches/server/0050-Delete-Timings.patch b/patches/server/0049-Delete-Timings.patch similarity index 96% rename from patches/server/0050-Delete-Timings.patch rename to patches/server/0049-Delete-Timings.patch index 97d610b..0de6e87 100644 --- a/patches/server/0050-Delete-Timings.patch +++ b/patches/server/0049-Delete-Timings.patch @@ -46,7 +46,7 @@ index 097500a59336db1bbfffcd1aa4cff7a8586e46ec..35b00c139864dd7925d46a2d6a317d7e @Override diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0a5cbfee55020e16af86044dbcd173cd3cd96f34..70f41e0d703296fa4bacf31feb0d478daa642d78 100644 +index 0819adb34541e5a774f07616957c785b3d6cd8ea..46a72da70c1a77eb19ca1d7771543373bfea0714 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,9 +3,6 @@ package net.minecraft.server; diff --git a/patches/server/0040-Carpet-Fixes-Sheep-Optimization.patch b/patches/unapplied/server/0040-Carpet-Fixes-Sheep-Optimization.patch similarity index 100% rename from patches/server/0040-Carpet-Fixes-Sheep-Optimization.patch rename to patches/unapplied/server/0040-Carpet-Fixes-Sheep-Optimization.patch