Break MushroomCow parent

MushroomCows no longer are direct child types of Cows, as Cows have
their own variant.
The commit for now breaks the API by introducing a new parent type,
similar to the vanilla implementation. The commit does not include
potential bytecode rewriting or other compatibility measures.

Author: lynxplay

build-data/paper.at

@@ -281,6 +281,7 @@ public net.minecraft.world.entity.animal.Fox setDefending(Z)V
 public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
 public net.minecraft.world.entity.animal.Fox setSleeping(Z)V
 public net.minecraft.world.entity.animal.Fox setVariant(Lnet/minecraft/world/entity/animal/Fox$Variant;)V
+public net.minecraft.world.entity.animal.MushroomCow setVariant(Lnet/minecraft/world/entity/animal/MushroomCow$Variant;)V
 public net.minecraft.world.entity.animal.MushroomCow stewEffects
 public net.minecraft.world.entity.animal.Ocelot isTrusting()Z
 public net.minecraft.world.entity.animal.Ocelot setTrusting(Z)V

paper-api/src/main/java/org/bukkit/entity/AbstractCow.java

@@ -0,0 +1,18 @@
+package org.bukkit.entity;
+
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * This interface defines or represents the abstract concept of cow-like
+ * entities on the server. The interface is hence not a direct representation
+ * of an entity but rather serves as a parent to interfaces/entity types like
+ * {@link Cow} or {@link MushroomCow}.
+ */
+@NullMarked
+public interface AbstractCow extends Animals {
+
+}

paper-api/src/main/java/org/bukkit/entity/MushroomCow.java

@@ -8,7 +8,7 @@
 /**
  * Represents a mushroom {@link Cow}
  */
