diff --git a/gradle.properties b/gradle.properties index 60107c4..821f95b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = space.bxteam.divinemc version = 1.20.6-R0.1-SNAPSHOT -purpurRef = 8aa793450315a361548f5e1dce4edf18e606bf51 +purpurRef = e1603ae33f4d4fa00d7a166335160d8a5b97496d org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0024-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0024-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0025-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch similarity index 94% rename from patches/server/0025-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch rename to patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch index 6fe98a8..a652bcc 100644 --- a/patches/server/0025-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch +++ b/patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.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/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4e6fccec4f5ca14562bf5bae495ac36c14982d85..be8870d01262b37d130d518a500db7117f568950 100644 +index 345f143b0eeb77acb96e4bc716f3b23782ac782f..97545fd84b9b1716e9847cac9e233742ea7f9252 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -110,6 +110,8 @@ import org.slf4j.Logger; diff --git a/patches/server/0026-lithium-ai.raid.patch b/patches/server/0025-lithium-ai.raid.patch similarity index 100% rename from patches/server/0026-lithium-ai.raid.patch rename to patches/server/0025-lithium-ai.raid.patch diff --git a/patches/server/0027-lithium-collections.gamerules.patch b/patches/server/0026-lithium-collections.gamerules.patch similarity index 100% rename from patches/server/0027-lithium-collections.gamerules.patch rename to patches/server/0026-lithium-collections.gamerules.patch diff --git a/patches/server/0028-lithium-collections.entity_by_type.patch b/patches/server/0027-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0028-lithium-collections.entity_by_type.patch rename to patches/server/0027-lithium-collections.entity_by_type.patch diff --git a/patches/server/0029-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch similarity index 100% rename from patches/server/0029-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch rename to patches/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch diff --git a/patches/server/0030-lithium-precompute-shape-arrays.patch b/patches/server/0029-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0030-lithium-precompute-shape-arrays.patch rename to patches/server/0029-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0031-Carpet-Fixes-Sheep-Optimization.patch b/patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch similarity index 95% rename from patches/server/0031-Carpet-Fixes-Sheep-Optimization.patch rename to patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch index d0f95b0..51421c8 100644 --- a/patches/server/0031-Carpet-Fixes-Sheep-Optimization.patch +++ b/patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch @@ -62,17 +62,16 @@ index 6b1244d3957e7f62c96ffd34692b8916337839fd..994d81bb16040439ecbdf427dfde70d2 private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) { TransientCraftingContainer transientcraftingcontainer = new TransientCraftingContainer(new AbstractContainerMenu((MenuType) null, -1) { diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -index 67ff4450b58c1df2f595a136c53d60bbefa2e8d5..13ea61e380ea8d0772107b06008bf86e274e5f91 100644 +index 73b6c3590dad95cddd9cc1a1cff36492175da232..bf550fa360f69b714ac346333c78d7f8de2a71b9 100644 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java -@@ -155,8 +155,10 @@ public class DivineConfig { +@@ -154,7 +154,9 @@ public class DivineConfig { + } public static boolean biomeManagerOptimization = true; - public static boolean recipeManagerOptimization = true; + public static boolean sheepOptimization = true; private static void optimizations() { biomeManagerOptimization = getBoolean("settings.optimizations.biome-manager-optimization", biomeManagerOptimization); - recipeManagerOptimization = getBoolean("settings.optimizations.recipe-manager-optimization", recipeManagerOptimization); + sheepOptimization = getBoolean("settings.optimizations.sheep-optimization", sheepOptimization); } } diff --git a/patches/server/0032-Snowball-and-Egg-knockback.patch b/patches/server/0031-Snowball-and-Egg-knockback.patch similarity index 100% rename from patches/server/0032-Snowball-and-Egg-knockback.patch rename to patches/server/0031-Snowball-and-Egg-knockback.patch diff --git a/patches/server/0033-Suppress-errors-from-dirty-attributes.patch b/patches/server/0032-Suppress-errors-from-dirty-attributes.patch similarity index 92% rename from patches/server/0033-Suppress-errors-from-dirty-attributes.patch rename to patches/server/0032-Suppress-errors-from-dirty-attributes.patch index d97e064..d57da9e 100644 --- a/patches/server/0033-Suppress-errors-from-dirty-attributes.patch +++ b/patches/server/0032-Suppress-errors-from-dirty-attributes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 39e7dcf3c92c9203c190782be401c00c010b8aeb..78ce9687a163255098eb8408dacefa1c9525b636 100644 +index dd6278fe99e2ee4daa95249c71ea935dd08b0025..7e2bd649b3525ccd5db052f83c9b8818d7f13d78 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java -@@ -386,7 +386,10 @@ public class ServerEntity { +@@ -394,7 +394,10 @@ public class ServerEntity { } if (this.entity instanceof LivingEntity) { @@ -20,7 +20,7 @@ index 39e7dcf3c92c9203c190782be401c00c010b8aeb..78ce9687a163255098eb8408dacefa1c if (!set.isEmpty()) { // CraftBukkit start - Send scaled max health -@@ -397,7 +400,7 @@ public class ServerEntity { +@@ -405,7 +408,7 @@ public class ServerEntity { this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set)); } diff --git a/patches/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch b/patches/unapplied/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from patches/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch rename to patches/unapplied/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch