Rebuild

README.md

@@ -64,4 +64,4 @@ Binaries are licensed under GPL-3.0.
 
 ## TODO
 check Simpler ShapelessRecipe comparison for vanilla patch
-check fix MC-26304 (needs tryParse? or just parse)
+check fix MC-26304 (needs tryParse? or just parse or withDefaultNamespace)

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=56b5b7d452e8173ee005c941010632aeb6dbecaf
+paperRef=5e7cd0784b877020c9b418f3d79268ce9bb854fb
 
 updatingMinecraft=true
 

patches/server/0029-Cache-on-climbable-check.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5021c4618c8302e103fb2595a8d3df26f7479140..8676206457ec59bf711d3f4a2836ff47fea23bb6 100644
+index 9df4c6e056dd9eabd1128a8cc9756c14fb277a11..143d41af6a1e08a27cf53b6323d54c9605c44a62 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;

patches/server/0041-Reduce-in-wall-checks.patch

@@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth
 keeping it.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8676206457ec59bf711d3f4a2836ff47fea23bb6..6c0772f4bb5060d5c9649918257838594a582e65 100644
+index 143d41af6a1e08a27cf53b6323d54c9605c44a62..c24ee33a3c57c8380aa6f0ad7f60baf42b98f1ab 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -447,7 +447,10 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0069-Fix-MC-26304.patch

@@ -12,19 +12,6 @@ By: etil2jz <81570777+etil2jz@users.noreply.github.com>
 As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
-diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
-index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..8e478ce995cb4b3b33da68396ebaea5240800cb2 100644
---- a/src/main/java/net/minecraft/resources/ResourceLocation.java
-+++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
-@@ -36,7 +36,7 @@ public final class ResourceLocation implements Comparable<ResourceLocation> {
-     private final String namespace;
-     private final String path;
- 
--    private ResourceLocation(String namespace, String path) {
-+    private ResourceLocation(String namespace, String path) { // Gale start - Mirai - fix MC-26304 - private -> public
-         assert isValidNamespace(namespace);
- 
-         assert isValidPath(path);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
 index a2fafef89d5354e2cb02f5672810909950a57777..c785362f145dd9605bc01bd3b8b8118f71404d8f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java

patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch

@@ -54,34 +54,11 @@ index ddf47dab1ab92c45e3eea09239d418a9798ed59e..95ac8f4af849523e25b95b624d59f9f5
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java.rej b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java.rej
-new file mode 100644
-index 0000000000000000000000000000000000000000..835eb6436cd0d2b9698abd879c3d04e86d790ea3
---- /dev/null
-+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java.rej
-@@ -0,0 +1,9 @@
-+diff a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java	(rejected hunks)
-+@@ -167,6 +167,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
-+ 
-+     public static void teleportEntity(Level world, BlockPos pos, BlockState state, Entity entity, TheEndGatewayBlockEntity blockEntity) {
-+         if (world instanceof ServerLevel worldserver && !blockEntity.isCoolingDown()) {
-++            if (entity.level().galeConfig().gameplayMechanics.fixes.checkCanChangeDimensionsBeforeUseEndGateway && world.galeConfig().gameplayMechanics.fixes.checkCanChangeDimensionsBeforeUseEndGateway && !entity.canChangeDimensions()) return; // Gale - Purpur - end gateway should check if entity can use portal
-+             blockEntity.teleportCooldown = 100;
-+             BlockPos blockposition1;
-+ 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..0f205f02ce0553fb1f8db8aa903861102a570708 100644
+index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..d7743dc516032a7c8942bce116244e7893e79e0b 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -100,6 +100,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
-         public class Fixes extends ConfigurationPart {
- 
-             public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
-+            public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal
- 
-             // Gale start - Purpur - fix MC-238526
-             @Setting("mc-238526")
-@@ -123,6 +124,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -123,6 +123,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
  
          }
  

patches/server/0082-Check-frozen-ticks-before-landing-block.patch

@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6c0772f4bb5060d5c9649918257838594a582e65..b7c02647d7d143e2462057792bafed96648973d7 100644
+index c24ee33a3c57c8380aa6f0ad7f60baf42b98f1ab..7bdf29e3f71aa995a3125176ef4e62c7a6d4d8fe 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -565,11 +565,10 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0091-Optimize-sheep-offspring-color.patch

@@ -147,7 +147,7 @@ index 38ac2759894660be1ee7ba59b0bd1270158e9232..eccb524111cec32ed55722817529e6ab
          DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
          CraftingInput craftinginput = Sheep.makeCraftInput(enumcolor, enumcolor1);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 0f205f02ce0553fb1f8db8aa903861102a570708..19115238d0fd845a788446d88d9ec9a52762c367 100644
+index d7743dc516032a7c8942bce116244e7893e79e0b..89d451b322e9308dfcf7b6579ab558fa7bbc404f 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch

@@ -31,10 +31,10 @@ index db0be6ca1ae9c78b8143a7f6a13889d68a0afe38..4dd79b1595406dfd93b2dd6e2ef56f7b
  
          this.firstTick = false;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 19115238d0fd845a788446d88d9ec9a52762c367..5d499e77800466210473e36b2355873807b9f86a 100644
+index 89d451b322e9308dfcf7b6579ab558fa7bbc404f..38488750f556ebae7ed41a24b88f5752f3b54ec7 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -127,6 +127,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -126,6 +126,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
  
          public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
          public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration

patches/server/0094-Reduce-block-destruction-packet-allocations.patch

@@ -13,10 +13,10 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e01481a889877ba898a8af9a13e4f83c842a18c6..9e663983f3f9f73d49ebf8b7d77f995e14440ce4 100644
+index e018f5686406b58e09c9b62a9bcd4982c8aed905..29a8a8ff340eb1d14e691257e523c8624c760613 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1483,7 +1483,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1468,7 +1468,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
      @Override
      public void destroyBlockProgress(int entityId, BlockPos pos, int progress) {
@@ -35,7 +35,7 @@ index e01481a889877ba898a8af9a13e4f83c842a18c6..9e663983f3f9f73d49ebf8b7d77f995e
  
          // CraftBukkit start
          Player entityhuman = null;
-@@ -1517,7 +1527,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1502,7 +1512,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                  // CraftBukkit end
  
                  if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {

patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch

@@ -33,10 +33,10 @@ index 4dd79b1595406dfd93b2dd6e2ef56f7bf4db65c6..e22174b5c5927fca637167e4a752c415
              entity.restoreFrom(this);
              entity.moveTo(destX, destY, destZ, yaw, f2);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 5d499e77800466210473e36b2355873807b9f86a..50202c41535f823240e9e8fd5348e3d474814c1b 100644
+index 38488750f556ebae7ed41a24b88f5752f3b54ec7..4c9bb806aa6509894de7f09b633c0c3d74b17233 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -125,6 +125,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -124,6 +124,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
  
          }
  

patches/server/0101-Don-t-load-chunks-to-spawn-phantoms.patch

@@ -34,7 +34,7 @@ index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..ae1e164285f5675371bf036c8a564d9f
  
                                          if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 50202c41535f823240e9e8fd5348e3d474814c1b..fb7159842ae81899514267fcaba077638d999348 100644
+index 4c9bb806aa6509894de7f09b633c0c3d74b17233..7f13c5c2a9185104cd958b75c45f4ba02cda0c95 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -92,6 +92,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch

@@ -28,7 +28,7 @@ index e22174b5c5927fca637167e4a752c415a613821a..9c781d585d3ec7e42c036f8ee4e1a38a
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b7c02647d7d143e2462057792bafed96648973d7..909ec5647acf1d499eb99fd7339d8416cc370e25 100644
+index 7bdf29e3f71aa995a3125176ef4e62c7a6d4d8fe..93f9905bbb47d89c746957f4e3e75e13322e2a5e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2042,19 +2042,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -79,7 +79,7 @@ index b7c02647d7d143e2462057792bafed96648973d7..909ec5647acf1d499eb99fd7339d8416
              if (iblockdata.is(BlockTags.CLIMBABLE)) {
                  this.lastClimbablePos = Optional.of(blockposition);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index fb7159842ae81899514267fcaba077638d999348..627d56be7682cad2c713911a3a3603079d109573 100644
+index 7f13c5c2a9185104cd958b75c45f4ba02cda0c95..269393f8b56ed5b5e37879c23fe1e28b5a82ebe0 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -95,6 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0103-Broadcast-crit-animations-as-the-entity-being-critte.patch

@@ -38,7 +38,7 @@ index 79b49aec7c5c80948b8f1c77ca6e48049dae174e..a70317f5b5cf0fc5ab80782e6f22e76d
  
      @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 627d56be7682cad2c713911a3a3603079d109573..dee63c199cd11a95b5bf7b1e70803c83f0e45511 100644
+index 269393f8b56ed5b5e37879c23fe1e28b5a82ebe0..687549714e928ea74be154c84d04ffd453dc324d 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -106,6 +106,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -47,5 +47,5 @@ index 627d56be7682cad2c713911a3a3603079d109573..dee63c199cd11a95b5bf7b1e70803c83
  
 +            public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted
              public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
-             public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal
  
+             // Gale start - Purpur - fix MC-238526

patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch

@@ -13,12 +13,12 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index a65c844d9dc715f75849e5cb665250dfa036af08..0ca299ab0859a9bb0060539d692d3e77f228dc5d 100644
+index 4d12a8972007377b6541143e9a29b78b825cff68..510b29649346375b2dfea606ac722ea2c063a91a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -485,11 +485,16 @@ public class ServerChunkCache extends ChunkSource {
+@@ -484,11 +484,16 @@ public class ServerChunkCache extends ChunkSource {
+             }
  
-             this.level.resetIceAndSnowTick(); // Gale - Airplane - optimize random calls in chunk ticking - reset ice & snow tick random
              if (this.level.tickRateManager().runsNormally()) {
 +                // Gale start - MultiPaper - skip unnecessary mob spawning computations
 +                NaturalSpawner.SpawnState spawnercreature_d; // moved down
@@ -34,7 +34,7 @@ index a65c844d9dc715f75849e5cb665250dfa036af08..0ca299ab0859a9bb0060539d692d3e77
                  if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
                      // re-set mob counts
                      for (ServerPlayer player : this.level.players) {
-@@ -513,7 +518,11 @@ public class ServerChunkCache extends ChunkSource {
+@@ -512,7 +517,11 @@ public class ServerChunkCache extends ChunkSource {
                  this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
  
                  this.lastSpawnState = spawnercreature_d;
@@ -47,7 +47,7 @@ index a65c844d9dc715f75849e5cb665250dfa036af08..0ca299ab0859a9bb0060539d692d3e77
  
                  Util.shuffle(list, this.level.random);
                  // Paper start - PlayerNaturallySpawnCreaturesEvent
-@@ -536,7 +545,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -535,7 +544,7 @@ public class ServerChunkCache extends ChunkSource {
  
                      if (this.level.isNaturalSpawningAllowed(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(chunkcoordintpair)) {
                          chunk1.incrementInhabitedTime(j);
@@ -56,7 +56,7 @@ index a65c844d9dc715f75849e5cb665250dfa036af08..0ca299ab0859a9bb0060539d692d3e77
                              NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
                          }
  
-@@ -562,6 +571,20 @@ public class ServerChunkCache extends ChunkSource {
+@@ -561,6 +570,20 @@ public class ServerChunkCache extends ChunkSource {
          }
      }
  

patches/server/0106-Prevent-entities-random-strolling-into-non-ticking-c.patch

@@ -36,10 +36,10 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..9e4d0493aa814a392742c9ddc1815211
              } else {
                  this.wantedX = vec3.x;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index dee63c199cd11a95b5bf7b1e70803c83f0e45511..758cc7862121e7c27db5e087f816aab566320162 100644
+index 687549714e928ea74be154c84d04ffd453dc324d..76718d966a326ba82a92217a9f0fdf5b17f9d643 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -138,6 +138,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -137,6 +137,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
          }
  
          public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable