Compile fixes

Author: kennytv

Diff for: build-data/paper.at

@@ -321,6 +321,7 @@ public net.minecraft.world.entity.animal.horse.AbstractHorse createInventory()V
 public net.minecraft.world.entity.animal.horse.AbstractHorse inventory
 public net.minecraft.world.entity.animal.horse.AbstractHorse owner
 public net.minecraft.world.entity.animal.horse.Horse setVariantAndMarkings(Lnet/minecraft/world/entity/animal/horse/Variant;Lnet/minecraft/world/entity/animal/horse/Markings;)V
+public net.minecraft.world.entity.animal.horse.Llama setVariant(Lnet/minecraft/world/entity/animal/horse/Llama$Variant;)V
 public net.minecraft.world.entity.animal.horse.SkeletonHorse trapTime
 public net.minecraft.world.entity.animal.sniffer.Sniffer calculateDigPosition()Ljava/util/Optional;
 public net.minecraft.world.entity.animal.sniffer.Sniffer canDig()Z

Diff for: paper-server/patches/sources/net/minecraft/world/entity/Mob.java.patch

@@ -239,7 +239,58 @@
          ProfilerFiller profilerFiller = Profiler.get();
          profilerFiller.push("sensing");
          this.sensing.tick();
-@@ -796,11 +_,18 @@
+@@ -793,14 +_,69 @@
+             public boolean stillValid(Player player) {
+                 return player.getVehicle() == Mob.this || player.canInteractWithEntity(Mob.this, 4.0);
+             }
++
++            // Paper start
++            private final List<org.bukkit.entity.HumanEntity> viewers = new java.util.ArrayList<>();
++            private int maxStackSize = MAX_STACK;
++
++            @Override
++            public int getMaxStackSize() {
++                return this.maxStackSize;
++            }
++
++            @Override
++            public List<ItemStack> getContents() {
++                return java.util.Arrays.asList(this.getTheItem());
++            }
++
++            @Override
++            public void onOpen(final org.bukkit.craftbukkit.entity.CraftHumanEntity player) {
++                this.viewers.add(player);
++            }
++
++            @Override
++            public void onClose(final org.bukkit.craftbukkit.entity.CraftHumanEntity player) {
++                this.viewers.remove(player);
++            }
++
++            @Override
++            public List<org.bukkit.entity.HumanEntity> getViewers() {
++                return this.viewers;
++            }
++
++            @Override
++            public @Nullable org.bukkit.inventory.InventoryHolder getOwner() {
++                if (Mob.this.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder inventoryHolder) {
++                    return inventoryHolder;
++                }
++                return null;
++            }
++
++            @Override
++            public void setMaxStackSize(final int size) {
++                this.maxStackSize = size;
++            }
++
++            @Override
++            public org.bukkit.Location getLocation() {
++                return Mob.this.getBukkitEntity().getLocation();
++            }
++            // Paper end
          };
      }
 

Diff for: paper-server/src/main/java/io/papermc/paper/adventure/PaperAdventure.java

