Unsafe block entity pos reading in ItemStack

Author: lynxplay

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

@@ -8,7 +8,7 @@
 
      public SmithingTrimRecipe(Ingredient template, Ingredient base, Ingredient addition, Holder<TrimPattern> pattern) {
 +        // Paper start - Option to prevent data components copy
-+        this(template, base, addition, true);
++        this(template, base, addition, pattern, true);
 +    }
 +    public SmithingTrimRecipe(Ingredient template, Ingredient base, Ingredient addition, Holder<TrimPattern> pattern, final boolean copyDataComponents) {
 +        this.copyDataComponents = copyDataComponents;

paper-server/patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch

@@ -19,6 +19,22 @@
      }
 
      private void validateBlockState(BlockState state) {
+@@ -64,6 +_,7 @@
+         int intOr = compoundTag.getIntOr("x", 0);
+         int intOr1 = compoundTag.getIntOr("y", 0);
+         int intOr2 = compoundTag.getIntOr("z", 0);
++        if (chunkPos != null) { // Paper - allow reading non-validated pos from tag - used to parse block entities on items
+         int sectionPosCoord = SectionPos.blockToSectionCoord(intOr);
+         int sectionPosCoord1 = SectionPos.blockToSectionCoord(intOr2);
+         if (sectionPosCoord != chunkPos.x || sectionPosCoord1 != chunkPos.z) {
+@@ -71,6 +_,7 @@
+             intOr = chunkPos.getBlockX(SectionPos.sectionRelative(intOr));
+             intOr2 = chunkPos.getBlockZ(SectionPos.sectionRelative(intOr2));
+         }
++        } // Paper - allow reading non-validated pos from tag - used to parse block entities on items
+ 
+         return new BlockPos(intOr, intOr1, intOr2);
+     }
 @@ -89,6 +_,14 @@
      }
 

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

@@ -13,6 +13,7 @@
 import org.bukkit.entity.Minecart;
 import org.bukkit.material.MaterialData;
 import org.bukkit.util.Vector;
+import java.util.Optional;
 
 public abstract class CraftMinecart extends CraftVehicle implements Minecart {
     public CraftMinecart(CraftServer server, AbstractMinecart entity) {
@@ -87,23 +88,21 @@ public AbstractMinecart getHandle() {
     public void setDisplayBlock(MaterialData material) {
         if (material != null) {
             BlockState block = CraftMagicNumbers.getBlock(material);
-            this.getHandle().setDisplayBlockState(block);
+            this.getHandle().setCustomDisplayBlockState(Optional.of(block));
         } else {
             // Set block to air (default) and set the flag to not have a display block.
-            this.getHandle().setDisplayBlockState(Blocks.AIR.defaultBlockState());
-            this.getHandle().setCustomDisplay(false);
+            this.getHandle().setCustomDisplayBlockState(Optional.empty());
         }
     }
 
     @Override
     public void setDisplayBlockData(BlockData blockData) {
         if (blockData != null) {
             BlockState block = ((CraftBlockData) blockData).getState();
-            this.getHandle().setDisplayBlockState(block);
+            this.getHandle().setCustomDisplayBlockState(Optional.of(block));
         } else {
             // Set block to air (default) and set the flag to not have a display block.
-            this.getHandle().setDisplayBlockState(Blocks.AIR.defaultBlockState());
-            this.getHandle().setCustomDisplay(false);
+            this.getHandle().setCustomDisplayBlockState(Optional.empty());
         }
     }
 

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

@@ -282,7 +282,7 @@ public CraftBlockEntityState<?> getBlockState() {
         final Material stateMaterial = this.materialForBlockEntityType();
         if (!this.blockEntityTag.isEmpty()) {
             // Paper "id" field is always present now
-            pos = BlockEntity.getPosFromTag(this.blockEntityTag.getUnsafe()); // unsafe is fine here, just querying
+            pos = BlockEntity.getPosFromTag(null, this.blockEntityTag.getUnsafe()); // unsafe is fine here, just querying
         }
         final net.minecraft.world.level.block.entity.BlockEntityType<?> type = java.util.Objects.requireNonNull(CraftBlockStates.getBlockEntityType(stateMaterial));
         final net.minecraft.world.level.block.state.BlockState nmsBlockState = ((org.bukkit.craftbukkit.block.data.CraftBlockData) this.getBlockData(stateMaterial)).getState();
@@ -314,7 +314,7 @@ private static CraftBlockEntityState<?> getBlockState(Material material, Compoun
                 blockEntityTag.putString("id", "minecraft:shulker_box");
             }
 
-            pos = BlockEntity.getPosFromTag(blockEntityTag);
+            pos = BlockEntity.getPosFromTag(null, blockEntityTag);
         }
 
         // This is expected to always return a CraftBlockEntityState for the passed material:

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

@@ -2,7 +2,9 @@
 
 import net.minecraft.core.Holder;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
+import net.minecraft.world.item.crafting.TransmuteResult;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.RecipeChoice;
@@ -26,15 +28,16 @@ public static CraftTransmuteRecipe fromBukkitRecipe(TransmuteRecipe recipe) {
 
     @Override
     public void addToCraftingManager() {
+        final ItemStack unwrappedInternalStack = CraftItemStack.unwrap(this.getResult());
         MinecraftServer.getServer().getRecipeManager().addRecipe(
-                new RecipeHolder<>(CraftRecipe.toMinecraft(this.getKey()),
-                        new net.minecraft.world.item.crafting.TransmuteRecipe(this.getGroup(),
-                                CraftRecipe.getCategory(this.getCategory()),
-                                this.toNMS(this.getInput(), true),
-                                this.toNMS(this.getMaterial(), true),
-                                Holder.direct(CraftItemType.bukkitToMinecraft(this.getResult().getType()))
-                        )
+            new RecipeHolder<>(CraftRecipe.toMinecraft(this.getKey()),
+                new net.minecraft.world.item.crafting.TransmuteRecipe(this.getGroup(),
+                    CraftRecipe.getCategory(this.getCategory()),
+                    this.toNMS(this.getInput(), true),
+                    this.toNMS(this.getMaterial(), true),
+                    new TransmuteResult(unwrappedInternalStack.getItemHolder(), unwrappedInternalStack.getCount(), unwrappedInternalStack.getComponentsPatch())
                 )
+            )
         );
     }
 }