even moaar patches

patches/api/Added-Vanilla-Entity-Tags.patch

@@ -18,37 +18,37 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #REGISTRY_ENTITY_TYPES}
 +     */
 +    @Deprecated(forRemoval = true)
-+    String REGISTRY_ENTITIES = "entities";
++    String REGISTRY_ENTITIES = REGISTRY_ENTITY_TYPES;
 +    /**
 +     * Vanilla entity tag representing arrow entities.
 +     * @deprecated use {@link #ENTITY_TYPES_ARROWS}
 +     */
 +    @Deprecated(forRemoval = true)
-+    Tag<org.bukkit.entity.EntityType> ARROWS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("arrows"), org.bukkit.entity.EntityType.class);
++    Tag<EntityType> ARROWS = ENTITY_TYPES_ARROWS;
 +    /**
 +     * Vanilla entity tag representing entities that live in beehives
 +     * @deprecated use {@link #ENTITY_TYPES_BEEHIVE_INHABITORS}
 +     */
 +    @Deprecated(forRemoval = true)
-+    Tag<org.bukkit.entity.EntityType> BEEHIVE_INHABITORS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("beehive_inhabitors"), org.bukkit.entity.EntityType.class);
++    Tag<EntityType> BEEHIVE_INHABITORS = ENTITY_TYPES_BEEHIVE_INHABITORS;
 +    /**
 +     * Vanilla entity tag representing projectiles that impact
 +     * @deprecated use {@link #ENTITY_TYPES_IMPACT_PROJECTILES}
 +     */
 +    @Deprecated(forRemoval = true)
-+    Tag<org.bukkit.entity.EntityType> IMPACT_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("impact_projectiles"), org.bukkit.entity.EntityType.class);
++    Tag<EntityType> IMPACT_PROJECTILES = ENTITY_TYPES_IMPACT_PROJECTILES;
 +    /**
 +     * Vanilla entity tag for village raiders
 +     * @deprecated use {@link #ENTITY_TYPES_RAIDERS}
 +     */
 +    @Deprecated(forRemoval = true)
-+    Tag<org.bukkit.entity.EntityType> RAIDERS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("raiders"), org.bukkit.entity.EntityType.class);
++    Tag<EntityType> RAIDERS = ENTITY_TYPES_RAIDERS;
 +    /**
 +     * Vanilla entity tag for skeleton types
 +     * @deprecated use {@link #ENTITY_TYPES_SKELETONS}
 +     */
 +    @Deprecated(forRemoval = true)