-public interface MushroomCow extends Cow, io.papermc.paper.entity.Shearable { // Paper
+public interface MushroomCow extends AbstractCow, io.papermc.paper.entity.Shearable { // Paper
 
     /**
      * Checks for the presence of custom potion effects to be applied to the

paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch

@@ -173,7 +173,7 @@
 +                        net.minecraft.world.level.block.state.BlockState blockData = serverLevel.getBlockState(position);
 +
 +                        if (blockData.getBlock() instanceof net.minecraft.world.level.block.BedBlock) {
-+                            serverLevel.blockUpdated(position, net.minecraft.world.level.block.Blocks.AIR);
++                            serverLevel.updateNeighborsAt(position, net.minecraft.world.level.block.Blocks.AIR);
 +                            blockData.updateNeighbourShapes(serverLevel, position, 3);
 +                        }
 +                    }

paper-server/patches/sources/net/minecraft/world/level/Level.java.patch

@@ -455,7 +455,7 @@
 +
 +            // CraftBukkit start - SPIGOT-5710
 +            if (!this.preventPoiUpdated) {
-+                this.onBlockStateChange(blockposition, iblockdata1, iblockdata2);
++                this.updatePOIOnBlockStateChange(blockposition, iblockdata1, iblockdata2);
 +            }
 +            // CraftBukkit end
 +        }

paper-server/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java

@@ -112,7 +112,7 @@ private static int fetchDistanceFromGitHub(final String repo, final String branc
             final HttpURLConnection connection = (HttpURLConnection) URI.create("https://api.github.com/repos/%s/compare/%s...%s".formatted(repo, branch, hash)).toURL().openConnection();
             connection.connect();
             if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return DISTANCE_UNKNOWN; // Unknown commit
-            try (final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) {
+            try (final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
                 final JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
                 final String status = obj.get("status").getAsString();
                 return switch (status) {

paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java

@@ -4,9 +4,10 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
+import net.minecraft.advancements.critereon.DataComponentMatchers;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
-import net.minecraft.core.component.DataComponentPredicate;
+import net.minecraft.core.component.DataComponentExactPredicate;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.LockCode;
@@ -112,7 +113,7 @@ public boolean isLocked() {
 
     @Override
     public String getLock() {
-        Optional<? extends Component> customName = this.getSnapshot().lockKey.predicate().components().asPatch().get(DataComponents.CUSTOM_NAME);
+        Optional<? extends Component> customName = this.getSnapshot().lockKey.predicate().components().exact().asPatch().get(DataComponents.CUSTOM_NAME);
 
         return (customName != null) ? customName.map(CraftChatMessage::fromComponent).orElse("") : "";
     }
@@ -122,8 +123,8 @@ public void setLock(String key) {
         if (key == null) {
             this.getSnapshot().lockKey = LockCode.NO_LOCK;
         } else {
-            DataComponentPredicate predicate = DataComponentPredicate.builder().expect(DataComponents.CUSTOM_NAME, CraftChatMessage.fromStringOrNull(key)).build();
-            this.getSnapshot().lockKey = new LockCode(new ItemPredicate(Optional.empty(), MinMaxBounds.Ints.ANY, predicate, Collections.emptyMap()));
+            DataComponentExactPredicate predicate = DataComponentExactPredicate.builder().expect(DataComponents.CUSTOM_NAME, CraftChatMessage.fromStringOrNull(key)).build();
+            this.getSnapshot().lockKey = new LockCode(new ItemPredicate(Optional.empty(), MinMaxBounds.Ints.ANY, new DataComponentMatchers(predicate, Collections.emptyMap())));
         }
     }
 

paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java

@@ -2,9 +2,10 @@
 
 import java.util.Collections;
 import java.util.Optional;
+import net.minecraft.advancements.critereon.DataComponentMatchers;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
-import net.minecraft.core.component.DataComponentPredicate;
+import net.minecraft.core.component.DataComponentExactPredicate;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.LockCode;
@@ -33,7 +34,7 @@ public boolean isLocked() {
 
     @Override
     public String getLock() {
-        Optional<? extends Component> customName = this.getSnapshot().lockKey.predicate().components().asPatch().get(DataComponents.CUSTOM_NAME);
+        Optional<? extends Component> customName = this.getSnapshot().lockKey.predicate().components().exact().asPatch().get(DataComponents.CUSTOM_NAME);
 
         return (customName != null) ? customName.map(CraftChatMessage::fromComponent).orElse("") : "";
     }
@@ -43,8 +44,8 @@ public void setLock(String key) {
         if (key == null) {
             this.getSnapshot().lockKey = LockCode.NO_LOCK;
         } else {
-            DataComponentPredicate predicate = DataComponentPredicate.builder().expect(DataComponents.CUSTOM_NAME, CraftChatMessage.fromStringOrNull(key)).build();
-            this.getSnapshot().lockKey = new LockCode(new ItemPredicate(Optional.empty(), MinMaxBounds.Ints.ANY, predicate, Collections.emptyMap()));
+            DataComponentExactPredicate predicate = DataComponentExactPredicate.builder().expect(DataComponents.CUSTOM_NAME, CraftChatMessage.fromStringOrNull(key)).build();
+            this.getSnapshot().lockKey = new LockCode(new ItemPredicate(Optional.empty(), MinMaxBounds.Ints.ANY, new DataComponentMatchers(predicate, Collections.emptyMap())));
         }
     }
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractCow.java

@@ -0,0 +1,19 @@
+package org.bukkit.craftbukkit.entity;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.AbstractCow;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class CraftAbstractCow extends CraftAnimals implements AbstractCow {
+
+    public CraftAbstractCow(CraftServer server, net.minecraft.world.entity.animal.AbstractCow entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public net.minecraft.world.entity.animal.AbstractCow getHandle() {
+        return (net.minecraft.world.entity.animal.AbstractCow) this.entity;
+    }
+
+}

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java

@@ -14,7 +14,7 @@
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-public class CraftMushroomCow extends CraftCow implements MushroomCow, io.papermc.paper.entity.PaperShearable { // Paper
+public class CraftMushroomCow extends CraftAbstractCow implements MushroomCow, io.papermc.paper.entity.PaperShearable { // Paper
     public CraftMushroomCow(CraftServer server, net.minecraft.world.entity.animal.MushroomCow entity) {
         super(server, entity);
     }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java

@@ -15,7 +15,7 @@
 import org.bukkit.potion.PotionEffect;
 
 public class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion, org.bukkit.entity.SplashPotion, org.bukkit.entity.LingeringPotion { // Paper - implement other classes to avoid violating spawn method generic contracts
-    public CraftThrownPotion(CraftServer server, net.minecraft.world.entity.projectile.ThrownPotion entity) {
+    public CraftThrownPotion(CraftServer server, net.minecraft.world.entity.projectile.AbstractThrownPotion entity) {
         super(server, entity);
     }
 
@@ -62,7 +62,7 @@ public void splash() {
     }
     // Paper end
     @Override
-    public net.minecraft.world.entity.projectile.ThrownPotion getHandle() {
-        return (net.minecraft.world.entity.projectile.ThrownPotion) this.entity;
+    public net.minecraft.world.entity.projectile.AbstractThrownPotion getHandle() {
+        return (net.minecraft.world.entity.projectile.AbstractThrownPotion) this.entity;
     }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java

@@ -12,7 +12,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.util.Mth;
-import net.minecraft.util.random.WeightedRandomList;
+import net.minecraft.util.random.WeightedList;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelHeightAccessor;
@@ -286,7 +286,7 @@ public int getBaseHeight(int x, int z, Heightmap.Types heightmap, LevelHeightAcc
     }
 
     @Override
-    public WeightedRandomList<MobSpawnSettings.SpawnerData> getMobsAt(Holder<net.minecraft.world.level.biome.Biome> biome, StructureManager accessor, MobCategory group, BlockPos pos) {
+    public WeightedList<MobSpawnSettings.SpawnerData> getMobsAt(Holder<net.minecraft.world.level.biome.Biome> biome, StructureManager accessor, MobCategory group, BlockPos pos) {
         return this.delegate.getMobsAt(biome, accessor, group, pos);
     }
 

paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java

@@ -8,13 +8,14 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.kyori.adventure.text.Component;
+import net.minecraft.advancements.critereon.DataComponentMatchers;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
+import net.minecraft.core.component.DataComponentExactPredicate;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.core.component.DataComponentPredicate;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.component.PatchedDataComponentMap;
 import net.minecraft.nbt.CompoundTag;
@@ -158,9 +159,9 @@ public static CraftItemStack asNewCraftStack(Item item, int amount) {
 
     public static ItemPredicate asCriterionConditionItem(ItemStack original) {
         net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(original);
-        DataComponentPredicate predicate = DataComponentPredicate.allOf(PatchedDataComponentMap.fromPatch(DataComponentMap.EMPTY, nms.getComponentsPatch()));
+        DataComponentExactPredicate predicate = DataComponentExactPredicate.allOf(PatchedDataComponentMap.fromPatch(DataComponentMap.EMPTY, nms.getComponentsPatch()));
 
-        return new ItemPredicate(Optional.of(HolderSet.direct(nms.getItemHolder())), MinMaxBounds.Ints.ANY, predicate, Collections.emptyMap());
+        return new ItemPredicate(Optional.of(HolderSet.direct(nms.getItemHolder())), MinMaxBounds.Ints.ANY, new DataComponentMatchers(predicate, Collections.emptyMap()));
     }
 
     public net.minecraft.world.item.ItemStack handle;

paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java

@@ -3,8 +3,8 @@
 import com.google.common.base.Preconditions;
 import java.util.List;
 import java.util.Optional;
+import net.minecraft.core.component.DataComponentExactPredicate;
 import net.minecraft.core.component.DataComponentMap;
-import net.minecraft.core.component.DataComponentPredicate;
 import net.minecraft.core.component.PatchedDataComponentMap;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.trading.ItemCost;
@@ -139,11 +139,11 @@ public net.minecraft.world.item.trading.MerchantOffer toMinecraft() {
         List<ItemStack> ingredients = this.getIngredients();
         Preconditions.checkState(!ingredients.isEmpty(), "No offered ingredients");
         net.minecraft.world.item.ItemStack baseCostA = CraftItemStack.asNMSCopy(ingredients.get(0));
-        DataComponentPredicate baseCostAPredicate = DataComponentPredicate.allOf(PatchedDataComponentMap.fromPatch(DataComponentMap.EMPTY, baseCostA.getComponentsPatch()));
+        DataComponentExactPredicate baseCostAPredicate = DataComponentExactPredicate.allOf(PatchedDataComponentMap.fromPatch(DataComponentMap.EMPTY, baseCostA.getComponentsPatch()));
         this.handle.baseCostA = new ItemCost(baseCostA.getItemHolder(), baseCostA.getCount(), baseCostAPredicate, baseCostA);
         if (ingredients.size() > 1) {
             net.minecraft.world.item.ItemStack costB = CraftItemStack.asNMSCopy(ingredients.get(1));
-            DataComponentPredicate costBPredicate = DataComponentPredicate.allOf(PatchedDataComponentMap.fromPatch(DataComponentMap.EMPTY, costB.getComponentsPatch()));
+            DataComponentExactPredicate costBPredicate = DataComponentExactPredicate.allOf(PatchedDataComponentMap.fromPatch(DataComponentMap.EMPTY, costB.getComponentsPatch()));
             this.handle.costB = Optional.of(new ItemCost(costB.getItemHolder(), costB.getCount(), costBPredicate, costB));
         } else {
             this.handle.costB = Optional.empty();