Spigot / CraftBukkit / f3828bbee61

Commits

Martoph authored and md_5 committed f3828bbee61 06 Jan 2022

#989: Add PDC to Structures

nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.patch

Modified

-1
+--- a/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.java
-2
++++ b/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.java
--
+@@ -142,7 +142,7 @@
-+
+@@ -50,6 +50,12 @@
-+
+ import net.minecraft.world.phys.shapes.VoxelShapeBitSet;
-+
+ import net.minecraft.world.phys.shapes.VoxelShapeDiscrete;
-+
-+
++// CraftBukkit start
-+
++import net.minecraft.nbt.NBTBase;
-+
++import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
-+
++import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
-+
++// CraftBukkit end
 +
-+
+ public class DefinedStructure {
-+
-+
+     public static final String PALETTE_TAG = "palette";
-+
+@@ -69,6 +75,11 @@
-+
+     private BaseBlockPosition size;
-+
+     private String author;
-+
-+
++    // CraftBukkit start - data containers
-+
++    private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
-+
++    public CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
-+
++    // CraftBukkit end
 +
-+
+     public DefinedStructure() {
-+
+         this.size = BaseBlockPosition.ZERO;
-+
+         this.author = "?";
-+
+@@ -142,7 +153,7 @@
-29
+     }
-30
-31
+     private static List<DefinedStructure.BlockInfo> buildInfoList(List<DefinedStructure.BlockInfo> list, List<DefinedStructure.BlockInfo> list1, List<DefinedStructure.BlockInfo> list2) {
-32
+-        Comparator<DefinedStructure.BlockInfo> comparator = Comparator.comparingInt((definedstructure_blockinfo) -> {
-33
++        Comparator<DefinedStructure.BlockInfo> comparator = Comparator.<DefinedStructure.BlockInfo>comparingInt((definedstructure_blockinfo) -> { // CraftBukkit - decompile error
-34
+             return definedstructure_blockinfo.pos.getY();
-35
+         }).thenComparingInt((definedstructure_blockinfo) -> {
-36
+             return definedstructure_blockinfo.pos.getX();
--
+@@ -463,11 +463,13 @@
-+
+@@ -463,11 +474,13 @@
-38
+     }
-39
-40
+     private static Optional<Entity> createEntityIgnoreException(WorldAccess worldaccess, NBTTagCompound nbttagcompound) {
-41
+-        try {
-42
++        // CraftBukkit start
-43
++        // try {
-44
+             return EntityTypes.create(nbttagcompound, (World) worldaccess.getLevel());
-45
+-        } catch (Exception exception) {
-46
+-            return Optional.empty();
-47
+-        }
-48
++        // } catch (Exception exception) {
-49
++            // return Optional.empty();
-50
++        // }
-51
++        // CraftBukkit end
-52
+     }
-53
-54
+     public BaseBlockPosition getSize(EnumBlockRotation enumblockrotation) {
--
+@@ -860,7 +862,7 @@
-+
+@@ -682,6 +695,13 @@
-+
+         nbttagcompound.put("entities", nbttaglist3);
-+
+         nbttagcompound.put("size", this.newIntegerList(this.size.getX(), this.size.getY(), this.size.getZ()));
-+
+         nbttagcompound.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
 +
-+
++        // CraftBukkit Start - PDC
-+
++        if (!this.persistentDataContainer.isEmpty()) {
-+
++            nbttagcompound.put("BukkitValues", this.persistentDataContainer.toTagCompound());
-+
++        }
-+
++        // CraftBukkit end
 +
-+
+         return nbttagcompound;
-+
+     }
-+
-+
+@@ -721,6 +741,12 @@
-+
+             }
-+
+         }
-+
-+
++        // CraftBukkit start - PDC
-+
++        NBTBase base = nbttagcompound.get("BukkitValues");
-+
++        if (base instanceof NBTTagCompound) {
-+
++            this.persistentDataContainer.putAll((NBTTagCompound) base);
-+
++        }
-+
++        // CraftBukkit end
-+
+     }
-+
-+
+     private void loadPalette(NBTTagList nbttaglist, NBTTagList nbttaglist1) {
-+
+@@ -860,7 +886,7 @@
-83
+         public IBlockData stateFor(int i) {
-84
+             IBlockData iblockdata = (IBlockData) this.ids.byId(i);
-85
-86
+-            return iblockdata == null ? DefinedStructure.b.DEFAULT_BLOCK_STATE : iblockdata;
-87
++            return iblockdata == null ? DEFAULT_BLOCK_STATE : iblockdata; // CraftBukkit - decompile error
-88
+         }
-89
-90
+         public Iterator<IBlockData> iterator() {

CraftBukkit

Commits

Jira Issues

Add shortcut