Fix build

Winds-Studio · May 25, 2024 · 6ae5474 · 6ae5474
1 parent 67947bc
commit 6ae5474
Show file tree

Hide file tree

Showing 21 changed files with 229 additions and 456 deletions.
diff --git a/patches/api/0009-KeYi-Player-Skull-API.patch b/patches/api/0009-KeYi-Player-Skull-API.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ed7bea937e0be1c404d5ab5cef8fce5e6ac17..46d8d8e11448613de3caa0a54613c8d028673ad0 100644
+index 877ed7bea937e0be1c404d5ab5cef8fce5e6ac17..5c03666a54daaeac87332f0e075361b14fb575b9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3424,4 +3424,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -30,6 +30,6 @@ index 877ed7bea937e0be1c404d5ab5cef8fce5e6ac17..46d8d8e11448613de3caa0a54613c8d0
 +     *
 +     * @return A CompletableFuture of the skull ItemStack of the player
 +     */
-+    CompletableFuture<ItemStack> getSkullAsynchronously();
++    java.util.concurrent.CompletableFuture<ItemStack> getSkullAsynchronously();
 +    // Leaf end - KeYi
  }
diff --git a/patches/server/0006-Pufferfish-Optimize-mob-spawning.patch b/patches/server/0006-Pufferfish-Optimize-mob-spawning.patch
@@ -32,14 +32,14 @@ index 3bee751a36c1aaab9b9a738edac80b4d2853bdd7..31b1b1c6a55b04cf1952ddb8ea08da98
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 73a492e629677b045914cf41b826ee1acb4497b7..6fa06ba5140ab135a5cfe8d6bde9ef6514ca69fa 100644
+index 73a492e629677b045914cf41b826ee1acb4497b7..130406970b6c35f224ecbe03bd375d318780fb67 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -349,6 +349,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
 
-+            if (org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
++            if (org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled) mobSpawnExecutor.start(); // Pufferfish
              return true;
          }
      }
@@ -57,7 +57,7 @@ index 9feda080c522e3374024eabe4f9eebe9b16b701f..d9828fd85d39116867bdb7e4fbe899ba
          this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
          this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 075c476cdf02ece97c5e0032726ae1b560825ce1..cb7f88e37b6bd3a0a78f80ef6062e65818ab180c 100644
