Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@0f0f600 Updated Upstream (Paper)
PurpurMC/Purpur@d8e95e0 Updated Upstream (Paper)
PurpurMC/Purpur@e1603ae Updated Upstream (Paper)

patches/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
-Date: Sat, 13 Jan 2024 18:58:14 +0300
-Subject: [PATCH] Carpet-Fixes: RecipeManager Optimize
-
-Original project: https://github.com/fxmorin/carpet-fixes
-Improves: [Blast]Furnace/Campfire/Smoker/Stonecutter/Crafting/Sheep Color Choosing
-
-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 a31326e24cb68472c81cd781c5e3041772712862..6113cf0ff4090e06c40a6f439fde07bf74a34745 100644
---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-@@ -12,15 +12,7 @@ import com.google.gson.JsonObject;
- import com.google.gson.JsonParseException;
- import com.mojang.logging.LogUtils;
- import com.mojang.serialization.JsonOps;
--import java.util.Collection;
--import java.util.Comparator;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Map;
--import java.util.Map.Entry;
--import java.util.Optional;
--import java.util.stream.Collectors;
--import java.util.stream.Stream;
-+import java.util.*;
- import javax.annotation.Nullable;
- import net.minecraft.core.HolderLookup;
- import net.minecraft.core.NonNullList;
-@@ -132,7 +124,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
-     }
- 
-     public <C extends Container, T extends Recipe<C>> List<RecipeHolder<T>> getAllRecipesFor(RecipeType<T> type) {
--        return List.copyOf(this.byType(type));
-+        return space.bxteam.divinemc.configuration.DivineConfig.recipeManagerOptimization ? new ArrayList<>(this.byType(type)) : List.copyOf(this.byType(type)); // DivineMC - Carpet-Fixes: RecipeManager Optimize
-     }
- 
-     public <C extends Container, T extends Recipe<C>> List<RecipeHolder<T>> getRecipesFor(RecipeType<T> type, C inventory, Level world) {
-diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-index 73b6c3590dad95cddd9cc1a1cff36492175da232..67ff4450b58c1df2f595a136c53d60bbefa2e8d5 100644
---- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-+++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-@@ -154,7 +154,9 @@ public class DivineConfig {
-     }
- 
-     public static boolean biomeManagerOptimization = true;
-+    public static boolean recipeManagerOptimization = true;
-     private static void optimizations() {
-         biomeManagerOptimization = getBoolean("settings.optimizations.biome-manager-optimization", biomeManagerOptimization);
-+        recipeManagerOptimization = getBoolean("settings.optimizations.recipe-manager-optimization", recipeManagerOptimization);
-     }
- }

patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch

@@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4e6fccec4f5ca14562bf5bae495ac36c14982d85..be8870d01262b37d130d518a500db7117f568950 100644
+index 345f143b0eeb77acb96e4bc716f3b23782ac782f..97545fd84b9b1716e9847cac9e233742ea7f9252 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,8 @@ import org.slf4j.Logger;

patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch

@@ -62,17 +62,16 @@ index 6b1244d3957e7f62c96ffd34692b8916337839fd..994d81bb16040439ecbdf427dfde70d2
      private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) {
          TransientCraftingContainer transientcraftingcontainer = new TransientCraftingContainer(new AbstractContainerMenu((MenuType) null, -1) {
 diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-index 67ff4450b58c1df2f595a136c53d60bbefa2e8d5..13ea61e380ea8d0772107b06008bf86e274e5f91 100644
+index 73b6c3590dad95cddd9cc1a1cff36492175da232..bf550fa360f69b714ac346333c78d7f8de2a71b9 100644
 --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
-@@ -155,8 +155,10 @@ public class DivineConfig {
+@@ -154,7 +154,9 @@ public class DivineConfig {
+     }
  
      public static boolean biomeManagerOptimization = true;
-     public static boolean recipeManagerOptimization = true;
 +    public static boolean sheepOptimization = true;
      private static void optimizations() {
          biomeManagerOptimization = getBoolean("settings.optimizations.biome-manager-optimization", biomeManagerOptimization);
-         recipeManagerOptimization = getBoolean("settings.optimizations.recipe-manager-optimization", recipeManagerOptimization);
 +        sheepOptimization = getBoolean("settings.optimizations.sheep-optimization", sheepOptimization);
      }
  }

patches/server/0032-Suppress-errors-from-dirty-attributes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 39e7dcf3c92c9203c190782be401c00c010b8aeb..78ce9687a163255098eb8408dacefa1c9525b636 100644
+index dd6278fe99e2ee4daa95249c71ea935dd08b0025..7e2bd649b3525ccd5db052f83c9b8818d7f13d78 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -386,7 +386,10 @@ public class ServerEntity {
+@@ -394,7 +394,10 @@ public class ServerEntity {
          }
  
          if (this.entity instanceof LivingEntity) {
@@ -20,7 +20,7 @@ index 39e7dcf3c92c9203c190782be401c00c010b8aeb..78ce9687a163255098eb8408dacefa1c
  
              if (!set.isEmpty()) {
                  // CraftBukkit start - Send scaled max health
-@@ -397,7 +400,7 @@ public class ServerEntity {
+@@ -405,7 +408,7 @@ public class ServerEntity {
                  this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
              }