From 753b4b8b5d21789dbc9e5084bd4f4432587fc58c Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 27 May 2025 22:57:25 +0200 Subject: [PATCH] rename tag methods --- .../java/client/network/ClientPlayer.java | 6 ++-- .../renderer/particle/EntityFirework.java | 2 +- .../java/common/attributes/Attributes.java | 6 ++-- .../java/common/block/tile/BlockBanner.java | 2 +- .../main/java/common/dimension/Dimension.java | 30 +++++++++---------- .../src/main/java/common/entity/Entity.java | 2 +- .../common/entity/EntityTrackerEntry.java | 4 +-- .../common/entity/animal/EntityHorse.java | 16 +++++----- .../entity/item/EntityCartContainer.java | 4 +-- .../common/entity/item/EntityFalling.java | 10 +++---- .../common/entity/item/EntityFireworks.java | 8 ++--- .../java/common/entity/item/EntityItem.java | 4 +-- .../java/common/entity/npc/EntityNPC.java | 28 ++++++++--------- .../entity/projectile/EntityPotion.java | 6 ++-- .../common/entity/types/EntityLiving.java | 18 +++++------ .../java/common/init/CraftingRegistry.java | 18 +++++------ .../java/common/init/UniverseRegistry.java | 24 +++++++-------- .../src/main/java/common/item/ItemBanner.java | 6 ++-- .../src/main/java/common/item/ItemBlock.java | 6 ++-- .../java/common/item/ItemEnchantedBook.java | 4 +-- .../main/java/common/item/ItemFirework.java | 4 +-- .../java/common/item/ItemFireworkCharge.java | 4 +-- .../src/main/java/common/item/ItemStack.java | 28 ++++++++--------- .../java/common/network/IClientPlayer.java | 4 +-- .../java/common/network/PacketRegistry.java | 4 +-- ...yNBT.java => SPacketUpdateEntityTags.java} | 6 ++-- .../packet/SPacketUpdateTileEntity.java | 2 +- .../src/main/java/common/tags/TagObject.java | 14 ++++----- .../java/common/tileentity/TileEntity.java | 6 ++-- .../common/tileentity/TileEntityBanner.java | 26 ++++++++-------- .../common/tileentity/TileEntityBeacon.java | 8 ++--- .../tileentity/TileEntityBrewingStand.java | 12 ++++---- .../common/tileentity/TileEntityChest.java | 12 ++++---- .../tileentity/TileEntityComparator.java | 8 ++--- .../tileentity/TileEntityDispenser.java | 12 ++++---- .../TileEntityEnchantmentTable.java | 8 ++--- .../common/tileentity/TileEntityFurnace.java | 12 ++++---- .../common/tileentity/TileEntityHopper.java | 12 ++++---- .../common/tileentity/TileEntityLockable.java | 8 ++--- .../common/tileentity/TileEntityMachine.java | 16 +++++----- .../tileentity/TileEntityMobSpawner.java | 8 ++--- .../common/tileentity/TileEntityNote.java | 8 ++--- .../common/tileentity/TileEntityPiston.java | 8 ++--- .../common/tileentity/TileEntitySign.java | 8 ++--- .../common/tileentity/TileEntitySkull.java | 8 ++--- .../java/common/village/MerchantRecipe.java | 12 ++++---- .../src/main/java/common/village/Village.java | 4 +-- server/src/main/java/server/Server.java | 8 ++--- .../java/server/clipboard/ClipboardBlock.java | 2 +- .../server/command/commands/CommandBlock.java | 2 +- .../src/main/java/server/network/Player.java | 10 +++---- .../server/village/VillageCollection.java | 4 +-- .../src/main/java/server/world/Converter.java | 8 ++--- server/src/main/java/server/world/Region.java | 26 ++++++++-------- .../main/java/server/world/WorldServer.java | 20 ++++++------- .../worldgen/structure/MapGenStructure.java | 2 +- .../worldgen/structure/StructureStart.java | 4 +-- 57 files changed, 276 insertions(+), 276 deletions(-) rename common/src/main/java/common/packet/{SPacketUpdateEntityNBT.java => SPacketUpdateEntityTags.java} (87%) diff --git a/client/src/main/java/client/network/ClientPlayer.java b/client/src/main/java/client/network/ClientPlayer.java index ba18df0..706a642 100755 --- a/client/src/main/java/client/network/ClientPlayer.java +++ b/client/src/main/java/client/network/ClientPlayer.java @@ -96,7 +96,7 @@ import common.packet.SPacketSignEditorOpen; import common.packet.SPacketPlayerListItem; import common.packet.SPacketPlayerAbilities; import common.packet.SPacketTabComplete; -import common.packet.SPacketUpdateEntityNBT; +import common.packet.SPacketUpdateEntityTags; import common.packet.SPacketAnimation; import common.packet.SPacketBiome; import common.packet.SPacketBlockAction; @@ -1345,7 +1345,7 @@ public class ClientPlayer extends NetHandler implements IClientPlayer if (tileentity != null && packetIn.isTileEntityType(tileentity)) // i == 1 && tileentity instanceof TileEntityMobSpawner || /* i == 2 && tileentity instanceof TileEntityCommandBlock || */ i == 3 && tileentity instanceof TileEntityBeacon || i == 4 && tileentity instanceof TileEntitySkull || /* i == 5 && tileentity instanceof TileEntityFlowerPot || */ i == 6 && tileentity instanceof TileEntityBanner || i == 7 && tileentity instanceof TileEntityMachine) { - tileentity.readFromNBT(packetIn.getNbtCompound()); + tileentity.readTags(packetIn.getNbtCompound()); } } } @@ -1714,7 +1714,7 @@ public class ClientPlayer extends NetHandler implements IClientPlayer //// } // } - public void handleEntityNBT(SPacketUpdateEntityNBT packetIn) + public void handleEntityNBT(SPacketUpdateEntityTags packetIn) { NetHandler.checkThread(packetIn, this, this.gameController, this.clientWorldController); Entity entity = packetIn.getEntity(this.clientWorldController); diff --git a/client/src/main/java/client/renderer/particle/EntityFirework.java b/client/src/main/java/client/renderer/particle/EntityFirework.java index 98e4692..d134a40 100755 --- a/client/src/main/java/client/renderer/particle/EntityFirework.java +++ b/client/src/main/java/client/renderer/particle/EntityFirework.java @@ -206,7 +206,7 @@ public class EntityFirework if (p_i46464_15_ != null) { - this.fireworkExplosions = p_i46464_15_.getTagList("Explosions"); + this.fireworkExplosions = p_i46464_15_.getObjectList("Explosions"); if (this.fireworkExplosions.size() == 0) { diff --git a/common/src/main/java/common/attributes/Attributes.java b/common/src/main/java/common/attributes/Attributes.java index 80995bd..73970af 100755 --- a/common/src/main/java/common/attributes/Attributes.java +++ b/common/src/main/java/common/attributes/Attributes.java @@ -75,7 +75,7 @@ public class Attributes } } - nbttagcompound.setTagList("Modifiers", nbttaglist); + nbttagcompound.setObjectList("Modifiers", nbttaglist); } return nbttagcompound; @@ -116,9 +116,9 @@ public class Attributes { instance.setBaseValue(compound.getDouble("Base")); - if (compound.hasTagList("Modifiers")) + if (compound.hasObjectList("Modifiers")) { - TagObjectList nbttaglist = compound.getTagList("Modifiers"); + TagObjectList nbttaglist = compound.getObjectList("Modifiers"); for (int i = 0; i < nbttaglist.size(); ++i) { diff --git a/common/src/main/java/common/block/tile/BlockBanner.java b/common/src/main/java/common/block/tile/BlockBanner.java index 0993acc..9dad8b2 100755 --- a/common/src/main/java/common/block/tile/BlockBanner.java +++ b/common/src/main/java/common/block/tile/BlockBanner.java @@ -126,7 +126,7 @@ public class BlockBanner extends BlockContainer { ItemStack itemstack = new ItemStack(Items.banner, 1, ((TileEntityBanner)tileentity).getBaseColor()); TagObject nbttagcompound = new TagObject(); - tileentity.writeToNBT(nbttagcompound); + tileentity.writeTags(nbttagcompound); nbttagcompound.remove("x"); nbttagcompound.remove("y"); nbttagcompound.remove("z"); diff --git a/common/src/main/java/common/dimension/Dimension.java b/common/src/main/java/common/dimension/Dimension.java index 1340f87..3fdcf7f 100755 --- a/common/src/main/java/common/dimension/Dimension.java +++ b/common/src/main/java/common/dimension/Dimension.java @@ -1006,8 +1006,8 @@ public abstract class Dimension extends Nameable implements Comparable entry : MOON_MAP.entrySet()) { @@ -252,7 +252,7 @@ public abstract class UniverseRegistry { list.add(link); } if(!list.isEmpty()) - tag.setTagList("Barycenters", list); + tag.setObjectList("Barycenters", list); return tag; } diff --git a/common/src/main/java/common/item/ItemBanner.java b/common/src/main/java/common/item/ItemBanner.java index 50a37e0..38e6ccc 100755 --- a/common/src/main/java/common/item/ItemBanner.java +++ b/common/src/main/java/common/item/ItemBanner.java @@ -98,9 +98,9 @@ public class ItemBanner extends ItemBlock { TagObject nbttagcompound = stack.getSubCompound("BlockEntityTag", false); - if (nbttagcompound != null && nbttagcompound.hasTagList("Patterns")) + if (nbttagcompound != null && nbttagcompound.hasObjectList("Patterns")) { - TagObjectList nbttaglist = nbttagcompound.getTagList("Patterns"); + TagObjectList nbttaglist = nbttagcompound.getObjectList("Patterns"); for (int i = 0; i < nbttaglist.size() && i < 6; ++i) { @@ -140,7 +140,7 @@ public class ItemBanner extends ItemBlock TagObject nbttagcompound = new TagObject(); TileEntityBanner.setBaseColorAndPatterns(nbttagcompound, enumdyecolor.getDyeDamage(), null); TagObject nbttagcompound1 = new TagObject(); - nbttagcompound1.setTag("BlockEntityTag", nbttagcompound); + nbttagcompound1.setObject("BlockEntityTag", nbttagcompound); ItemStack itemstack = new ItemStack(itemIn, 1, enumdyecolor.getDyeDamage()); itemstack.setTagCompound(nbttagcompound1); subItems.add(itemstack); diff --git a/common/src/main/java/common/item/ItemBlock.java b/common/src/main/java/common/item/ItemBlock.java index b2f4012..7c718b4 100755 --- a/common/src/main/java/common/item/ItemBlock.java +++ b/common/src/main/java/common/item/ItemBlock.java @@ -107,7 +107,7 @@ public class ItemBlock extends Item // } // else // { - if (p_179224_3_.hasTagCompound() && p_179224_3_.getTagCompound().hasTag("BlockEntityTag")) + if (p_179224_3_.hasTagCompound() && p_179224_3_.getTagCompound().hasObject("BlockEntityTag")) { TileEntity tileentity = worldIn.getTileEntity(stack); @@ -120,7 +120,7 @@ public class ItemBlock extends Item TagObject nbttagcompound = new TagObject(); TagObject nbttagcompound1 = (TagObject)nbttagcompound.copy(); - tileentity.writeToNBT(nbttagcompound); + tileentity.writeTags(nbttagcompound); TagObject nbttagcompound2 = (TagObject)p_179224_3_.getTagCompound().get("BlockEntityTag"); nbttagcompound.merge(nbttagcompound2); nbttagcompound.setInt("x", stack.getX()); @@ -129,7 +129,7 @@ public class ItemBlock extends Item if (!nbttagcompound.equals(nbttagcompound1)) { - tileentity.readFromNBT(nbttagcompound); + tileentity.readTags(nbttagcompound); tileentity.markDirty(); return true; } diff --git a/common/src/main/java/common/item/ItemEnchantedBook.java b/common/src/main/java/common/item/ItemEnchantedBook.java index 4eba8e5..acd0ec1 100755 --- a/common/src/main/java/common/item/ItemEnchantedBook.java +++ b/common/src/main/java/common/item/ItemEnchantedBook.java @@ -51,7 +51,7 @@ public class ItemEnchantedBook extends Item public TagObjectList getEnchantments(ItemStack stack) { TagObject nbttagcompound = stack.getTagCompound(); - return nbttagcompound != null && nbttagcompound.hasTagList("StoredEnchantments") ? nbttagcompound.getTagList("StoredEnchantments") : new TagObjectList(); + return nbttagcompound != null && nbttagcompound.hasObjectList("StoredEnchantments") ? nbttagcompound.getObjectList("StoredEnchantments") : new TagObjectList(); } /** @@ -114,7 +114,7 @@ public class ItemEnchantedBook extends Item stack.setTagCompound(new TagObject()); } - stack.getTagCompound().setTagList("StoredEnchantments", nbttaglist); + stack.getTagCompound().setObjectList("StoredEnchantments", nbttaglist); } /** diff --git a/common/src/main/java/common/item/ItemFirework.java b/common/src/main/java/common/item/ItemFirework.java index 2c1a2e8..16502d3 100755 --- a/common/src/main/java/common/item/ItemFirework.java +++ b/common/src/main/java/common/item/ItemFirework.java @@ -43,7 +43,7 @@ public class ItemFirework extends Item { if (stack.hasTagCompound()) { - TagObject nbttagcompound = stack.getTagCompound().getTag("Fireworks"); + TagObject nbttagcompound = stack.getTagCompound().getObject("Fireworks"); if (nbttagcompound != null) { @@ -52,7 +52,7 @@ public class ItemFirework extends Item tooltip.add("Flugdauer: " + nbttagcompound.getByte("Flight")); } - TagObjectList nbttaglist = nbttagcompound.getTagList("Explosions"); + TagObjectList nbttaglist = nbttagcompound.getObjectList("Explosions"); if (nbttaglist != null && nbttaglist.size() > 0) { diff --git a/common/src/main/java/common/item/ItemFireworkCharge.java b/common/src/main/java/common/item/ItemFireworkCharge.java index 968d965..14e9ba1 100755 --- a/common/src/main/java/common/item/ItemFireworkCharge.java +++ b/common/src/main/java/common/item/ItemFireworkCharge.java @@ -22,7 +22,7 @@ public class ItemFireworkCharge extends Item { if (stack.hasTagCompound()) { - TagObject nbttagcompound = stack.getTagCompound().getTag("Explosion"); + TagObject nbttagcompound = stack.getTagCompound().getObject("Explosion"); if (nbttagcompound != null) { @@ -65,7 +65,7 @@ public class ItemFireworkCharge extends Item { if (stack.hasTagCompound()) { - TagObject nbttagcompound = stack.getTagCompound().getTag("Explosion"); + TagObject nbttagcompound = stack.getTagCompound().getObject("Explosion"); if (nbttagcompound != null) { diff --git a/common/src/main/java/common/item/ItemStack.java b/common/src/main/java/common/item/ItemStack.java index b4f6741..c39839e 100755 --- a/common/src/main/java/common/item/ItemStack.java +++ b/common/src/main/java/common/item/ItemStack.java @@ -203,7 +203,7 @@ public final class ItemStack if (this.stackTagCompound != null) { - nbt.setTag("tag", this.stackTagCompound); + nbt.setObject("tag", this.stackTagCompound); } return nbt; @@ -231,9 +231,9 @@ public final class ItemStack this.itemDamage = 0; } - if (nbt.hasTag("tag")) + if (nbt.hasObject("tag")) { - this.stackTagCompound = nbt.getTag("tag"); + this.stackTagCompound = nbt.getObject("tag"); if (this.item != null) { @@ -581,9 +581,9 @@ public final class ItemStack */ public TagObject getSubCompound(String key, boolean create) { - if (this.stackTagCompound != null && this.stackTagCompound.hasTag(key)) + if (this.stackTagCompound != null && this.stackTagCompound.hasObject(key)) { - return this.stackTagCompound.getTag(key); + return this.stackTagCompound.getObject(key); } else if (create) { @@ -599,7 +599,7 @@ public final class ItemStack public TagObjectList getEnchantmentTagList() { - return this.stackTagCompound == null ? null : this.stackTagCompound.getTagList("ench"); + return this.stackTagCompound == null ? null : this.stackTagCompound.getObjectList("ench"); } /** @@ -1036,12 +1036,12 @@ public final class ItemStack this.setTagCompound(new TagObject()); } - if (!this.stackTagCompound.hasTagList("ench")) + if (!this.stackTagCompound.hasObjectList("ench")) { - this.stackTagCompound.setTagList("ench", new TagObjectList()); + this.stackTagCompound.setObjectList("ench", new TagObjectList()); } - TagObjectList nbttaglist = this.stackTagCompound.getTagList("ench"); + TagObjectList nbttaglist = this.stackTagCompound.getObjectList("ench"); TagObject nbttagcompound = new TagObject(); nbttagcompound.setShort("id", (short)ench.effectId); nbttagcompound.setShort("lvl", (short)(/* (byte) */ level)); @@ -1055,10 +1055,10 @@ public final class ItemStack if(this.stackTagCompound == null) { return false; } - if(!this.stackTagCompound.hasTagList("ench")) { + if(!this.stackTagCompound.hasObjectList("ench")) { return false; } - TagObjectList oldEnch = this.stackTagCompound.getTagList("ench"); + TagObjectList oldEnch = this.stackTagCompound.getObjectList("ench"); TagObjectList newEnch = new TagObjectList(); boolean changed = false; TagObject tag; @@ -1081,7 +1081,7 @@ public final class ItemStack } } else { - this.stackTagCompound.setTagList("ench", newEnch); + this.stackTagCompound.setObjectList("ench", newEnch); } return true; } @@ -1093,7 +1093,7 @@ public final class ItemStack if(this.stackTagCompound == null) { return false; } - if(!this.stackTagCompound.hasTagList("ench")) { + if(!this.stackTagCompound.hasObjectList("ench")) { return false; } this.stackTagCompound.remove("ench"); @@ -1108,7 +1108,7 @@ public final class ItemStack */ public boolean isItemEnchanted() { - return this.stackTagCompound != null && this.stackTagCompound.hasTagList("ench"); + return this.stackTagCompound != null && this.stackTagCompound.hasObjectList("ench"); } public void setTagInfo(String key, Tag value) diff --git a/common/src/main/java/common/network/IClientPlayer.java b/common/src/main/java/common/network/IClientPlayer.java index 7884c94..05b4705 100644 --- a/common/src/main/java/common/network/IClientPlayer.java +++ b/common/src/main/java/common/network/IClientPlayer.java @@ -32,7 +32,7 @@ import common.packet.SPacketSignEditorOpen; import common.packet.SPacketPlayerListItem; import common.packet.SPacketPlayerAbilities; import common.packet.SPacketTabComplete; -import common.packet.SPacketUpdateEntityNBT; +import common.packet.SPacketUpdateEntityTags; import common.packet.SPacketAnimation; import common.packet.SPacketBiome; import common.packet.SPacketBlockAction; @@ -140,7 +140,7 @@ public interface IClientPlayer { void handlePlayerAbilities(SPacketPlayerAbilities packet); void handleTabComplete(SPacketTabComplete packet); void handleSoundEffect(SPacketSoundEffect packet); - void handleEntityNBT(SPacketUpdateEntityNBT packet); + void handleEntityNBT(SPacketUpdateEntityTags packet); void handleParticles(SPacketParticles packet); void handleEntityProperties(SPacketEntityProperties packet); void handleSkin(SPacketSkin packet); diff --git a/common/src/main/java/common/network/PacketRegistry.java b/common/src/main/java/common/network/PacketRegistry.java index 6278291..5d5a8b1 100755 --- a/common/src/main/java/common/network/PacketRegistry.java +++ b/common/src/main/java/common/network/PacketRegistry.java @@ -58,7 +58,7 @@ import common.packet.SPacketSignEditorOpen; import common.packet.SPacketPlayerListItem; import common.packet.SPacketPlayerAbilities; import common.packet.SPacketTabComplete; -import common.packet.SPacketUpdateEntityNBT; +import common.packet.SPacketUpdateEntityTags; import common.packet.SPacketAnimation; import common.packet.SPacketBiome; import common.packet.SPacketBlockAction; @@ -166,7 +166,7 @@ public enum PacketRegistry { this.server(SPacketWorld.class); this.server(SPacketCamera.class); this.server(SPacketBiome.class); - this.server(SPacketUpdateEntityNBT.class); + this.server(SPacketUpdateEntityTags.class); this.server(SPacketTrades.class); this.server(SPacketDimensionName.class); this.server(SPacketCharacterList.class); diff --git a/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java b/common/src/main/java/common/packet/SPacketUpdateEntityTags.java similarity index 87% rename from common/src/main/java/common/packet/SPacketUpdateEntityNBT.java rename to common/src/main/java/common/packet/SPacketUpdateEntityTags.java index d309ebf..ca6e025 100755 --- a/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java +++ b/common/src/main/java/common/packet/SPacketUpdateEntityTags.java @@ -9,16 +9,16 @@ import common.network.PacketBuffer; import common.tags.TagObject; import common.world.World; -public class SPacketUpdateEntityNBT implements Packet +public class SPacketUpdateEntityTags implements Packet { private int entityId; private TagObject tagCompound; - public SPacketUpdateEntityNBT() + public SPacketUpdateEntityTags() { } - public SPacketUpdateEntityNBT(int entityIdIn, TagObject tagCompoundIn) + public SPacketUpdateEntityTags(int entityIdIn, TagObject tagCompoundIn) { this.entityId = entityIdIn; this.tagCompound = tagCompoundIn; diff --git a/common/src/main/java/common/packet/SPacketUpdateTileEntity.java b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java index e75585a..154bb17 100755 --- a/common/src/main/java/common/packet/SPacketUpdateTileEntity.java +++ b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java @@ -24,7 +24,7 @@ public class SPacketUpdateTileEntity implements Packet { this.blockPos = tile.getPos(); this.type = TileRegistry.CLASS_TO_ID.get(tile.getClass()); - tile.writeToNBT(this.nbt = new TagObject()); + tile.writeTags(this.nbt = new TagObject()); } /** diff --git a/common/src/main/java/common/tags/TagObject.java b/common/src/main/java/common/tags/TagObject.java index a33bd4d..b5d4ca8 100755 --- a/common/src/main/java/common/tags/TagObject.java +++ b/common/src/main/java/common/tags/TagObject.java @@ -53,7 +53,7 @@ public class TagObject extends Tag { this.tags.put(key, value); } - public void setTag(String key, TagObject value) { + public void setObject(String key, TagObject value) { this.tags.put(key, value); } @@ -73,7 +73,7 @@ public class TagObject extends Tag { this.tags.put(key, value); } - public void setTagList(String key, TagObjectList value) { + public void setObjectList(String key, TagObjectList value) { this.tags.put(key, value); } @@ -166,7 +166,7 @@ public class TagObject extends Tag { return this.has(key, 11); } - public boolean hasTag(String key) { + public boolean hasObject(String key) { return this.has(key, 10); } @@ -186,7 +186,7 @@ public class TagObject extends Tag { return this.has(key, 15); } - public boolean hasTagList(String key) { + public boolean hasObjectList(String key) { return this.has(key, 12); } @@ -226,7 +226,7 @@ public class TagObject extends Tag { return !this.has(key, 11) ? new int[0] : ((TagIntArray)this.tags.get(key)).getIntArray(); } - public TagObject getTag(String key) { + public TagObject getObject(String key) { return !this.has(key, 10) ? new TagObject() : (TagObject)this.tags.get(key); } @@ -246,7 +246,7 @@ public class TagObject extends Tag { return !this.has(key, 15) ? new TagIntArrayList() : (TagIntArrayList)this.tags.get(key); } - public TagObjectList getTagList(String key) { + public TagObjectList getObjectList(String key) { return !this.has(key, 12) ? new TagObjectList() : (TagObjectList)this.tags.get(key); } @@ -298,7 +298,7 @@ public class TagObject extends Tag { Tag tag = other.tags.get(key); if(tag.getId() == 10) { if(this.has(key, 10)) { - TagObject comp = this.getTag(key); + TagObject comp = this.getObject(key); comp.merge((TagObject)tag); } else { diff --git a/common/src/main/java/common/tileentity/TileEntity.java b/common/src/main/java/common/tileentity/TileEntity.java index 9f7ee5c..4b7c02a 100755 --- a/common/src/main/java/common/tileentity/TileEntity.java +++ b/common/src/main/java/common/tileentity/TileEntity.java @@ -53,12 +53,12 @@ public abstract class TileEntity return this.worldObj != null; } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { this.pos = new BlockPos(compound.getInt("x"), compound.getInt("y"), compound.getInt("z")); } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { String s = (String)TileRegistry.CLASS_TO_NAME.get(this.getClass()); @@ -98,7 +98,7 @@ public abstract class TileEntity if (tileentity != null) { - tileentity.readFromNBT(nbt); + tileentity.readTags(nbt); } else { diff --git a/common/src/main/java/common/tileentity/TileEntityBanner.java b/common/src/main/java/common/tileentity/TileEntityBanner.java index d09dff7..1fc9211 100755 --- a/common/src/main/java/common/tileentity/TileEntityBanner.java +++ b/common/src/main/java/common/tileentity/TileEntityBanner.java @@ -32,13 +32,13 @@ public class TileEntityBanner extends TileEntity { this.patterns = null; - if (stack.hasTagCompound() && stack.getTagCompound().hasTag("BlockEntityTag")) + if (stack.hasTagCompound() && stack.getTagCompound().hasObject("BlockEntityTag")) { - TagObject nbttagcompound = stack.getTagCompound().getTag("BlockEntityTag"); + TagObject nbttagcompound = stack.getTagCompound().getObject("BlockEntityTag"); - if (nbttagcompound.hasTagList("Patterns")) + if (nbttagcompound.hasObjectList("Patterns")) { - this.patterns = (TagObjectList)nbttagcompound.getTagList("Patterns").copy(); + this.patterns = (TagObjectList)nbttagcompound.getObjectList("Patterns").copy(); } if (nbttagcompound.hasInt("Base")) @@ -61,9 +61,9 @@ public class TileEntityBanner extends TileEntity this.field_175119_g = true; } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); setBaseColorAndPatterns(compound, this.baseColor, this.patterns); } @@ -73,15 +73,15 @@ public class TileEntityBanner extends TileEntity if (patternsIn != null) { - compound.setTagList("Patterns", patternsIn); + compound.setObjectList("Patterns", patternsIn); } } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.baseColor = compound.getInt("Base"); - this.patterns = compound.getTagList("Patterns"); + this.patterns = compound.getObjectList("Patterns"); this.patternList = null; this.colorList = null; this.patternResourceLocation = null; @@ -114,7 +114,7 @@ public class TileEntityBanner extends TileEntity public static int getPatterns(ItemStack stack) { TagObject nbttagcompound = stack.getSubCompound("BlockEntityTag", false); - return nbttagcompound != null && nbttagcompound.hasTagList("Patterns") ? nbttagcompound.getTagList("Patterns").size() : 0; + return nbttagcompound != null && nbttagcompound.hasObjectList("Patterns") ? nbttagcompound.getObjectList("Patterns").size() : 0; } public List getPatternList() @@ -191,9 +191,9 @@ public class TileEntityBanner extends TileEntity { TagObject nbttagcompound = stack.getSubCompound("BlockEntityTag", false); - if (nbttagcompound != null && nbttagcompound.hasTagList("Patterns")) + if (nbttagcompound != null && nbttagcompound.hasObjectList("Patterns")) { - TagObjectList nbttaglist = nbttagcompound.getTagList("Patterns"); + TagObjectList nbttaglist = nbttagcompound.getObjectList("Patterns"); if (nbttaglist.size() > 0) { diff --git a/common/src/main/java/common/tileentity/TileEntityBeacon.java b/common/src/main/java/common/tileentity/TileEntityBeacon.java index 7f300b6..da2d009 100755 --- a/common/src/main/java/common/tileentity/TileEntityBeacon.java +++ b/common/src/main/java/common/tileentity/TileEntityBeacon.java @@ -301,9 +301,9 @@ public class TileEntityBeacon extends TileEntity implements ITickable // } } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.primaryEffect = compound.hasString("Primary") ? this.getEffect(compound.getString("Primary")) : null; this.secondaryEffect = compound.hasString("Secondary") ? this.getEffect(compound.getString("Secondary")) : null; this.levels = compound.getInt("Levels"); @@ -315,9 +315,9 @@ public class TileEntityBeacon extends TileEntity implements ITickable // } } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); if(this.primaryEffect != null) compound.setString("Primary", this.primaryEffect.getName()); if(this.secondaryEffect != null) diff --git a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java index bd4e701..dec25d0 100755 --- a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java @@ -227,10 +227,10 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka return stack == null ? meta : (stack.getItem().isPotionIngredient(stack) ? PotionHelper.applyIngredient(meta, stack.getItem().getPotionEffect(stack)) : meta); } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); - TagObjectList nbttaglist = compound.getTagList("Items"); + super.readTags(compound); + TagObjectList nbttaglist = compound.getObjectList("Items"); this.brewingItemStacks = new ItemStack[this.getSizeInventory()]; for (int i = 0; i < nbttaglist.size(); ++i) @@ -252,9 +252,9 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka } } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); compound.setShort("BrewTime", (short)this.brewTime); TagObjectList nbttaglist = new TagObjectList(); @@ -269,7 +269,7 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka } } - compound.setTagList("Items", nbttaglist); + compound.setObjectList("Items", nbttaglist); if (this.hasCustomName()) { diff --git a/common/src/main/java/common/tileentity/TileEntityChest.java b/common/src/main/java/common/tileentity/TileEntityChest.java index 06ca52d..6827f00 100755 --- a/common/src/main/java/common/tileentity/TileEntityChest.java +++ b/common/src/main/java/common/tileentity/TileEntityChest.java @@ -161,10 +161,10 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II this.customName = name; } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); - TagObjectList nbttaglist = compound.getTagList("Items"); + super.readTags(compound); + TagObjectList nbttaglist = compound.getObjectList("Items"); this.chestContents = new ItemStack[this.getSizeInventory()]; if (compound.hasString("CustomName")) @@ -184,9 +184,9 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II } } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); TagObjectList nbttaglist = new TagObjectList(); for (int i = 0; i < this.chestContents.length; ++i) @@ -200,7 +200,7 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II } } - compound.setTagList("Items", nbttaglist); + compound.setObjectList("Items", nbttaglist); if (this.hasCustomName()) { diff --git a/common/src/main/java/common/tileentity/TileEntityComparator.java b/common/src/main/java/common/tileentity/TileEntityComparator.java index 5ce1acc..67eeb4f 100755 --- a/common/src/main/java/common/tileentity/TileEntityComparator.java +++ b/common/src/main/java/common/tileentity/TileEntityComparator.java @@ -6,15 +6,15 @@ public class TileEntityComparator extends TileEntity { private int outputSignal; - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); compound.setInt("OutputSignal", this.outputSignal); } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.outputSignal = compound.getInt("OutputSignal"); } diff --git a/common/src/main/java/common/tileentity/TileEntityDispenser.java b/common/src/main/java/common/tileentity/TileEntityDispenser.java index 46687c6..60ca358 100755 --- a/common/src/main/java/common/tileentity/TileEntityDispenser.java +++ b/common/src/main/java/common/tileentity/TileEntityDispenser.java @@ -152,10 +152,10 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor return this.customName != null; } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); - TagObjectList nbttaglist = compound.getTagList("Items"); + super.readTags(compound); + TagObjectList nbttaglist = compound.getObjectList("Items"); this.stacks = new ItemStack[this.getSizeInventory()]; for (int i = 0; i < nbttaglist.size(); ++i) @@ -175,9 +175,9 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor } } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); TagObjectList nbttaglist = new TagObjectList(); for (int i = 0; i < this.stacks.length; ++i) @@ -191,7 +191,7 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor } } - compound.setTagList("Items", nbttaglist); + compound.setObjectList("Items", nbttaglist); if (this.hasCustomName()) { diff --git a/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java b/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java index cca89d9..1a9faba 100755 --- a/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java +++ b/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java @@ -23,9 +23,9 @@ public class TileEntityEnchantmentTable extends TileEntity implements ITickable, private static Random rand = new Random(); private String customName; - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); if (this.hasCustomName()) { @@ -33,9 +33,9 @@ public class TileEntityEnchantmentTable extends TileEntity implements ITickable, } } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); if (compound.hasString("CustomName")) { diff --git a/common/src/main/java/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java index 77284a2..9812b19 100755 --- a/common/src/main/java/common/tileentity/TileEntityFurnace.java +++ b/common/src/main/java/common/tileentity/TileEntityFurnace.java @@ -156,10 +156,10 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, this.furnaceCustomName = p_145951_1_; } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); - TagObjectList nbttaglist = compound.getTagList("Items"); + super.readTags(compound); + TagObjectList nbttaglist = compound.getObjectList("Items"); this.furnaceItemStacks = new ItemStack[this.getSizeInventory()]; for (int i = 0; i < nbttaglist.size(); ++i) @@ -184,9 +184,9 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, } } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); compound.setShort("BurnTime", (short)this.furnaceBurnTime); compound.setShort("CookTime", (short)this.cookTime); compound.setShort("CookTimeTotal", (short)this.totalCookTime); @@ -203,7 +203,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, } } - compound.setTagList("Items", nbttaglist); + compound.setObjectList("Items", nbttaglist); if (this.hasCustomName()) { diff --git a/common/src/main/java/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java index 412bdd3..a04cc56 100755 --- a/common/src/main/java/common/tileentity/TileEntityHopper.java +++ b/common/src/main/java/common/tileentity/TileEntityHopper.java @@ -30,10 +30,10 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi private String customName; private int transferCooldown = -1; - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); - TagObjectList nbttaglist = compound.getTagList("Items"); + super.readTags(compound); + TagObjectList nbttaglist = compound.getObjectList("Items"); this.inventory = new ItemStack[this.getSizeInventory()]; if (compound.hasString("CustomName")) @@ -55,9 +55,9 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi } } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); TagObjectList nbttaglist = new TagObjectList(); for (int i = 0; i < this.inventory.length; ++i) @@ -71,7 +71,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi } } - compound.setTagList("Items", nbttaglist); + compound.setObjectList("Items", nbttaglist); compound.setInt("TransferCooldown", this.transferCooldown); if (this.hasCustomName()) diff --git a/common/src/main/java/common/tileentity/TileEntityLockable.java b/common/src/main/java/common/tileentity/TileEntityLockable.java index 00575e7..2f96e8c 100755 --- a/common/src/main/java/common/tileentity/TileEntityLockable.java +++ b/common/src/main/java/common/tileentity/TileEntityLockable.java @@ -6,15 +6,15 @@ public abstract class TileEntityLockable extends TileEntity implements IInteract { private LockCode code = LockCode.EMPTY_CODE; - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.code = LockCode.fromNBT(compound); } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); if (this.code != null) { diff --git a/common/src/main/java/common/tileentity/TileEntityMachine.java b/common/src/main/java/common/tileentity/TileEntityMachine.java index b2054bc..033ebe8 100755 --- a/common/src/main/java/common/tileentity/TileEntityMachine.java +++ b/common/src/main/java/common/tileentity/TileEntityMachine.java @@ -79,10 +79,10 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH this.status = status; } - public void readFromNBT(TagObject compound) { - super.readFromNBT(compound); + public void readTags(TagObject compound) { + super.readTags(compound); - TagObjectList nbttaglist = compound.getTagList("Items"); + TagObjectList nbttaglist = compound.getObjectList("Items"); this.clear(); for(int i = 0; i < nbttaglist.size(); ++i) { TagObject nbttagcompound = nbttaglist.get(i); @@ -93,7 +93,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH } } - nbttaglist = compound.getTagList("Resources"); + nbttaglist = compound.getObjectList("Resources"); for(MachineResource res : this.resources) { res.reset(); } @@ -106,8 +106,8 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH this.status = Status.values()[(int)compound.getByte("Status") % Status.values().length]; } - public void writeToNBT(TagObject compound) { - super.writeToNBT(compound); + public void writeTags(TagObject compound) { + super.writeTags(compound); TagObjectList nbttaglist = new TagObjectList(); for(int i = 0; i < this.inventory.length; ++i) { @@ -118,7 +118,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH nbttaglist.add(nbttagcompound); } } - compound.setTagList("Items", nbttaglist); + compound.setObjectList("Items", nbttaglist); nbttaglist = new TagObjectList(); for(int z = 0; z < this.resources.length; z++) { @@ -126,7 +126,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH this.resources[z].writeToNbt(res); nbttaglist.add(res); } - compound.setTagList("Resources", nbttaglist); + compound.setObjectList("Resources", nbttaglist); // compound.setBoolean("Creative", this.isCreative); compound.setInt("Temperature", this.temperature); diff --git a/common/src/main/java/common/tileentity/TileEntityMobSpawner.java b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java index 71e52a9..c3deecf 100755 --- a/common/src/main/java/common/tileentity/TileEntityMobSpawner.java +++ b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java @@ -162,9 +162,9 @@ public class TileEntityMobSpawner extends TileEntity implements ITickable this.worldObj.addBlockEvent(TileEntityMobSpawner.this.pos, Blocks.mob_spawner, 1, 0); } - public void readFromNBT(TagObject nbt) + public void readTags(TagObject nbt) { - super.readFromNBT(nbt); + super.readTags(nbt); this.mobID = nbt.getString("EntityId"); this.spawnDelay = nbt.getShort("Delay"); @@ -192,9 +192,9 @@ public class TileEntityMobSpawner extends TileEntity implements ITickable } } - public void writeToNBT(TagObject nbt) + public void writeTags(TagObject nbt) { - super.writeToNBT(nbt); + super.writeTags(nbt); String s = this.mobID; if (s != null && !s.isEmpty()) diff --git a/common/src/main/java/common/tileentity/TileEntityNote.java b/common/src/main/java/common/tileentity/TileEntityNote.java index f12ced2..18a8e1e 100755 --- a/common/src/main/java/common/tileentity/TileEntityNote.java +++ b/common/src/main/java/common/tileentity/TileEntityNote.java @@ -14,15 +14,15 @@ public class TileEntityNote extends TileEntity /** stores the latest redstone state */ public boolean previousRedstoneState; - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); compound.setByte("note", this.note); } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.note = compound.getByte("note"); this.note = (byte)ExtMath.clampi(this.note, 0, 24); } diff --git a/common/src/main/java/common/tileentity/TileEntityPiston.java b/common/src/main/java/common/tileentity/TileEntityPiston.java index 9c8328b..b8981a0 100755 --- a/common/src/main/java/common/tileentity/TileEntityPiston.java +++ b/common/src/main/java/common/tileentity/TileEntityPiston.java @@ -198,18 +198,18 @@ public class TileEntityPiston extends TileEntity implements ITickable } } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.pistonState = BlockRegistry.getBlockById(compound.getInt("blockId")).getStateFromMeta(compound.getInt("blockData")); this.pistonFacing = Facing.getFront(compound.getInt("facing")); this.lastProgress = this.progress = compound.getFloat("progress"); this.extending = compound.getBool("extending"); } - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); compound.setInt("blockId", BlockRegistry.getIdFromBlock(this.pistonState.getBlock())); compound.setInt("blockData", this.pistonState.getBlock().getMetaFromState(this.pistonState)); compound.setInt("facing", this.pistonFacing.getIndex()); diff --git a/common/src/main/java/common/tileentity/TileEntitySign.java b/common/src/main/java/common/tileentity/TileEntitySign.java index bf4b6ad..417359e 100755 --- a/common/src/main/java/common/tileentity/TileEntitySign.java +++ b/common/src/main/java/common/tileentity/TileEntitySign.java @@ -19,8 +19,8 @@ public class TileEntitySign extends TileEntity { private EntityNPC player; // private boolean oldFormat; - public void writeToNBT(TagObject compound) { - super.writeToNBT(compound); + public void writeTags(TagObject compound) { + super.writeTags(compound); for(int i = 0; i < 4; ++i) { compound.setString("Text" + (i + 1), this.signText[i]); @@ -30,9 +30,9 @@ public class TileEntitySign extends TileEntity { // compound.setString("Command", this.command); } - public void readFromNBT(TagObject compound) { + public void readTags(TagObject compound) { // this.isEditable = false; - super.readFromNBT(compound); + super.readTags(compound); for(int i = 0; i < 4; ++i) { this.signText[i] = compound.getString("Text" + (i + 1)); diff --git a/common/src/main/java/common/tileentity/TileEntitySkull.java b/common/src/main/java/common/tileentity/TileEntitySkull.java index 38c9a43..db52fd9 100755 --- a/common/src/main/java/common/tileentity/TileEntitySkull.java +++ b/common/src/main/java/common/tileentity/TileEntitySkull.java @@ -9,17 +9,17 @@ public class TileEntitySkull extends TileEntity private int skullRotation; // private String user = null; - public void writeToNBT(TagObject compound) + public void writeTags(TagObject compound) { - super.writeToNBT(compound); + super.writeTags(compound); compound.setByte("Rot", (byte)(this.skullRotation & 255)); // if(this.user != null) // compound.setString("Owner", this.user); } - public void readFromNBT(TagObject compound) + public void readTags(TagObject compound) { - super.readFromNBT(compound); + super.readTags(compound); this.skullRotation = compound.getByte("Rot"); // if(compound.hasString("Owner")) // this.user = compound.getString("Owner"); diff --git a/common/src/main/java/common/village/MerchantRecipe.java b/common/src/main/java/common/village/MerchantRecipe.java index d78bc8c..bbecb1e 100755 --- a/common/src/main/java/common/village/MerchantRecipe.java +++ b/common/src/main/java/common/village/MerchantRecipe.java @@ -10,9 +10,9 @@ public class MerchantRecipe { private final ItemStack selling; public MerchantRecipe(TagObject tag) { - this.buying = ItemStack.loadItemStackFromNBT(tag.getTag("buy")); - this.selling = ItemStack.loadItemStackFromNBT(tag.getTag("sell")); - this.buySecond = tag.hasTag("buyB") ? ItemStack.loadItemStackFromNBT(tag.getTag("buyB")) : null; + this.buying = ItemStack.loadItemStackFromNBT(tag.getObject("buy")); + this.selling = ItemStack.loadItemStackFromNBT(tag.getObject("sell")); + this.buySecond = tag.hasObject("buyB") ? ItemStack.loadItemStackFromNBT(tag.getObject("buyB")) : null; } public MerchantRecipe(ItemStack buy1, ItemStack buy2, ItemStack sell) { @@ -47,10 +47,10 @@ public class MerchantRecipe { public TagObject toNbt() { TagObject tag = new TagObject(); - tag.setTag("buy", this.buying.writeToNBT(new TagObject())); - tag.setTag("sell", this.selling.writeToNBT(new TagObject())); + tag.setObject("buy", this.buying.writeToNBT(new TagObject())); + tag.setObject("sell", this.selling.writeToNBT(new TagObject())); if(this.buySecond != null) - tag.setTag("buyB", this.buySecond.writeToNBT(new TagObject())); + tag.setObject("buyB", this.buySecond.writeToNBT(new TagObject())); return tag; } } diff --git a/common/src/main/java/common/village/Village.java b/common/src/main/java/common/village/Village.java index 3997a44..4060def 100755 --- a/common/src/main/java/common/village/Village.java +++ b/common/src/main/java/common/village/Village.java @@ -218,7 +218,7 @@ public class Village // this.noBreedTicks = compound.getInteger("MTick"); this.center = new BlockPos(compound.getInt("CX"), compound.getInt("CY"), compound.getInt("CZ")); this.doorRange = new BlockPos(compound.getInt("ACX"), compound.getInt("ACY"), compound.getInt("ACZ")); - TagObjectList nbttaglist = compound.getTagList("Doors"); + TagObjectList nbttaglist = compound.getObjectList("Doors"); for (int i = 0; i < nbttaglist.size(); ++i) { @@ -255,6 +255,6 @@ public class Village nbttaglist.add(nbttagcompound); } - compound.setTagList("Doors", nbttaglist); + compound.setObjectList("Doors", nbttaglist); } } diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java index adff5f2..873c0b7 100755 --- a/server/src/main/java/server/Server.java +++ b/server/src/main/java/server/Server.java @@ -183,8 +183,8 @@ public final class Server implements IThreadListener { if(!value.noDef || !value.def.equals(value.getValue())) cfg.setString(cvar, value.getValue()); } - data.setTag("Config", cfg); - data.setTag("Universe", UniverseRegistry.saveNbt()); + data.setObject("Config", cfg); + data.setObject("Universe", UniverseRegistry.saveNbt()); File nfile = new File("server.nbt.tmp"); File lfile = new File("server.nbt"); try { @@ -207,11 +207,11 @@ public final class Server implements IThreadListener { if(file.exists()) { try { TagObject tag = TagLoader.readGZip(file); - TagObject cfg = tag.getTag("Config"); + TagObject cfg = tag.getObject("Config"); for(String key : cfg.getKeySet()) { Config.set(key, cfg.getString(key), false); } - UniverseRegistry.loadNbt(tag.getTag("Universe")); + UniverseRegistry.loadNbt(tag.getObject("Universe")); long lastPlayed = tag.getLong("LastAccess"); String version = tag.hasString("Version") ? tag.getString("Version") : null; version = version != null && version.isEmpty() ? "" : version; diff --git a/server/src/main/java/server/clipboard/ClipboardBlock.java b/server/src/main/java/server/clipboard/ClipboardBlock.java index 77cdb58..b2b8fcf 100755 --- a/server/src/main/java/server/clipboard/ClipboardBlock.java +++ b/server/src/main/java/server/clipboard/ClipboardBlock.java @@ -15,7 +15,7 @@ public class ClipboardBlock { public ClipboardBlock(State data, TileEntity tile) { this(data); TagObject tag = new TagObject(); - tile.writeToNBT(tag); + tile.writeTags(tag); this.nbt = tag; } diff --git a/server/src/main/java/server/command/commands/CommandBlock.java b/server/src/main/java/server/command/commands/CommandBlock.java index 3f4f907..81c44c2 100644 --- a/server/src/main/java/server/command/commands/CommandBlock.java +++ b/server/src/main/java/server/command/commands/CommandBlock.java @@ -37,7 +37,7 @@ public class CommandBlock extends Command { TileEntity tile = world.getTileEntity(position); if(tile != null) { TagObject te = new TagObject(); - tile.writeToNBT(te); + tile.writeTags(te); tag.setString("id", te.getString("id")); tag.setInt("x", position.getX()); tag.setInt("y", position.getY()); diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 79bfa35..36db980 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -622,7 +622,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer if(tag.hasString("password")) this.password = tag.getString("password"); this.selected = tag.getInt("selected"); - TagObjectList list = tag.getTagList("characters"); + TagObjectList list = tag.getObjectList("characters"); for(int z = 0; z < list.size(); z++) { this.characters.add(list.get(z)); } @@ -653,7 +653,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer for(TagObject etag : this.characters) { list.add(etag); } - tag.setTagList("characters", list); + tag.setObjectList("characters", list); } // NBTTagCompound stats = new NBTTagCompound(); // for(Entry entry : this.stats.entrySet()) { @@ -2988,14 +2988,14 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer // changed = true; // } - if (itemstack.hasTagCompound() && itemstack.getTagCompound().hasTag("BlockEntityTag")) + if (itemstack.hasTagCompound() && itemstack.getTagCompound().hasObject("BlockEntityTag")) { // if(!itemstack.getTagCompound().hasTag("BlockEntityTag")) { // changed = true; // itemstack.setTagCompound(null); // } // else { - TagObject nbttagcompound = itemstack.getTagCompound().getTag("BlockEntityTag"); + TagObject nbttagcompound = itemstack.getTagCompound().getObject("BlockEntityTag"); if (nbttagcompound.hasInt("x") && nbttagcompound.hasInt("y") && nbttagcompound.hasInt("z")) { @@ -3005,7 +3005,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer if (tileentity != null) { TagObject nbttagcompound1 = new TagObject(); - tileentity.writeToNBT(nbttagcompound1); + tileentity.writeTags(nbttagcompound1); nbttagcompound1.remove("x"); nbttagcompound1.remove("y"); nbttagcompound1.remove("z"); diff --git a/server/src/main/java/server/village/VillageCollection.java b/server/src/main/java/server/village/VillageCollection.java index d58896c..cff672b 100755 --- a/server/src/main/java/server/village/VillageCollection.java +++ b/server/src/main/java/server/village/VillageCollection.java @@ -26,7 +26,7 @@ public class VillageCollection public VillageCollection(TagObject nbt) { if(nbt != null) { this.tickCounter = nbt.getInt("Tick"); - TagObjectList nbttaglist = nbt.getTagList("Villages"); + TagObjectList nbttaglist = nbt.getObjectList("Villages"); for (int i = 0; i < nbttaglist.size(); ++i) { @@ -261,7 +261,7 @@ public class VillageCollection nbttaglist.add(nbttagcompound); } - nbt.setTagList("Villages", nbttaglist); + nbt.setObjectList("Villages", nbttaglist); this.dirty = false; return nbt; } diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index ea12fce..e8f20f1 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -1068,7 +1068,7 @@ public abstract class Converter { sections.add(section); } } - ntag.setTagList("Sections", sections); + ntag.setObjectList("Sections", sections); byte[] biomes = new byte[256]; Arrays.fill(biomes, (byte)(Biome.DEF_BIOME.id & 255)); ntag.setByteArray("Biomes", biomes); @@ -1101,7 +1101,7 @@ public abstract class Converter { entities.add(nent); } } - ntag.setTagList("Entities", entities); + ntag.setObjectList("Entities", entities); ents = tag.getTagList("TileEntities"); entities = new TagObjectList(); @@ -1117,7 +1117,7 @@ public abstract class Converter { entities.add(nent); } } - ntag.setTagList("TileEntities", entities); + ntag.setObjectList("TileEntities", entities); OldNbtTag[] sects = tag.getTagList("Sections"); entities = new TagObjectList(); @@ -1163,7 +1163,7 @@ public abstract class Converter { nsect.setByteArray("Add", adddata.getData()); entities.add(nsect); } - ntag.setTagList("Sections", entities); + ntag.setObjectList("Sections", entities); return ntag; } diff --git a/server/src/main/java/server/world/Region.java b/server/src/main/java/server/world/Region.java index 2982357..f9e1de8 100755 --- a/server/src/main/java/server/world/Region.java +++ b/server/src/main/java/server/world/Region.java @@ -366,7 +366,7 @@ public class Region { // return null; // } // tag = tag.getCompoundTag("Level"); - if(!tag.hasTagList("Sections")) { + if(!tag.hasObjectList("Sections")) { Log.IO.warn("Chunk-Datei bei " + x + "," + z + " hat keine Block-Daten, überspringe"); return null; } @@ -375,7 +375,7 @@ public class Region { chunk.setTerrainPopulated(tag.getBool("TerrainPopulated")); chunk.setLightPopulated(tag.getBool("LightPopulated")); chunk.setInhabited(tag.getLong("InhabitedTime")); - TagObjectList sects = tag.getTagList("Sections"); + TagObjectList sects = tag.getObjectList("Sections"); BlockArray[] sections = new BlockArray[sects.size()]; boolean light = !world.dimension.hasNoLight(); @@ -413,7 +413,7 @@ public class Region { chunk.setBiomes(tag.getByteArray("Biomes")); } - TagObjectList entities = tag.getTagList("Entities"); + TagObjectList entities = tag.getObjectList("Entities"); if(entities != null) { for(int n = 0; n < entities.size(); ++n) { @@ -425,8 +425,8 @@ public class Region { chunk.addEntity(entity); Entity rider = entity; - for(TagObject ride = ent; ride.hasTag("Riding"); ride = ride.getTag("Riding")) { - Entity pass = EntityRegistry.createEntityFromNBT(ride.getTag("Riding"), world); + for(TagObject ride = ent; ride.hasObject("Riding"); ride = ride.getObject("Riding")) { + Entity pass = EntityRegistry.createEntityFromNBT(ride.getObject("Riding"), world); if(pass != null) { chunk.addEntity(pass); @@ -439,7 +439,7 @@ public class Region { } } - TagObjectList tiles = tag.getTagList("TileEntities"); + TagObjectList tiles = tag.getObjectList("TileEntities"); if(tiles != null) { for(int n = 0; n < tiles.size(); ++n) { @@ -452,8 +452,8 @@ public class Region { } } - if(tag.hasTagList("TileTicks")) { - TagObjectList ticks = tag.getTagList("TileTicks"); + if(tag.hasObjectList("TileTicks")) { + TagObjectList ticks = tag.getObjectList("TileTicks"); if(ticks != null) { int invalid = 0; @@ -544,7 +544,7 @@ public class Region { } } - tag.setTagList("Sections", sects); + tag.setObjectList("Sections", sects); tag.setByteArray("Biomes", chunk.getBiomes()); chunk.setHasEntities(false); TagObjectList entities = new TagObjectList(); @@ -560,16 +560,16 @@ public class Region { } } - tag.setTagList("Entities", entities); + tag.setObjectList("Entities", entities); TagObjectList tiles = new TagObjectList(); for(TileEntity tileentity : chunk.getTiles().values()) { TagObject tile = new TagObject(); - tileentity.writeToNBT(tile); + tileentity.writeTags(tile); tiles.add(tile); } - tag.setTagList("TileEntities", tiles); + tag.setObjectList("TileEntities", tiles); List tics = world.getPendingBlockUpdates(chunk); if(tics != null) { @@ -588,7 +588,7 @@ public class Region { ticks.add(tick); } - tag.setTagList("TileTicks", ticks); + tag.setObjectList("TileTicks", ticks); } return tag; diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 218b0c3..294c9f2 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -309,8 +309,8 @@ public final class WorldServer extends AWorldServer { if(tag != null) { this.exterminated = tag.getBool("Exterminated"); this.time = tag.getLong("Time"); - if(tag.hasTag("Generator")) { - this.dimension.fromNbt(tag.getTag("Generator")); + if(tag.hasObject("Generator")) { + this.dimension.fromNbt(tag.getObject("Generator")); if(this.dimension.getType().weather && !this.exterminated) this.weather = this.dimension.getWeather(); this.seed = this.dimension.getSeed(); @@ -448,8 +448,8 @@ public final class WorldServer extends AWorldServer { catch(Exception e) { Log.IO.error(e, "Konnte Ladeliste nicht laden"); } - if(tag != null && tag.hasTagList("Loaders")) { - TagObjectList list = tag.getTagList("Loaders"); + if(tag != null && tag.hasObjectList("Loaders")) { + TagObjectList list = tag.getObjectList("Loaders"); for(int z = 0; z < list.size(); z++) { TagObject pos = list.get(z); this.addLoader(new BlockPos(pos.getInt("X"), pos.getInt("Y"), pos.getInt("Z"))); @@ -937,7 +937,7 @@ public final class WorldServer extends AWorldServer { catch(Exception e) { return false; } - return tag != null && tag.hasTagList("Loaders") && !tag.getTagList("Loaders").isEmpty(); + return tag != null && tag.hasObjectList("Loaders") && !tag.getObjectList("Loaders").isEmpty(); } public static void loadWarps(Dimension dim, Map warps) { @@ -951,8 +951,8 @@ public final class WorldServer extends AWorldServer { Log.IO.error(e, "Konnte Warpliste nicht laden"); return; } - if(tag != null && tag.hasTagList("Warps")) { - TagObjectList list = tag.getTagList("Warps"); + if(tag != null && tag.hasObjectList("Warps")) { + TagObjectList list = tag.getObjectList("Warps"); for(int z = 0; z < list.size(); z++) { TagObject pos = list.get(z); warps.put(pos.getString("Name"), new Position(pos.getDouble("X"), pos.getDouble("Y"), pos.getDouble("Z"), @@ -987,7 +987,7 @@ public final class WorldServer extends AWorldServer { } else { TagObject tag = new TagObject(); - tag.setTagList("Warps", list); + tag.setObjectList("Warps", list); try { TagLoader.writeGZip(tag, file); } @@ -1039,7 +1039,7 @@ public final class WorldServer extends AWorldServer { loader.setInt("Z", pos.getZ()); list.add(loader); } - loaders.setTagList("Loaders", list); + loaders.setObjectList("Loaders", list); File file = new File(this.chunkDir, "loaders.nbt"); if(list.isEmpty()) { file.delete(); @@ -1060,7 +1060,7 @@ public final class WorldServer extends AWorldServer { // this.dataModified = false; TagObject data = new TagObject(); // data.setLong("Seed", this.seed); - data.setTag("Generator", this.dimension.toNbt(true)); + data.setObject("Generator", this.dimension.toNbt(true)); data.setLong("Time", this.time); data.setBool("Exterminated", this.exterminated); data.setString("Weather", this.weather.getName()); diff --git a/server/src/main/java/server/worldgen/structure/MapGenStructure.java b/server/src/main/java/server/worldgen/structure/MapGenStructure.java index ec35bb3..cf8fda7 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenStructure.java +++ b/server/src/main/java/server/worldgen/structure/MapGenStructure.java @@ -232,7 +232,7 @@ public abstract class MapGenStructure extends MapGenBase private void setStructureStart(int chunkX, int chunkZ, StructureStart start) { - this.structureData.tag.setTag("[" + chunkX + "," + chunkZ + "]", start.writeStructureComponentsToNBT(chunkX, chunkZ)); + this.structureData.tag.setObject("[" + chunkX + "," + chunkZ + "]", start.writeStructureComponentsToNBT(chunkX, chunkZ)); this.structureData.dirty = true; } diff --git a/server/src/main/java/server/worldgen/structure/StructureStart.java b/server/src/main/java/server/worldgen/structure/StructureStart.java index 6919ff3..092603b 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStart.java +++ b/server/src/main/java/server/worldgen/structure/StructureStart.java @@ -81,7 +81,7 @@ public abstract class StructureStart nbttaglist.add(structurecomponent.createStructureBaseNBT()); } - nbttagcompound.setTagList("Children", nbttaglist); + nbttagcompound.setObjectList("Children", nbttaglist); this.writeToNBT(nbttagcompound); return nbttagcompound; } @@ -100,7 +100,7 @@ public abstract class StructureStart this.boundingBox = new StructureBoundingBox(tagCompound.getIntArray("BB")); } - TagObjectList nbttaglist = tagCompound.getTagList("Children"); + TagObjectList nbttaglist = tagCompound.getObjectList("Children"); for (int i = 0; i < nbttaglist.size(); ++i) {