Step3, Where is my Doritos?

Winds-Studio · Dec 14, 2024 · ed40c14 · ed40c14
1 parent dcb406a
commit ed40c14
Show file tree

Hide file tree

Showing 83 changed files with 659 additions and 580 deletions.
diff --git a/...0-Moonrise-Bitstorage-optimisations.patch → ...0-Moonrise-Bitstorage-optimisations.patch b/...0-Moonrise-Bitstorage-optimisations.patch → ...0-Moonrise-Bitstorage-optimisations.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 22 May 2024 14:14:30 -0700
 Subject: [PATCH] Moonrise: Bitstorage optimisations
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project: https://github.com/Tuinity/Moonrise
 

diff --git a/...onrise-block-counting-optimisations.patch → ...onrise-block-counting-optimisations.patch b/...onrise-block-counting-optimisations.patch → ...onrise-block-counting-optimisations.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 13 Aug 2024 23:53:27 -0700
 Subject: [PATCH] Moonrise: block counting optimisations
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project:
 - https://github.com/Tuinity/Moonrise

diff --git a/...ise-Optimise-BiomeManager-getFiddle.patch → ...ise-Optimise-BiomeManager-getFiddle.patch b/...ise-Optimise-BiomeManager-getFiddle.patch → ...ise-Optimise-BiomeManager-getFiddle.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 14 Aug 2024 17:52:47 -0700
 Subject: [PATCH] Moonrise: Optimise BiomeManager#getFiddle
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project: https://github.com/Tuinity/Moonrise
 

diff --git a/...end-chunk-radius-packet-from-Player.patch → ...end-chunk-radius-packet-from-Player.patch b/...end-chunk-radius-packet-from-Player.patch → ...end-chunk-radius-packet-from-Player.patch
@@ -4,6 +4,8 @@ Date: Mon, 2 Sep 2024 16:36:20 -0700
 Subject: [PATCH] Moonrise: Do not send chunk radius packet from
  PlayerList#setViewDistance
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project: https://github.com/Tuinity/Moonrise
 

diff --git a/...ct-lookup-by-chunk-for-NearbyPlayer.patch → ...ct-lookup-by-chunk-for-NearbyPlayer.patch b/...ct-lookup-by-chunk-for-NearbyPlayer.patch → ...ct-lookup-by-chunk-for-NearbyPlayer.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 4 Sep 2024 11:25:19 -0700
 Subject: [PATCH] Moonrise: Add direct lookup by chunk for NearbyPlayers
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project: https://github.com/Tuinity/Moonrise
 

diff --git a/...-countEntries-for-low-size-SimpleBi.patch → ...-countEntries-for-low-size-SimpleBi.patch b/...-countEntries-for-low-size-SimpleBi.patch → ...-countEntries-for-low-size-SimpleBi.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 17 Sep 2024 16:29:23 -0700
 Subject: [PATCH] Moonrise: Optimise countEntries for low size SimpleBitStorage
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project:
 - https://github.com/Tuinity/Moonrise

diff --git a/...Moonrise-fluid-method-optimisations.patch → ...Moonrise-fluid-method-optimisations.patch b/...Moonrise-fluid-method-optimisations.patch → ...Moonrise-fluid-method-optimisations.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 24 Oct 2024 08:20:45 -0700
 Subject: [PATCH] Moonrise: fluid method optimisations
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project:
 - https://github.com/Tuinity/Moonrise

diff --git a/...070-Moonrise-optimise-palette-reads.patch → ...070-Moonrise-optimise-palette-reads.patch b/...070-Moonrise-optimise-palette-reads.patch → ...070-Moonrise-optimise-palette-reads.patch
@@ -3,6 +3,8 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 24 Oct 2024 08:20:45 -0700
 Subject: [PATCH] Moonrise: optimise palette reads
 
+Removed since Leaf 1.21.3, Paper 1.21.3 included it
+
 Original license: GPLv3
 Original project:
 - https://github.com/Tuinity/Moonrise

diff --git a/...tream-in-RecipeManager-getRecipeFor.patch → ...tream-in-RecipeManager-getRecipeFor.patch b/...tream-in-RecipeManager-getRecipeFor.patch → ...tream-in-RecipeManager-getRecipeFor.patch
@@ -3,6 +3,7 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
 Date: Fri, 23 Aug 2024 20:22:00 -0400
 Subject: [PATCH] Remove stream in RecipeManager getRecipeFor
 
+Removed since Leaf 1.21.3, Merged & moved to Carpet-Fixes-Use-optimized-RecipeManager.patch
 
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 index febf87b14125925f548393360e89077329a6c522..de7537c4eacf6fa549f74fd329102a2e4865194a 100644