-+    Tag<org.bukkit.entity.EntityType> SKELETONS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("skeletons"), org.bukkit.entity.EntityType.class);
++    Tag<EntityType> SKELETONS = ENTITY_TYPES_SKELETONS;
 +    // Paper end
  
      /**

patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch

@@ -9,16 +9,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
-         }
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
-+
+ 
 +    public boolean enderDragonsDeathAlwaysPlacesDragonEgg = false;
 +    private void enderDragonsDeathAlwaysPlacesDragonEgg() {
 +        enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
 +    }
- }
- 
++
+     public boolean phantomIgnoreCreative = true;
+     public boolean phantomOnlyAttackInsomniacs = true;
+     private void phantomSettings() {
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java

patches/server/MC-Utils.patch

@@ -6936,6 +6936,43 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        throw new UnsupportedOperationException("Not supported.");
 +    }
 +}
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     private static final Map<Material, Item> MATERIAL_ITEM = new HashMap<>();
+     private static final Map<Material, Block> MATERIAL_BLOCK = new HashMap<>();
+     private static final Map<Material, net.minecraft.world.level.material.Fluid> MATERIAL_FLUID = new HashMap<>();
++    // Paper start
++    private static final Map<org.bukkit.entity.EntityType, net.minecraft.world.entity.EntityType<?>> ENTITY_TYPE_ENTITY_TYPES = new HashMap<>();
++    private static final Map<net.minecraft.world.entity.EntityType<?>, org.bukkit.entity.EntityType> ENTITY_TYPES_ENTITY_TYPE = new HashMap<>();
+ 
+     static {
++        for (org.bukkit.entity.EntityType type : org.bukkit.entity.EntityType.values()) {
++            if (type == org.bukkit.entity.EntityType.UNKNOWN) continue;
++            ENTITY_TYPE_ENTITY_TYPES.put(type, net.minecraft.core.Registry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())));
++            ENTITY_TYPES_ENTITY_TYPE.put(net.minecraft.core.Registry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())), type);
++        }
++        // Paper end
+         for (Block block : net.minecraft.core.Registry.BLOCK) {
+             BLOCK_MATERIAL.put(block, Material.getMaterial(net.minecraft.core.Registry.BLOCK.getKey(block).getPath().toUpperCase(Locale.ROOT)));
+         }
+@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public static ResourceLocation key(Material mat) {
+         return CraftNamespacedKey.toMinecraft(mat.getKey());
+     }
++    // Paper start
++    public static net.minecraft.world.entity.EntityType<?> getEntityTypes(org.bukkit.entity.EntityType type) {
++        return ENTITY_TYPE_ENTITY_TYPES.get(type);
++    }
++    public static org.bukkit.entity.EntityType getEntityType(net.minecraft.world.entity.EntityType<?> entityTypes) {
++        return ENTITY_TYPES_ENTITY_TYPE.get(entityTypes);
++    }
++    // Paper end
+     // ========================================================================
+ 
+     public static byte toLegacyData(BlockState data) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java

patches/server/Timings-v2.patch

@@ -2118,8 +2118,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return CraftNamespacedKey.toMinecraft(mat.getKey());
      }
+     // Paper end
      // ========================================================================
 +    // Paper start
 +    @Override

patches/unapplied/server/Added-Vanilla-Entity-Tags.patch

@@ -1,94 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 20:03:35 -0800
-Subject: [PATCH] Added Vanilla Entity Tags
-
-
-diff --git a/src/main/java/io/papermc/paper/CraftEntityTag.java b/src/main/java/io/papermc/paper/CraftEntityTag.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/CraftEntityTag.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper;
-+
-+import org.bukkit.craftbukkit.tag.CraftTag;
-+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-+import org.bukkit.entity.EntityType;
-+
-+import java.util.Collections;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.tags.TagCollection;
-+
-+@Deprecated(forRemoval = true)
-+public class CraftEntityTag extends CraftTag<net.minecraft.world.entity.EntityType<?>, EntityType> {
-+
-+    public CraftEntityTag(TagCollection<net.minecraft.world.entity.EntityType<?>> registry, ResourceLocation tag) {
-+        super(registry, tag);
-+    }
-+
-+    @Override
-+    public boolean isTagged(EntityType item) {
-+        return getHandle().contains(CraftMagicNumbers.getEntityTypes(item));
-+    }
-+
-+    @Override
-+    public Set<EntityType> getValues() {
-+        return Collections.unmodifiableSet(getHandle().getValues().stream().map(CraftMagicNumbers::getEntityType).collect(Collectors.toSet()));
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-                 Preconditions.checkArgument(clazz == org.bukkit.entity.EntityType.class, "Entity type namespace must have entity type");
- 
-                 return (org.bukkit.Tag<T>) new CraftEntityTag(EntityTypeTags.getAllTags(), key);
-+            // Paper start
-+            case org.bukkit.Tag.REGISTRY_ENTITIES:
-+                Preconditions.checkArgument(clazz == org.bukkit.entity.EntityType.class, "Entity namespace must have entitytype type");
-+                return (org.bukkit.Tag<T>) new io.papermc.paper.CraftEntityTag(net.minecraft.tags.EntityTypeTags.getAllTags(), key);
-+            // Paper end
-             default:
-                 throw new IllegalArgumentException();
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     private static final Map<Material, Item> MATERIAL_ITEM = new HashMap<>();
-     private static final Map<Material, Block> MATERIAL_BLOCK = new HashMap<>();
-     private static final Map<Material, net.minecraft.world.level.material.Fluid> MATERIAL_FLUID = new HashMap<>();
-+    // Paper start
-+    private static final Map<org.bukkit.entity.EntityType, net.minecraft.world.entity.EntityType<?>> ENTITY_TYPE_ENTITY_TYPES = new HashMap<>();
-+    private static final Map<net.minecraft.world.entity.EntityType<?>, org.bukkit.entity.EntityType> ENTITY_TYPES_ENTITY_TYPE = new HashMap<>();
- 
-     static {
-+        for (org.bukkit.entity.EntityType type : org.bukkit.entity.EntityType.values()) {
-+            if (type == org.bukkit.entity.EntityType.UNKNOWN) continue;
-+            ENTITY_TYPE_ENTITY_TYPES.put(type, net.minecraft.core.Registry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())));
-+            ENTITY_TYPES_ENTITY_TYPE.put(net.minecraft.core.Registry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())), type);
-+        }
-+        // Paper end
-         for (Block block : net.minecraft.core.Registry.BLOCK) {
-             BLOCK_MATERIAL.put(block, Material.getMaterial(net.minecraft.core.Registry.BLOCK.getKey(block).getPath().toUpperCase(Locale.ROOT)));
-         }
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public static ResourceLocation key(Material mat) {
-         return CraftNamespacedKey.toMinecraft(mat.getKey());
-     }
-+    // Paper start
-+    public static net.minecraft.world.entity.EntityType<?> getEntityTypes(org.bukkit.entity.EntityType type) {
-+        return ENTITY_TYPE_ENTITY_TYPES.get(type);
-+    }
-+    public static org.bukkit.entity.EntityType getEntityType(net.minecraft.world.entity.EntityType<?> entityTypes) {
-+        return ENTITY_TYPES_ENTITY_TYPE.get(entityTypes);
-+    }
-+    // Paper end
-     // ========================================================================
-     // Paper start
-     @Override