@@ -134,7 +134,7 @@ public final class PaperAdventure {
     public static final Codec<Tag, String, CommandSyntaxException, RuntimeException> NBT_CODEC = new Codec<>() {
         @Override
         public @NotNull Tag decode(final @NotNull String encoded) throws CommandSyntaxException {
-            return new TagParser(new StringReader(encoded)).readValue();
+            return TagParser.parseCompoundFully(encoded);
         }
 
         @Override

Diff for: paper-server/src/main/java/io/papermc/paper/adventure/providers/NBTLegacyHoverEventSerializer.java

@@ -17,7 +17,7 @@
 
 final class NBTLegacyHoverEventSerializer implements LegacyHoverEventSerializer {
     public static final NBTLegacyHoverEventSerializer INSTANCE = new NBTLegacyHoverEventSerializer();
-    private static final Codec<CompoundTag, String, CommandSyntaxException, RuntimeException> SNBT_CODEC = Codec.codec(TagParser::parseTag, Tag::toString);
+    private static final Codec<CompoundTag, String, CommandSyntaxException, RuntimeException> SNBT_CODEC = Codec.codec(TagParser::parseCompoundFully, Tag::toString);
 
     static final String ITEM_TYPE = "id";
     static final String ITEM_COUNT = "Count";
@@ -35,11 +35,11 @@ public HoverEvent.ShowItem deserializeShowItem(final Component input) throws IOE
         final String raw = PlainTextComponentSerializer.plainText().serialize(input);
         try {
             final CompoundTag contents = SNBT_CODEC.decode(raw);
-            final CompoundTag tag = contents.getCompound(ITEM_TAG);
-            @Subst("key") final String keyString = contents.getString(ITEM_TYPE);
+            final CompoundTag tag = contents.getCompoundOrEmpty(ITEM_TAG);
+            @Subst("key") final String keyString = contents.getStringOr(ITEM_TYPE, "");
             return HoverEvent.ShowItem.showItem(
                 Key.key(keyString),
-                contents.contains(ITEM_COUNT) ? contents.getByte(ITEM_COUNT) : 1,
+                contents.getByteOr(ITEM_COUNT, (byte) 1),
                 tag.isEmpty() ? null : BinaryTagHolder.encode(tag, SNBT_CODEC)
             );
         } catch (final CommandSyntaxException ex) {
@@ -52,11 +52,11 @@ public HoverEvent.ShowEntity deserializeShowEntity(final Component input, final
         final String raw = PlainTextComponentSerializer.plainText().serialize(input);
         try {
             final CompoundTag contents = SNBT_CODEC.decode(raw);
-            @Subst("key") final String keyString = contents.getString(ENTITY_TYPE);
+            @Subst("key") final String keyString = contents.getStringOr(ENTITY_TYPE, "");
             return HoverEvent.ShowEntity.showEntity(
                 Key.key(keyString),
-                UUID.fromString(contents.getString(ENTITY_ID)),
-                componentCodec.decode(contents.getString(ENTITY_NAME))
+                UUID.fromString(contents.getStringOr(ENTITY_ID, "")),
+                componentCodec.decode(contents.getStringOr(ENTITY_NAME, ""))
             );
         } catch (final CommandSyntaxException ex) {
             throw new IOException(ex);

Diff for: paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java

@@ -4,6 +4,7 @@
 import java.util.UUID;
 import net.minecraft.Optionull;
 import net.minecraft.world.entity.EntityReference;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftSaddledInventory;
@@ -114,7 +115,7 @@ public void setEatingHaystack(boolean eatingHaystack) {
 
     @Override
     public AbstractHorseInventory getInventory() {
-        return new CraftSaddledInventory(getHandle().inventory, this.getHandle().getBodyArmorAccess()); // Paper - use both inventories
+        return new CraftSaddledInventory(getHandle().inventory, this.getHandle().createEquipmentSlotContainer(EquipmentSlot.BODY));
     }
 
     @Override

Diff for: paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java

@@ -1,6 +1,7 @@
 package org.bukkit.craftbukkit.entity;
 
 import com.google.common.base.Preconditions;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.animal.horse.Markings;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftInventoryHorse;
@@ -57,7 +58,7 @@ public void setCarryingChest(boolean chest) {
 
     @Override
     public HorseInventory getInventory() {
-        return new CraftInventoryHorse(this.getHandle().inventory, this.getHandle().getBodyArmorAccess());
+        return new CraftInventoryHorse(this.getHandle().inventory, this.getHandle().createEquipmentSlotContainer(EquipmentSlot.BODY));
     }
 
     @Override

Diff for: paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java

@@ -1,6 +1,7 @@
 package org.bukkit.craftbukkit.entity;
 
 import com.google.common.base.Preconditions;
+import net.minecraft.world.entity.EquipmentSlot;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.inventory.CraftInventoryLlama;
 import org.bukkit.entity.Horse;
@@ -33,7 +34,7 @@ public void setColor(Color color) {
 
     @Override
     public LlamaInventory getInventory() {
-        return new CraftInventoryLlama(this.getHandle().inventory, this.getHandle().getBodyArmorAccess());
+        return new CraftInventoryLlama(this.getHandle().inventory, this.getHandle().createEquipmentSlotContainer(EquipmentSlot.BODY));
     }
 
     @Override