remove some patches

Edenor-Minecraft · Aug 8, 2024 · 23be376 · 23be376
1 parent fb646ca
commit 23be376
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 358 deletions.
diff --git a/...imize-random-calls-in-chunk-ticking.patch → ...imize-random-calls-in-chunk-ticking.patch b/...imize-random-calls-in-chunk-ticking.patch → ...imize-random-calls-in-chunk-ticking.patch
diff --git a/patches/server/0019-Pufferfish-Optimize-suffocation.patch b/patches/server/0019-Pufferfish-Optimize-suffocation.patch
diff --git a/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch b/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish-Dynamic-Activation-of-Brain
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index 8c8101d47376b9fb13652869401494c8b605620e..c36cac84603cd0c66c332eff8d55e16b7a5d3428 100644
+index c8c6631093ff2ebd23527e80778b35f9c44cc8bf..5b5a2491ec297c87458cf66171f5ed4c1e41e80d 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 @@ -2,6 +2,9 @@ package net.edenor.foldenor.config;
@@ -26,9 +26,9 @@ index 8c8101d47376b9fb13652869401494c8b605620e..c36cac84603cd0c66c332eff8d55e16b
  import java.util.List;
  import java.util.Map;
  import java.util.logging.Level;
-@@ -27,6 +31,14 @@ public class FoldenorConfig {
+@@ -25,6 +29,14 @@ public class FoldenorConfig {
 
-     public static boolean enableSuffocationOptimization = false;
+     public static boolean sendNullEntityPackets = false;
 
 +    // Pufferfish DAB
 +    public static boolean dearEnabled;
@@ -41,9 +41,9 @@ index 8c8101d47376b9fb13652869401494c8b605620e..c36cac84603cd0c66c332eff8d55e16b
      public static void init(File configFile) {
          init(configFile, true);
      }
-@@ -71,6 +83,12 @@ public class FoldenorConfig {
-
-         readOptimizationSettings();
+@@ -67,6 +79,12 @@ public class FoldenorConfig {
+     static void readConfig() {
+         readNetworkSettings();
 
 +        try {
 +            readDynamicActivationOfBrains();
@@ -54,8 +54,8 @@ index 8c8101d47376b9fb13652869401494c8b605620e..c36cac84603cd0c66c332eff8d55e16b
          try {
              config.save(CONFIG_FILE);
          } catch (IOException ex) {
-@@ -90,6 +108,30 @@ public class FoldenorConfig {
-                 "configuration option if the vanilla deviation is undesirable.");
+@@ -78,6 +96,30 @@ public class FoldenorConfig {
+         sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
      }
 
 +    private static void readDynamicActivationOfBrains() throws IOException {

diff --git a/...es/server/0022-Leaves-Protocol-Core.patch → ...es/server/0021-Leaves-Protocol-Core.patch b/...es/server/0022-Leaves-Protocol-Core.patch → ...es/server/0021-Leaves-Protocol-Core.patch
diff --git a/...rver/0023-Leaves-Appleskin-Protocol.patch → ...rver/0022-Leaves-Appleskin-Protocol.patch b/...rver/0023-Leaves-Appleskin-Protocol.patch → ...rver/0022-Leaves-Appleskin-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves-Appleskin-Protocol
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index c36cac84603cd0c66c332eff8d55e16b7a5d3428..8e901c59e1310d70552b3853d3f5e721aad71a79 100644
+index 5b5a2491ec297c87458cf66171f5ed4c1e41e80d..36cf79632b12c67291ccccfda7341ee543e607c6 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-@@ -39,6 +39,8 @@ public class FoldenorConfig {
+@@ -37,6 +37,8 @@ public class FoldenorConfig {
      public static int activationDistanceMod;
      // Pufferfish DAB
 
@@ -17,14 +17,14 @@ index c36cac84603cd0c66c332eff8d55e16b7a5d3428..8e901c59e1310d70552b3853d3f5e721
      public static void init(File configFile) {
          init(configFile, true);
      }
-@@ -98,6 +100,7 @@ public class FoldenorConfig {
+@@ -94,6 +96,7 @@ public class FoldenorConfig {
 
      protected static void readNetworkSettings(){
          sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
 +        appleskinProtocol = getBoolean("network.appleskin-protocol", appleskinProtocol);
      }
 
-     private static void readOptimizationSettings() {
+     private static void readDynamicActivationOfBrains() throws IOException {
 diff --git a/src/main/java/org/leavesmc/leaves/protocol/AppleSkinProtocol.java b/src/main/java/org/leavesmc/leaves/protocol/AppleSkinProtocol.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..a8694777f0619584c76c9cba47f7926435b768a9

diff --git a/...024-Gale-Faster-chunk-serialization.patch → ...023-Gale-Faster-chunk-serialization.patch b/...024-Gale-Faster-chunk-serialization.patch → ...023-Gale-Faster-chunk-serialization.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch
diff --git a/...duce-acquire-POI-for-stuck-entities.patch → ...duce-acquire-POI-for-stuck-entities.patch b/...duce-acquire-POI-for-stuck-entities.patch → ...duce-acquire-POI-for-stuck-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Gale-Reduce-acquire-POI-for-stuck-entities
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index 8e901c59e1310d70552b3853d3f5e721aad71a79..f8618b1b7d3ecddd5ac9e1057167050a610f8e54 100644
+index 36cf79632b12c67291ccccfda7341ee543e607c6..3dfc4f1b7fd8b0c968ebfec11525a42588a168e2 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-@@ -41,6 +41,8 @@ public class FoldenorConfig {
+@@ -39,6 +39,8 @@ public class FoldenorConfig {
 
      public static boolean appleskinProtocol = false;
 

diff --git a/...er/0027-Gale-Optimize-sun-burn-tick.patch → ...er/0026-Gale-Optimize-sun-burn-tick.patch b/...er/0027-Gale-Optimize-sun-burn-tick.patch → ...er/0026-Gale-Optimize-sun-burn-tick.patch
diff --git a/...rpur-Alternative-Keepalive-Handling.patch → ...rpur-Alternative-Keepalive-Handling.patch b/...rpur-Alternative-Keepalive-Handling.patch → ...rpur-Alternative-Keepalive-Handling.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur-Alternative-Keepalive-Handling
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index f8618b1b7d3ecddd5ac9e1057167050a610f8e54..b52f7bcc17fba6a3a4376a4bfea17430be9c4a8e 100644
+index 3dfc4f1b7fd8b0c968ebfec11525a42588a168e2..4c305c313db5223378eb5374c2163924edbb3b61 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-@@ -43,6 +43,8 @@ public class FoldenorConfig {
+@@ -41,6 +41,8 @@ public class FoldenorConfig {
 
      public static int acquirePoiForStuckEntity = 60;
 
@@ -17,14 +17,14 @@ index f8618b1b7d3ecddd5ac9e1057167050a610f8e54..b52f7bcc17fba6a3a4376a4bfea17430
      public static void init(File configFile) {
          init(configFile, true);
      }
-@@ -103,6 +105,7 @@ public class FoldenorConfig {
+@@ -99,6 +101,7 @@ public class FoldenorConfig {
      protected static void readNetworkSettings(){
          sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
          appleskinProtocol = getBoolean("network.appleskin-protocol", appleskinProtocol);
 +        useAlternateKeepAlive = getBoolean("network.use-alternate-keepalive", useAlternateKeepAlive);
      }
 
-     private static void readOptimizationSettings() {
+     private static void readDynamicActivationOfBrains() throws IOException {
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 index 6531c3173f0fd54196c11db3e6348e0afe617376..d5bb4d2a23687fe0dfc6c6920fc90580a366019f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java

diff --git a/...s/server/0029-Purpur-Remove-timings.patch → ...s/server/0028-Purpur-Remove-timings.patch b/...s/server/0029-Purpur-Remove-timings.patch → ...s/server/0028-Purpur-Remove-timings.patch
@@ -1421,7 +1421,7 @@ index da815f30a44cbfe577b75b79e4527930fc6980d7..280b65d9ea6cde9f417057632c305645
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 873e9b488a14866c99779a5b5e5f3d1c211febd6..bd2f3c8f28615b60a02ca09092e1429d5d4ae77c 100644
+index b4fec6374803534aa3b5d5e7aec64f68c7c7c356..33f6905706f333904ccd08f5f01ad6276b3fa24d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;

diff --git a/...g-for-piglin-spawn-in-nether-portal.patch → ...g-for-piglin-spawn-in-nether-portal.patch b/...g-for-piglin-spawn-in-nether-portal.patch → ...g-for-piglin-spawn-in-nether-portal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add-chance-config-for-piglin-spawn-in-nether-portal
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index b52f7bcc17fba6a3a4376a4bfea17430be9c4a8e..553c02a53b9aed6c851305f1e885934677fa5daa 100644
+index 4c305c313db5223378eb5374c2163924edbb3b61..01687fa24c649cfbec58fde93b5af3a32d8222c3 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-@@ -45,6 +45,8 @@ public class FoldenorConfig {
+@@ -43,6 +43,8 @@ public class FoldenorConfig {
 
      public static boolean useAlternateKeepAlive = false;
 
@@ -17,15 +17,27 @@ index b52f7bcc17fba6a3a4376a4bfea17430be9c4a8e..553c02a53b9aed6c851305f1e8859346
      public static void init(File configFile) {
          init(configFile, true);
      }
-@@ -114,6 +116,8 @@ public class FoldenorConfig {
-                 "the check in a way that still appears vanilla. This should",
-                 "be left enabled on most servers, but is provided as a",
-                 "configuration option if the vanilla deviation is undesirable.");
-+        piglinSpawnChancePersentInPortal = getInt("optimizations.piglin-spawn-chance-persent-in-portal", 100,
-+            "Reduces piglin spawn in portal, by reducing change to spawn");
+@@ -85,6 +87,8 @@ public class FoldenorConfig {
+     static void readConfig() {
+         readNetworkSettings();
+
++        readOptimizationSettings();
++
+         try {
+             readDynamicActivationOfBrains();
+         } catch (IOException e) {
+@@ -104,6 +108,11 @@ public class FoldenorConfig {
+         useAlternateKeepAlive = getBoolean("network.use-alternate-keepalive", useAlternateKeepAlive);
      }
 
++    private static void readOptimizationSettings() {
++        piglinSpawnChancePersentInPortal = getInt("optimizations.piglin-spawn-chance-persent-in-portal", 100,
++            "Reduces piglin spawn in portal, by reducing change to spawn");
++    }
++
      private static void readDynamicActivationOfBrains() throws IOException {
+         dearEnabled = getBoolean("dab.enabled",  true);
+         startDistance = getInt("dab.start-distance",  12,
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 index eba62f1336697157da94c7dcde389cc2e929bb0b..918b50e1f17fa2b49e5e7ef48182538ea12aae02 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java

diff --git a/...-Virtual-Thread-for-async-scheduler.patch → ...-Virtual-Thread-for-async-scheduler.patch b/...-Virtual-Thread-for-async-scheduler.patch → ...-Virtual-Thread-for-async-scheduler.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf-Virtual-Thread-for-async-scheduler
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index 553c02a53b9aed6c851305f1e885934677fa5daa..d2badf33e46350aec586342e4e97b65a748c353e 100644
+index 01687fa24c649cfbec58fde93b5af3a32d8222c3..4ac748456e7e243513c194c37c9c63d6a4757e78 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-@@ -47,6 +47,8 @@ public class FoldenorConfig {
+@@ -45,6 +45,8 @@ public class FoldenorConfig {
 
      public static int piglinSpawnChancePersentInPortal = 100;
 
@@ -17,7 +17,7 @@ index 553c02a53b9aed6c851305f1e885934677fa5daa..d2badf33e46350aec586342e4e97b65a
      public static void init(File configFile) {
          init(configFile, true);
      }
-@@ -91,6 +93,8 @@ public class FoldenorConfig {
+@@ -89,6 +91,8 @@ public class FoldenorConfig {
 
          readOptimizationSettings();
 
@@ -26,7 +26,7 @@ index 553c02a53b9aed6c851305f1e885934677fa5daa..d2badf33e46350aec586342e4e97b65a
          try {
              readDynamicActivationOfBrains();
          } catch (IOException e) {
-@@ -120,6 +124,11 @@ public class FoldenorConfig {
+@@ -113,6 +117,11 @@ public class FoldenorConfig {
              "Reduces piglin spawn in portal, by reducing change to spawn");
      }
 

diff --git a/...0032-Carpet-Fixes-getBiome-Optimize.patch → ...0031-Carpet-Fixes-getBiome-Optimize.patch b/...0032-Carpet-Fixes-getBiome-Optimize.patch → ...0031-Carpet-Fixes-getBiome-Optimize.patch
diff --git a/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch b/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch
diff --git a/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch b/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] SparklyPaper Skip 'MapItem#update()' if the map does not have
 
 
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-index d2badf33e46350aec586342e4e97b65a748c353e..fbc0835c8e3cafc678275334a378369207c9a6b1 100644
+index 4ac748456e7e243513c194c37c9c63d6a4757e78..bf1d94e148b67084b4ea8208eb395e31231c472b 100644
 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
-@@ -49,6 +49,8 @@ public class FoldenorConfig {
+@@ -47,6 +47,8 @@ public class FoldenorConfig {
 
      public static boolean useVirtualThreadForAsyncScheduler = false;
 
@@ -17,8 +17,8 @@ index d2badf33e46350aec586342e4e97b65a748c353e..fbc0835c8e3cafc678275334a3783692
      public static void init(File configFile) {
          init(configFile, true);
      }
-@@ -122,6 +124,7 @@ public class FoldenorConfig {
-                 "configuration option if the vanilla deviation is undesirable.");
+@@ -115,6 +117,7 @@ public class FoldenorConfig {
+     private static void readOptimizationSettings() {
          piglinSpawnChancePersentInPortal = getInt("optimizations.piglin-spawn-chance-persent-in-portal", 100,
              "Reduces piglin spawn in portal, by reducing change to spawn");
 +        skipMapItemUpdatesIfNoBukkitRender = getBoolean("optimizations.skip_map_item_updates_if_no_bukkit_render", skipMapItemUpdatesIfNoBukkitRender);

diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...036-Leaf-Skip-event-if-no-listeners.patch → ...035-Leaf-Skip-event-if-no-listeners.patch b/...036-Leaf-Skip-event-if-no-listeners.patch → ...035-Leaf-Skip-event-if-no-listeners.patch
diff --git a/.../server/0037-Divine-lithium-ai.raid.patch → .../server/0036-Divine-lithium-ai.raid.patch b/.../server/0037-Divine-lithium-ai.raid.patch → .../server/0036-Divine-lithium-ai.raid.patch
diff --git a/...tity.fast_elytra_check-entity.fast_.patch → ...tity.fast_elytra_check-entity.fast_.patch b/...tity.fast_elytra_check-entity.fast_.patch → ...tity.fast_elytra_check-entity.fast_.patch
@@ -6,18 +6,18 @@ Subject: [PATCH] Divine: lithium: entity.fast_elytra_check +
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bd2f3c8f28615b60a02ca09092e1429d5d4ae77c..8dc1b4caac03d7bf09b2bd4cb6d2634699a23c47 100644
+index 33f6905706f333904ccd08f5f01ad6276b3fa24d..ac95df2d619ef79a2f07e0071523c05ea1a4d08b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2668,6 +2668,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2658,6 +2658,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
 
      protected void updateSwingTime() {
 +        if (!this.swinging && this.swingTime == 0) return; // DivineMC - lithium: entity.fast_hand_swing
          int i = this.getCurrentSwingDuration();
 
          if (this.swinging) {
-@@ -3616,6 +3617,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3606,6 +3607,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
 
      private void updateFallFlying() {

diff --git a/...ed-server-showing-in-ping-before-se.patch → ...ed-server-showing-in-ping-before-se.patch b/...ed-server-showing-in-ping-before-se.patch → ...ed-server-showing-in-ping-before-se.patch