diff --git a/patches/server/0008-Setup-basic-configuration-sections.patch b/patches/server/0008-Setup-basic-configuration-sections.patch index 9437bdd..81410bb 100644 --- a/patches/server/0008-Setup-basic-configuration-sections.patch +++ b/patches/server/0008-Setup-basic-configuration-sections.patch @@ -5,10 +5,18 @@ Subject: [PATCH] Setup basic configuration sections diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 69c4d9cb0532621018f6cd99916c409fc150ab7e..5875aae8d7d0146ef9903d8b4bc2b673a615fd98 100644 +index 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -23,4 +23,23 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations; + import io.papermc.paper.configuration.Configuration; + import io.papermc.paper.configuration.ConfigurationPart; + import org.jetbrains.annotations.NotNull; ++import org.spongepowered.configurate.objectmapping.meta.PostProcess; + import org.spongepowered.configurate.objectmapping.meta.Setting; + + @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"}) +@@ -23,4 +24,43 @@ public class GlobalConfiguration extends ConfigurationPart { @Setting(Configuration.VERSION_FIELD) int version = VERSION; @@ -25,6 +33,26 @@ index 69c4d9cb0532621018f6cd99916c409fc150ab7e..5875aae8d7d0146ef9903d8b4bc2b673 + + } + ++ public Entity entity; ++ public class Entity extends ConfigurationPart { ++ ++ ++ @PostProcess ++ public void post() { ++ } ++ ++ } ++ ++ public World world; ++ public class World extends ConfigurationPart { ++ ++ ++ @PostProcess ++ public void post() { ++ } ++ ++ } ++ + public Miscellaneous misc; + public class Miscellaneous extends ConfigurationPart { + diff --git a/patches/server/0009-Port-SparklyPaper-patches.patch b/patches/server/0009-Port-SparklyPaper-patches.patch index 5e4a690..ba18124 100644 --- a/patches/server/0009-Port-SparklyPaper-patches.patch +++ b/patches/server/0009-Port-SparklyPaper-patches.patch @@ -88,3 +88,31 @@ index 8149b9c51b78eb5c689b7218a2ca3aab60e73bcf..b9a303f6280a2f6ad3616da152922a4f return this.cached || (!this.running.get() && this.initCache().isDone()); } +diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +index f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b..2adaa7c6433ac3f54c9d75ee3c14772b4c538418 100644 +--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java ++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +@@ -40,9 +40,11 @@ public class GlobalConfiguration extends ConfigurationPart { + public Entity entity; + public class Entity extends ConfigurationPart { + ++ boolean skipSqrWhenNoDeltaChanges = OPTIMIZE; + + @PostProcess + public void post() { ++ net.minecraft.server.level.ServerEntity.skipSqrWhenNoDeltaChanges = this.skipSqrWhenNoDeltaChanges; + } + + } +@@ -50,9 +52,11 @@ public class GlobalConfiguration extends ConfigurationPart { + public World world; + public class World extends ConfigurationPart { + ++ boolean skipTickWhenCraftNotPresent = OPTIMIZE; + + @PostProcess + public void post() { ++ net.minecraft.world.item.MapItem.skipTickWhenCraftNotPresent = this.skipTickWhenCraftNotPresent; + } + + } diff --git a/patches/server/0013-Tweak-console-logging.patch b/patches/server/0013-Tweak-console-logging.patch index e061460..4e1eff5 100644 --- a/patches/server/0013-Tweak-console-logging.patch +++ b/patches/server/0013-Tweak-console-logging.patch @@ -73,10 +73,10 @@ index c103f734ac8f4a58990a33cfefd8066b798a603e..ada7af155d02b580b8262ff4ca37b44d this.server.logChatMessage((unsignedFunction == null ? message.decoratedContent() : unsignedFunction.apply(this.server.console)), params, flag ? null : "Not Secure"); // Paper OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message); diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 5875aae8d7d0146ef9903d8b4bc2b673a615fd98..51413e828500792cc493b836bb1460a394ff4f75 100644 +index 2adaa7c6433ac3f54c9d75ee3c14772b4c538418..294fdbba44191427a841f8ac82b18ed8d706f53e 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -42,4 +42,13 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -67,4 +67,13 @@ public class GlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0018-Reduce-create-random-instance.patch b/patches/server/0018-Reduce-create-random-instance.patch index 1e94197..75dc70e 100644 --- a/patches/server/0018-Reduce-create-random-instance.patch +++ b/patches/server/0018-Reduce-create-random-instance.patch @@ -306,10 +306,10 @@ index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..d300668899c3382a42e6a25dd084fb81 // Paper start - Expose firework item directly // ItemStack item = this.getHandle().getEntityData().get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM); diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 51413e828500792cc493b836bb1460a394ff4f75..3047ff4e8949a741d8e14b7061c5f735d1eb96f8 100644 +index 294fdbba44191427a841f8ac82b18ed8d706f53e..be9e364a02eb872940443e3ba3349c3ccad3cb0f 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -39,6 +39,8 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -64,6 +64,8 @@ public class GlobalConfiguration extends ConfigurationPart { public Miscellaneous misc; public class Miscellaneous extends ConfigurationPart { diff --git a/patches/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch b/patches/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch index df6d871..82d5e6e 100644 --- a/patches/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch +++ b/patches/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch @@ -17,10 +17,10 @@ index b41635dd0569ff7df909df492d3e850aef7214be..afc567b789ee003e1b10059db2864a42 net.minecraft.world.level.Level level = this.getLevel(); BlockPos blockPos = this.getBlockPos(); diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 3047ff4e8949a741d8e14b7061c5f735d1eb96f8..0f515512489e07176638addf9e8420d948644be3 100644 +index be9e364a02eb872940443e3ba3349c3ccad3cb0f..472069754c6e297474578ff237ae8d02c827b61c 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -41,6 +41,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -66,6 +66,7 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean reduceRandom = OPTIMIZE; public boolean ignoreThreadSafeRandom = false; diff --git a/patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch index c979600..786fa5e 100644 --- a/patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch +++ b/patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch @@ -18,10 +18,10 @@ index a56628fb04ccd5a2df4cb98bb4054f0024bf3a06..64666af7f8c4e2ad9a47e20131b4654f float f2 = this.player.isFallFlying() ? 300.0F : 100.0F; diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 0f515512489e07176638addf9e8420d948644be3..832fef7f967f5497d2ddf20db3de8036805e27e3 100644 +index 472069754c6e297474578ff237ae8d02c827b61c..e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -26,6 +26,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -27,6 +27,7 @@ public class GlobalConfiguration extends ConfigurationPart { public Player player; public class Player extends ConfigurationPart { diff --git a/patches/server/0024-Implement-No-Chat-Reports.patch b/patches/server/0024-Implement-No-Chat-Reports.patch index e1ee8ee..ba566e7 100644 --- a/patches/server/0024-Implement-No-Chat-Reports.patch +++ b/patches/server/0024-Implement-No-Chat-Reports.patch @@ -142,10 +142,10 @@ index ada7af155d02b580b8262ff4ca37b44d79792cec..d8b0f270369e28da1226cd2ad4480dea } diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 832fef7f967f5497d2ddf20db3de8036805e27e3..54bf494356f3c224f86d06462f2686023da9ccc5 100644 +index e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac..62d891f05b90b323f0282fe26665965a10c317e6 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -55,4 +55,22 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -80,4 +80,22 @@ public class GlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0028-Configurable-cave-lava-sea-level.patch b/patches/server/0028-Configurable-cave-lava-sea-level.patch index fbc1951..8f0d4a9 100644 --- a/patches/server/0028-Configurable-cave-lava-sea-level.patch +++ b/patches/server/0028-Configurable-cave-lava-sea-level.patch @@ -26,10 +26,10 @@ index 98c7f695093acbcf9382a5f07a7a89e373709763..a85b1ebb4236f131b9be0104c4aa56f2 int i = settings.seaLevel(); Aquifer.FluidStatus aquifer_b1 = new Aquifer.FluidStatus(i, settings.defaultFluid()); diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 54bf494356f3c224f86d06462f2686023da9ccc5..c83125338d0eea86c65a42450367b084c3c9df44 100644 +index 62d891f05b90b323f0282fe26665965a10c317e6..1bba896194316b7b1b2d5e9d5943b7034e1511bb 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -34,6 +34,25 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -35,6 +35,25 @@ public class GlobalConfiguration extends ConfigurationPart { public WorldGeneration worldgen; public class WorldGeneration extends ConfigurationPart {