+index 075c476cdf02ece97c5e0032726ae1b560825ce1..865be5b73846f680cfc4a06b676fefc4236c9e9a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -75,6 +75,9 @@ public class ServerChunkCache extends ChunkSource {
@@ -75,7 +75,7 @@ index 075c476cdf02ece97c5e0032726ae1b560825ce1..cb7f88e37b6bd3a0a78f80ef6062e658
              // Paper start - per player mob spawning
              if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
 +            // Pufferfish start - moved down when async processing
-+            if (!org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) {
++            if (!org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled) {
                  // re-set mob counts
                  for (ServerPlayer player : this.level.players) {
                      // Paper start - per player mob spawning backoff
@@ -108,7 +108,7 @@ index 075c476cdf02ece97c5e0032726ae1b560825ce1..cb7f88e37b6bd3a0a78f80ef6062e658
                      chunk1.incrementInhabitedTime(j);
 -                    if (flag2AndHasNaturalSpawn && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration // Gale - MultiPaper - skip unnecessary mob spawning computations
 -                        NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
-+                    if (flag2AndHasNaturalSpawn && (!org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning || _pufferfish_spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration // Gale - MultiPaper - skip unnecessary mob spawning computations
++                    if (flag2AndHasNaturalSpawn && (!org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled || _pufferfish_spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration // Gale - MultiPaper - skip unnecessary mob spawning computations
 +                        NaturalSpawner.spawnForChunk(this.level, chunk1, lastSpawnState, this.spawnFriendlies, this.spawnEnemies, flag1); // Pufferfish
                      }
 
@@ -118,7 +118,7 @@ index 075c476cdf02ece97c5e0032726ae1b560825ce1..cb7f88e37b6bd3a0a78f80ef6062e658
              // Paper end - controlled flush for entity tracker packets
          }
 +        // Pufferfish start - optimize mob spawning
-+        if (org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) {
++        if (org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled) {
 +            for (ServerPlayer player : this.level.players) {
 +                // Paper start - per player mob spawning backoff
 +                for (int ii = 0; ii < ServerPlayer.MOBCATEGORY_TOTAL_ENUMS; ii++) {

diff --git a/patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch
@@ -42,7 +42,7 @@ index 1462f9d4f2cdf4071fb002d602783866a5a3d285..5d6c0f5d2d993ae3a044a1a02716a266
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5872824b58d65208f21379ebd4fca918da323c32..edfb51e5c54d443926d0c051a3732a97dcecbd00 100644
+index 5872824b58d65208f21379ebd4fca918da323c32..d7da045d1811247be6e89c438dff7ccad0299900 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -436,6 +436,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -51,7 +51,7 @@ index 5872824b58d65208f21379ebd4fca918da323c32..edfb51e5c54d443926d0c051a3732a97
 
 +    // Pufferfish start
 +    public boolean activatedPriorityReset = false; // DAB
-+    public int activatedPriority = org.dreeam.leaf.LeafConfig.maximumActivationPrio; // golf score
++    public int activatedPriority = org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.maximumActivationPrio; // golf score
 +    // Pufferfish end
 +
      public float getBukkitYaw() {
@@ -119,7 +119,7 @@ index 646d9a121d908a2fc3e4e302484dd5cd1bfc6804..e546ecdccde352502e26a8668eaaafe0
          }
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 86fc528551c2c90c78783d4d46a4a2c52e4efe41..034dfd1a62f97ffa4ca2c466fea609cee18d4798 100644
+index 86fc528551c2c90c78783d4d46a4a2c52e4efe41..5cf651eec6665d06806ebc5ed1f893795e4c637d 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 @@ -51,9 +51,12 @@ public class GoalSelector {
@@ -128,7 +128,7 @@ index 86fc528551c2c90c78783d4d46a4a2c52e4efe41..034dfd1a62f97ffa4ca2c466fea609ce
      // Paper start
 -    public boolean inactiveTick() {
 +    public boolean inactiveTick(int tickRate, boolean inactive) { // Pufferfish start
-+        if (inactive && !org.dreeam.leaf.LeafConfig.dabEnabled) tickRate = 4; // reset to Paper's
++        if (inactive && !org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.enabled) tickRate = 4; // reset to Paper's
 +        tickRate = Math.min(tickRate, this.newGoalRate);
          this.curRate++;
 -        return this.curRate % this.newGoalRate == 0;
@@ -361,7 +361,7 @@ index 0000000000000000000000000000000000000000..2769eba9841ec866265e814e16f930a5
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index aa68ff1abced10ad03957c9c0ac24beaf112adcf..7d2b6657b0dbf5f899446d674dfc01b326fbc9c3 100644
+index aa68ff1abced10ad03957c9c0ac24beaf112adcf..6b97b741ed8ff39bbb8d6e2aa6bf8090685227a7 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -40,6 +40,9 @@ import net.minecraft.world.level.Level;
@@ -380,17 +380,17 @@ index aa68ff1abced10ad03957c9c0ac24beaf112adcf..7d2b6657b0dbf5f899446d674dfc01b3
                  ActivationRange.activateEntity(entity);
 +
 +                // Pufferfish start
-+                if (org.dreeam.leaf.LeafConfig.dabEnabled && entity.getType().dabEnabled) {
++                if (org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.enabled && entity.getType().dabEnabled) {
 +                    if (!entity.activatedPriorityReset) {
 +                        entity.activatedPriorityReset = true;
-+                        entity.activatedPriority = org.dreeam.leaf.LeafConfig.maximumActivationPrio;
++                        entity.activatedPriority = org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.maximumActivationPrio;
 +                    }
 +                    Vec3 playerVec = player.position();
 +                    Vec3 entityVec = entity.position();
 +                    double diffX = playerVec.x - entityVec.x, diffY = playerVec.y - entityVec.y, diffZ = playerVec.z - entityVec.z;
 +                    int squaredDistance = (int) (diffX * diffX + diffY * diffY + diffZ * diffZ);
-+                    entity.activatedPriority = squaredDistance > org.dreeam.leaf.LeafConfig.startDistanceSquared ?
-+                      Math.max(1, Math.min(squaredDistance >> org.dreeam.leaf.LeafConfig.activationDistanceMod, entity.activatedPriority)) :
++                    entity.activatedPriority = squaredDistance > org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.startDistanceSquared ?
++                      Math.max(1, Math.min(squaredDistance >> org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.activationDistanceMod, entity.activatedPriority)) :
 +                      1;
 +                } else {
 +                    entity.activatedPriority = 1;

diff --git a/patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
@@ -7,7 +7,7 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 8bd04d423a444c9b66a1ff787906eb7879721459..92a92c0f4a6bcecfecacd8e4a4ab8658124d9418 100644
+index 8bd04d423a444c9b66a1ff787906eb7879721459..065d0d8d535e3674ea090e1c0cb007892cbda698 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -220,11 +220,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -20,7 +20,7 @@ index 8bd04d423a444c9b66a1ff787906eb7879721459..92a92c0f4a6bcecfecacd8e4a4ab8658
      public void inactiveTick() {
          super.inactiveTick();
 -        if (this.goalSelector.inactiveTick(this.activatedPriority, true)) { // Pufferfish - pass activated priroity
-+        boolean isThrottled = org.dreeam.leaf.LeafConfig.throttleInactiveGoalSelectorTick && _pufferfish_inactiveTickDisableCounter++ % 20 != 0; // Pufferfish - throttle inactive goal selector ticking
++        boolean isThrottled = org.dreeam.leaf.config.modules.opt.ThrottleInactiveGoalSelectorTick.enabled && _pufferfish_inactiveTickDisableCounter++ % 20 != 0; // Pufferfish - throttle inactive goal selector ticking
 +        if (this.goalSelector.inactiveTick(this.activatedPriority, true) && !isThrottled) { // Pufferfish - pass activated priroity // Pufferfish - throttle inactive goal selector ticking
              this.goalSelector.tick();
          }

diff --git a/patches/server/0010-Purpur-Server-Changes.patch b/patches/server/0010-Purpur-Server-Changes.patch
@@ -789,7 +789,7 @@ index d601d287e94a59ff93b8a83a44dac02544d211df..0ff3b06a98b2f4514b2d861b92dd70fe
                          itemstack1.setCount(1);
                          entityitem = entityplayer.drop(itemstack1, false, false, false); // SPIGOT-2942: Add boolean to call event
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6fa06ba5140ab135a5cfe8d6bde9ef6514ca69fa..3dbbac8128e984baff14a41379f4665a585bf877 100644
+index 130406970b6c35f224ecbe03bd375d318780fb67..b195881c2a4ee7cfc27ed69ee88dee66c63ad093 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -98,6 +98,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -850,7 +850,7 @@ index 6fa06ba5140ab135a5cfe8d6bde9ef6514ca69fa..3dbbac8128e984baff14a41379f4665a
 @@ -350,6 +384,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              }
 
-             if (org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
+             if (org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled) mobSpawnExecutor.start(); // Pufferfish
 +            org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur
 +            if (org.purpurmc.purpur.PurpurConfig.beeCountPayload) org.purpurmc.purpur.task.BeehiveTask.instance().register(); // Purpur
              return true;
@@ -2341,7 +2341,7 @@ index 14fab63346d56c72cd7534a04760efd10eef4295..745e792482f61c571e2efbd4200dd1bd
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 31d248b0a3ec735edff3aeb5e00fd009940013da..9038588608baec2e02c88a727662c903adcf5da6 100644
+index 31eb4fa683e473de2ad16746c23b625c5d9509e3..d785c7765e3d0e786f692524e994b49206557d6c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
@@ -3160,7 +3160,7 @@ index 75a06dec69ee79af5b321388b104bf1cb6acf83c..bef1b8cb3664d499fe45e6d60fe131a0
                          });
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 92a92c0f4a6bcecfecacd8e4a4ab8658124d9418..455a0a96ac6aa6106e9011cd41be228b5a880fe5 100644
+index 065d0d8d535e3674ea090e1c0cb007892cbda698..79c67810af9a1ace6ac98f54188f15dc18883e9b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -65,6 +65,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
@@ -24839,7 +24839,7 @@ index 0000000000000000000000000000000000000000..b7586f494528f30eb0da82420d3bcf5b
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 7d2b6657b0dbf5f899446d674dfc01b326fbc9c3..c89a95801439bb0ab570bc33ded3f270451de9f2 100644
+index 6b97b741ed8ff39bbb8d6e2aa6bf8090685227a7..22481b9cc4fc124b41c9448a2985e28a8bfaa403 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;

diff --git a/patches/server/0011-Purpur-Configurable-server-mod-name.patch b/patches/server/0011-Purpur-Configurable-server-mod-name.patch
@@ -5,21 +5,21 @@ Subject: [PATCH] Purpur: Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3328eb0715dab1786a677029bf6356d9118059b9..d9d92e74b101b2a4276b419ad9dcbdc361cb6860 100644
+index 3328eb0715dab1786a677029bf6356d9118059b9..c11419ab16105606ef13b573041b159e94d95ce6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
 -        return org.purpurmc.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Gale - branding changes - Gale > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return org.dreeam.leaf.LeafConfig.serverModName; // Leaf - Leaf > // Purpur - Purpur > // Gale - branding changes - Gale > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
++        return org.dreeam.leaf.config.modules.misc.ServerBrand.serverModName; // Leaf - Leaf > // Purpur - Purpur > // Gale - branding changes - Gale > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java b/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7f7fe2930b2e26dd9ef4ceb0a22b005a8cc477b6
+index 0000000000000000000000000000000000000000..eb7b7b7d2d51173ce1297d618a586d4d686f8041
 --- /dev/null
 +++ b/src/main/java/org/dreeam/leaf/config/modules/misc/ServerBrand.java
 @@ -0,0 +1,21 @@
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..7f7fe2930b2e26dd9ef4ceb0a22b005a
 +    }
 +
 +    @ConfigInfo(baseName = "server-mod-name")
-+    public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
++    public static String serverModName = "Leaf";
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 index 8299aab5c29c8c6d996087537d9522b653b03ffa..d9591194268d44c73d081be574cd6060b16bad1f 100644