diff --git a/...karin-Save-Json-list-asynchronously.patch → ...karin-Save-Json-list-asynchronously.patch b/...karin-Save-Json-list-asynchronously.patch → ...karin-Save-Json-list-asynchronously.patch
diff --git a/.../server/0026-Slice-Smooth-Teleports.patch → .../server/0025-Slice-Smooth-Teleports.patch b/.../server/0026-Slice-Smooth-Teleports.patch → .../server/0025-Slice-Smooth-Teleports.patch
diff --git a/...chment-Make-FixLight-use-action-bar.patch → ...chment-Make-FixLight-use-action-bar.patch b/...chment-Make-FixLight-use-action-bar.patch → ...chment-Make-FixLight-use-action-bar.patch
diff --git a/...hes/server/0028-Leaves-Server-Utils.patch → ...hes/server/0027-Leaves-Server-Utils.patch b/...hes/server/0028-Leaves-Server-Utils.patch → ...hes/server/0027-Leaves-Server-Utils.patch
diff --git a/...es/server/0029-Leaves-Protocol-Core.patch → ...es/server/0028-Leaves-Protocol-Core.patch b/...es/server/0029-Leaves-Protocol-Core.patch → ...es/server/0028-Leaves-Protocol-Core.patch
diff --git a/...es/server/0030-Leaves-Jade-Protocol.patch → ...es/server/0029-Leaves-Jade-Protocol.patch b/...es/server/0030-Leaves-Jade-Protocol.patch → ...es/server/0029-Leaves-Jade-Protocol.patch
diff --git a/...rver/0031-Leaves-Appleskin-Protocol.patch → ...rver/0030-Leaves-Appleskin-Protocol.patch b/...rver/0031-Leaves-Appleskin-Protocol.patch → ...rver/0030-Leaves-Appleskin-Protocol.patch
diff --git a/...rver/0032-Leaves-Xaero-Map-Protocol.patch → ...rver/0031-Leaves-Xaero-Map-Protocol.patch b/...rver/0032-Leaves-Xaero-Map-Protocol.patch → ...rver/0031-Leaves-Xaero-Map-Protocol.patch
diff --git a/...ver/0033-Leaves-Syncmatica-Protocol.patch → ...ver/0032-Leaves-Syncmatica-Protocol.patch b/...ver/0033-Leaves-Syncmatica-Protocol.patch → ...ver/0032-Leaves-Syncmatica-Protocol.patch
diff --git a/...hes/server/0034-Chat-Image-protocol.patch → ...hes/server/0033-Chat-Image-protocol.patch b/...hes/server/0034-Chat-Image-protocol.patch → ...hes/server/0033-Chat-Image-protocol.patch
diff --git a/...hes/server/0035-Asteor-Bar-protocol.patch → ...hes/server/0034-Asteor-Bar-protocol.patch b/...hes/server/0035-Asteor-Bar-protocol.patch → ...hes/server/0034-Asteor-Bar-protocol.patch
diff --git a/...s/server/0037-Leaves-Replay-Mod-API.patch → ...s/server/0035-Leaves-Replay-Mod-API.patch b/...s/server/0037-Leaves-Replay-Mod-API.patch → ...s/server/0035-Leaves-Replay-Mod-API.patch
diff --git a/...ves-Disable-moved-wrongly-threshold.patch → ...ves-Disable-moved-wrongly-threshold.patch b/...ves-Disable-moved-wrongly-threshold.patch → ...ves-Disable-moved-wrongly-threshold.patch
@@ -7,10 +7,10 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0abef2fd45d384583272a183bae42df5cbacfcec..39428db6c83527c085f4dcb012b4da297840bca6 100644
+index 6f00bc85205a4c481d85f95e30aeb61ab3db1e8a..68cf6f0f0d2d1eb23de070ea8471111a41a9f9bf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -588,7 +588,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -593,7 +593,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  }
                  // Paper end - Prevent moving into unloaded chunks
 
@@ -19,7 +19,7 @@ index 0abef2fd45d384583272a183bae42df5cbacfcec..39428db6c83527c085f4dcb012b4da29
                  // 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));
-@@ -624,7 +624,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -629,7 +629,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  d10 = d6 * d6 + d7 * d7 + d8 * d8;
                  boolean flag2 = false;
 
@@ -28,7 +28,7 @@ index 0abef2fd45d384583272a183bae42df5cbacfcec..39428db6c83527c085f4dcb012b4da29
                      flag2 = true; // Paper - diff on change, this should be moved wrongly
                      ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
                  }
-@@ -1478,7 +1478,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1490,7 +1490,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 0abef2fd45d384583272a183bae42df5cbacfcec..39428db6c83527c085f4dcb012b4da29
                                                  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;
-@@ -1548,7 +1548,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1560,7 +1560,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              d10 = d6 * d6 + d7 * d7 + d8 * d8;
                              boolean movedWrongly = false; // Paper - Add fail move event; rename
 

diff --git a/...dom-for-xaeroMapServerID-generation.patch → ...dom-for-xaeroMapServerID-generation.patch b/...dom-for-xaeroMapServerID-generation.patch → ...dom-for-xaeroMapServerID-generation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Faster Random for xaeroMapServerID generation
 
 
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
-index 1d8d321ac3f6c8bf12afe22d8b3f37655fa8c46c..62fc12c13b8294dab45da4e250bf2e7680744c83 100644
+index a81c0a7bc71b86eb652abcd06099d36f4de71ae9..c17e3484ced6d1fb6083dde7c68f8a5a03de0c4e 100644
 --- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 +++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
 @@ -3,7 +3,7 @@ package org.dreeam.leaf.config.modules.network;
@@ -17,7 +17,7 @@ index 1d8d321ac3f6c8bf12afe22d8b3f37655fa8c46c..62fc12c13b8294dab45da4e250bf2e76
 
  public class ProtocolSupport extends ConfigModules {
 
-@@ -16,7 +16,7 @@ public class ProtocolSupport extends ConfigModules {
+@@ -17,7 +17,7 @@ public class ProtocolSupport extends ConfigModules {
      public static boolean asteorBarProtocol = false;
      public static boolean chatImageProtocol = false;
      public static boolean xaeroMapProtocol = false;