From dda5ac3573a485873b43d34f1e45f25f4c1646f5 Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 27 May 2025 21:34:46 +0200 Subject: [PATCH] change nbt format: fix method names --- .../renderer/particle/EntityFirework.java | 6 +++--- .../java/common/attributes/Attributes.java | 4 ++-- .../main/java/common/dimension/Dimension.java | 18 +++++++++--------- .../common/enchantment/EnchantmentHelper.java | 12 ++++++------ common/src/main/java/common/entity/Entity.java | 16 ++++++++-------- .../java/common/entity/animal/EntityHorse.java | 2 +- .../entity/item/EntityCartContainer.java | 2 +- .../main/java/common/entity/npc/EntityNPC.java | 4 ++-- .../entity/projectile/EntityProjectile.java | 6 +++--- .../java/common/entity/types/EntityLiving.java | 2 +- .../java/common/init/UniverseRegistry.java | 12 ++++++------ .../java/common/inventory/InventoryPlayer.java | 2 +- .../common/inventory/InventoryWarpChest.java | 2 +- .../src/main/java/common/item/ItemBanner.java | 2 +- .../java/common/item/ItemEnchantedBook.java | 6 +++--- .../main/java/common/item/ItemFirework.java | 2 +- .../src/main/java/common/item/ItemStack.java | 6 +++--- common/src/main/java/common/nbt/NBTParser.java | 2 +- .../main/java/common/nbt/NBTTagDoubleList.java | 6 +++--- .../main/java/common/nbt/NBTTagFloatList.java | 6 +++--- .../java/common/nbt/NBTTagIntArrayList.java | 6 +++--- .../src/main/java/common/nbt/NBTTagList.java | 10 +++++----- .../main/java/common/nbt/NBTTagStringList.java | 6 +++--- .../main/java/common/nbt/NBTTagTagList.java | 6 +++--- .../common/tileentity/TileEntityBanner.java | 2 +- .../tileentity/TileEntityBrewingStand.java | 2 +- .../common/tileentity/TileEntityChest.java | 2 +- .../common/tileentity/TileEntityDispenser.java | 2 +- .../common/tileentity/TileEntityFurnace.java | 2 +- .../common/tileentity/TileEntityHopper.java | 2 +- .../common/tileentity/TileEntityMachine.java | 4 ++-- .../common/village/MerchantRecipeList.java | 2 +- .../src/main/java/common/village/Village.java | 2 +- server/src/main/java/server/Server.java | 10 +++++----- .../src/main/java/server/network/Player.java | 4 ++-- .../java/server/village/VillageCollection.java | 2 +- server/src/main/java/server/world/Region.java | 8 ++++---- .../main/java/server/world/WorldServer.java | 4 ++-- .../worldgen/structure/StructureMineshaft.java | 2 +- .../worldgen/structure/StructureStart.java | 2 +- 40 files changed, 99 insertions(+), 99 deletions(-) diff --git a/client/src/main/java/client/renderer/particle/EntityFirework.java b/client/src/main/java/client/renderer/particle/EntityFirework.java index 8d2a306..58fde2e 100755 --- a/client/src/main/java/client/renderer/particle/EntityFirework.java +++ b/client/src/main/java/client/renderer/particle/EntityFirework.java @@ -218,7 +218,7 @@ public class EntityFirework for (int i = 0; i < this.fireworkExplosions.size(); ++i) { - NBTTagCompound nbttagcompound = this.fireworkExplosions.getTag(i); + NBTTagCompound nbttagcompound = this.fireworkExplosions.get(i); if (nbttagcompound.getBool("Flicker")) { @@ -250,7 +250,7 @@ public class EntityFirework { for (int i = 0; i < this.fireworkExplosions.size(); ++i) { - NBTTagCompound nbttagcompound = this.fireworkExplosions.getTag(i); + NBTTagCompound nbttagcompound = this.fireworkExplosions.get(i); if (nbttagcompound.getByte("Type") == 1) { @@ -268,7 +268,7 @@ public class EntityFirework if (this.fireworkAge % 2 == 0 && this.fireworkExplosions != null && this.fireworkAge / 2 < this.fireworkExplosions.size()) { int k = this.fireworkAge / 2; - NBTTagCompound nbttagcompound1 = this.fireworkExplosions.getTag(k); + NBTTagCompound nbttagcompound1 = this.fireworkExplosions.get(k); int l = nbttagcompound1.getByte("Type"); boolean flag4 = nbttagcompound1.getBool("Trail"); boolean flag2 = nbttagcompound1.getBool("Flicker"); diff --git a/common/src/main/java/common/attributes/Attributes.java b/common/src/main/java/common/attributes/Attributes.java index 08da00b..5af05b5 100755 --- a/common/src/main/java/common/attributes/Attributes.java +++ b/common/src/main/java/common/attributes/Attributes.java @@ -98,7 +98,7 @@ public class Attributes { for (int i = 0; i < list.size(); ++i) { - NBTTagCompound nbttagcompound = list.getTag(i); + NBTTagCompound nbttagcompound = list.get(i); AttributeInstance iattributeinstance = map.getAttributeInstanceByName(nbttagcompound.getString("Name")); if (iattributeinstance != null) @@ -122,7 +122,7 @@ public class Attributes for (int i = 0; i < nbttaglist.size(); ++i) { - AttributeModifier attributemodifier = readAttributeModifierFromNBT(nbttaglist.getTag(i)); + AttributeModifier attributemodifier = readAttributeModifierFromNBT(nbttaglist.get(i)); if (attributemodifier != null) { diff --git a/common/src/main/java/common/dimension/Dimension.java b/common/src/main/java/common/dimension/Dimension.java index ce8d256..bc650d7 100755 --- a/common/src/main/java/common/dimension/Dimension.java +++ b/common/src/main/java/common/dimension/Dimension.java @@ -924,7 +924,7 @@ public abstract class Dimension extends Nameable implements Comparable 10.0D) { @@ -1565,11 +1565,11 @@ public abstract class Entity this.motionZ = 0.0D; } - this.prevX = this.lastTickPosX = this.posX = nbttaglist.getDouble(0); - this.prevY = this.lastTickPosY = this.posY = nbttaglist.getDouble(1); - this.prevZ = this.lastTickPosZ = this.posZ = nbttaglist.getDouble(2); - this.prevYaw = this.rotYaw = nbttaglist2.getFloat(0); - this.prevPitch = this.rotPitch = nbttaglist2.getFloat(1); + this.prevX = this.lastTickPosX = this.posX = nbttaglist.get(0); + this.prevY = this.lastTickPosY = this.posY = nbttaglist.get(1); + this.prevZ = this.lastTickPosZ = this.posZ = nbttaglist.get(2); + this.prevYaw = this.rotYaw = nbttaglist2.get(0); + this.prevPitch = this.rotPitch = nbttaglist2.get(1); this.setRotationYawHead(this.rotYaw); this.setRenderYawOffset(this.rotYaw); this.fallDistance = tagCompund.getFloat("FallDistance"); diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index 9452e88..aac894f 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -1471,7 +1471,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot") & 255; if (j >= 2 && j < this.horseChest.getSizeInventory()) diff --git a/common/src/main/java/common/entity/item/EntityCartContainer.java b/common/src/main/java/common/entity/item/EntityCartContainer.java index e717b90..cefd14a 100755 --- a/common/src/main/java/common/entity/item/EntityCartContainer.java +++ b/common/src/main/java/common/entity/item/EntityCartContainer.java @@ -217,7 +217,7 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot") & 255; if (j >= 0 && j < this.minecartContainerItems.length) diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java index 1acd05d..b765e54 100755 --- a/common/src/main/java/common/entity/npc/EntityNPC.java +++ b/common/src/main/java/common/entity/npc/EntityNPC.java @@ -3393,7 +3393,7 @@ public abstract class EntityNPC extends EntityLiving NBTTagTagList nbttaglist = tagCompund.getTagList("Equipment"); for(int i = 0; i < this.equipment.length; ++i) { - this.equipment[i] = ItemStack.loadItemStackFromNBT(nbttaglist.getTag(i)); + this.equipment[i] = ItemStack.loadItemStackFromNBT(nbttaglist.get(i)); } } // this.setSpecies(tagCompund.getString("Species")); @@ -3427,7 +3427,7 @@ public abstract class EntityNPC extends EntityLiving for (int i = 0; i < nbttaglist.size(); ++i) { - ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttaglist.getTag(i)); + ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttaglist.get(i)); if (itemstack != null) { diff --git a/common/src/main/java/common/entity/projectile/EntityProjectile.java b/common/src/main/java/common/entity/projectile/EntityProjectile.java index 06b7e30..6e73775 100755 --- a/common/src/main/java/common/entity/projectile/EntityProjectile.java +++ b/common/src/main/java/common/entity/projectile/EntityProjectile.java @@ -289,9 +289,9 @@ public abstract class EntityProjectile extends Entity if (tagCompund.hasDoubleList("direction")) { NBTTagDoubleList nbttaglist = tagCompund.getDoubleList("direction"); - this.motionX = nbttaglist.getDouble(0); - this.motionY = nbttaglist.getDouble(1); - this.motionZ = nbttaglist.getDouble(2); + this.motionX = nbttaglist.get(0); + this.motionY = nbttaglist.get(1); + this.motionZ = nbttaglist.get(2); } else { diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index f8417ef..5c54f45 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -624,7 +624,7 @@ public abstract class EntityLiving extends Entity for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); PotionEffect potioneffect = PotionEffect.fromNbt(nbttagcompound); if (potioneffect != null && !potioneffect.getPotion().isInstant()) diff --git a/common/src/main/java/common/init/UniverseRegistry.java b/common/src/main/java/common/init/UniverseRegistry.java index 4f2ffce..ddb8587 100755 --- a/common/src/main/java/common/init/UniverseRegistry.java +++ b/common/src/main/java/common/init/UniverseRegistry.java @@ -95,14 +95,14 @@ public abstract class UniverseRegistry { public static void loadNbt(NBTTagCompound tag) { NBTTagTagList list = tag.getTagList("Dimensions"); for(int z = 0; z < list.size(); z++) { - Dimension dim = Dimension.getByNbt(list.getTag(z)); + Dimension dim = Dimension.getByNbt(list.get(z)); if(!REGISTRY.containsKey(dim.getDimensionId()) && !ALIASES.containsKey(dim.getDimensionName())) register(dim); } list = tag.getTagList("Names"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound data = list.getTag(z); + NBTTagCompound data = list.get(z); String id = data.getString("ID"); // if(BASE_ALIASES.containsKey(id)) { Dimension dim = ALIASES.get(id); @@ -113,7 +113,7 @@ public abstract class UniverseRegistry { list = tag.getTagList("Sectors"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound data = list.getTag(z); + NBTTagCompound data = list.get(z); String id = data.getString("ID"); Sector sector = SECTORS.get(id); if(sector == null) @@ -123,7 +123,7 @@ public abstract class UniverseRegistry { list = tag.getTagList("Galaxies"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound data = list.getTag(z); + NBTTagCompound data = list.get(z); String id = data.getString("ID"); Galaxy galaxy = GALAXIES.get(id); if(galaxy == null) @@ -133,7 +133,7 @@ public abstract class UniverseRegistry { list = tag.getTagList("Domains"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound data = list.getTag(z); + NBTTagCompound data = list.get(z); String id = data.getString("ID"); Domain domain = DOMAINS.get(id); if(domain == null) @@ -143,7 +143,7 @@ public abstract class UniverseRegistry { list = tag.getTagList("Barycenters"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound link = list.getTag(z); + NBTTagCompound link = list.get(z); if(!assign(link.getString("Celestial"), link.getString("Center"))) Log.TICK.warn("Konnte '" + link.getString("Celestial") + "' nicht zu '" + link.getString("Center") + "' zuweisen"); } diff --git a/common/src/main/java/common/inventory/InventoryPlayer.java b/common/src/main/java/common/inventory/InventoryPlayer.java index ec7adf3..ed01d0b 100755 --- a/common/src/main/java/common/inventory/InventoryPlayer.java +++ b/common/src/main/java/common/inventory/InventoryPlayer.java @@ -489,7 +489,7 @@ public class InventoryPlayer implements IInventory for (int i = 0; i < nbtTagListIn.size(); ++i) { - NBTTagCompound nbttagcompound = nbtTagListIn.getTag(i); + NBTTagCompound nbttagcompound = nbtTagListIn.get(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); diff --git a/common/src/main/java/common/inventory/InventoryWarpChest.java b/common/src/main/java/common/inventory/InventoryWarpChest.java index a1202e3..b91161d 100755 --- a/common/src/main/java/common/inventory/InventoryWarpChest.java +++ b/common/src/main/java/common/inventory/InventoryWarpChest.java @@ -30,7 +30,7 @@ public class InventoryWarpChest extends InventoryBasic for (int k = 0; k < p_70486_1_.size(); ++k) { - NBTTagCompound nbttagcompound = p_70486_1_.getTag(k); + NBTTagCompound nbttagcompound = p_70486_1_.get(k); int j = nbttagcompound.getByte("Slot") & 255; if (j >= 0 && j < this.getSizeInventory()) diff --git a/common/src/main/java/common/item/ItemBanner.java b/common/src/main/java/common/item/ItemBanner.java index 323bb66..e56db80 100755 --- a/common/src/main/java/common/item/ItemBanner.java +++ b/common/src/main/java/common/item/ItemBanner.java @@ -104,7 +104,7 @@ public class ItemBanner extends ItemBlock for (int i = 0; i < nbttaglist.size() && i < 6; ++i) { - NBTTagCompound nbttagcompound1 = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound1 = nbttaglist.get(i); DyeColor enumdyecolor = DyeColor.byDyeDamage(nbttagcompound1.getInt("Color")); TileEntityBanner.EnumBannerPattern pattern = TileEntityBanner.EnumBannerPattern.getPatternByID(nbttagcompound1.getString("Pattern")); diff --git a/common/src/main/java/common/item/ItemEnchantedBook.java b/common/src/main/java/common/item/ItemEnchantedBook.java index a5d8d38..9324711 100755 --- a/common/src/main/java/common/item/ItemEnchantedBook.java +++ b/common/src/main/java/common/item/ItemEnchantedBook.java @@ -66,8 +66,8 @@ public class ItemEnchantedBook extends Item { for (int i = 0; i < nbttaglist.size(); ++i) { - int j = nbttaglist.getTag(i).getShort("id"); - int k = nbttaglist.getTag(i).getShort("lvl"); + int j = nbttaglist.get(i).getShort("id"); + int k = nbttaglist.get(i).getShort("lvl"); if (Enchantment.getEnchantmentById(j) != null) { @@ -87,7 +87,7 @@ public class ItemEnchantedBook extends Item for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); if (nbttagcompound.getShort("id") == enchantment.enchantmentobj.effectId) { diff --git a/common/src/main/java/common/item/ItemFirework.java b/common/src/main/java/common/item/ItemFirework.java index 261fa15..528a194 100755 --- a/common/src/main/java/common/item/ItemFirework.java +++ b/common/src/main/java/common/item/ItemFirework.java @@ -58,7 +58,7 @@ public class ItemFirework extends Item { for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound1 = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound1 = nbttaglist.get(i); List list = Lists.newArrayList(); ItemFireworkCharge.addExplosionInfo(nbttagcompound1, list); diff --git a/common/src/main/java/common/item/ItemStack.java b/common/src/main/java/common/item/ItemStack.java index 4d65c37..b660c36 100755 --- a/common/src/main/java/common/item/ItemStack.java +++ b/common/src/main/java/common/item/ItemStack.java @@ -848,8 +848,8 @@ public final class ItemStack { for (int j = 0; j < nbttaglist.size(); ++j) { - int k = nbttaglist.getTag(j).getShort("id"); - int l = nbttaglist.getTag(j).getShort("lvl"); + int k = nbttaglist.get(j).getShort("id"); + int l = nbttaglist.get(j).getShort("lvl"); if (Enchantment.getEnchantmentById(k) != null) { @@ -1063,7 +1063,7 @@ public final class ItemStack boolean changed = false; NBTTagCompound tag; for(int z = 0; z < oldEnch.size(); z++) { - tag = oldEnch.getTag(z); + tag = oldEnch.get(z); if(tag.getShort("id") != ench.effectId) { newEnch.add(tag); } diff --git a/common/src/main/java/common/nbt/NBTParser.java b/common/src/main/java/common/nbt/NBTParser.java index c29527f..2b16630 100755 --- a/common/src/main/java/common/nbt/NBTParser.java +++ b/common/src/main/java/common/nbt/NBTParser.java @@ -440,7 +440,7 @@ public class NBTParser throw new NBTException("Type cannot be put in a list: " + jsontonbt$any.json); } } - nbttaglist.add(tag); + nbttaglist.addElem(tag); } return nbttaglist; diff --git a/common/src/main/java/common/nbt/NBTTagDoubleList.java b/common/src/main/java/common/nbt/NBTTagDoubleList.java index 4cdc868..bc698d1 100644 --- a/common/src/main/java/common/nbt/NBTTagDoubleList.java +++ b/common/src/main/java/common/nbt/NBTTagDoubleList.java @@ -17,11 +17,11 @@ public class NBTTagDoubleList extends NBTTagList { return new NBTTagDouble(0.0); } - public double getDouble(int index) { - return this.get(index).getDouble(); + public double get(int index) { + return this.getElem(index).getDouble(); } public void add(double value) { - this.add(new NBTTagDouble(value)); + this.addElem(new NBTTagDouble(value)); } } diff --git a/common/src/main/java/common/nbt/NBTTagFloatList.java b/common/src/main/java/common/nbt/NBTTagFloatList.java index db6f005..689ed81 100644 --- a/common/src/main/java/common/nbt/NBTTagFloatList.java +++ b/common/src/main/java/common/nbt/NBTTagFloatList.java @@ -17,11 +17,11 @@ public class NBTTagFloatList extends NBTTagList { return new NBTTagFloat(0.0f); } - public float getFloat(int index) { - return this.get(index).getFloat(); + public float get(int index) { + return this.getElem(index).getFloat(); } public void add(float value) { - this.add(new NBTTagFloat(value)); + this.addElem(new NBTTagFloat(value)); } } diff --git a/common/src/main/java/common/nbt/NBTTagIntArrayList.java b/common/src/main/java/common/nbt/NBTTagIntArrayList.java index 81d34df..22b262c 100644 --- a/common/src/main/java/common/nbt/NBTTagIntArrayList.java +++ b/common/src/main/java/common/nbt/NBTTagIntArrayList.java @@ -17,11 +17,11 @@ public class NBTTagIntArrayList extends NBTTagList { return new NBTTagIntArray(new int[0]); } - public int[] getIntArray(int index) { - return this.get(index).getIntArray(); + public int[] get(int index) { + return this.getElem(index).getIntArray(); } public void add(int[] value) { - this.add(new NBTTagIntArray(value)); + this.addElem(new NBTTagIntArray(value)); } } diff --git a/common/src/main/java/common/nbt/NBTTagList.java b/common/src/main/java/common/nbt/NBTTagList.java index fea099c..90963ba 100755 --- a/common/src/main/java/common/nbt/NBTTagList.java +++ b/common/src/main/java/common/nbt/NBTTagList.java @@ -48,11 +48,11 @@ abstract class NBTTagList extends NBTBase { return sb.append(']').toString(); } - protected void add(K tag) { + protected void addElem(K tag) { this.list.add(tag); } - public void set(int index, K tag) { + protected void set(int index, K tag) { if(index < 0 || index >= this.list.size()) { Log.IO.error("Index außerhalb des Bereiches um Tag in Tag-Liste zu setzen"); return; @@ -60,15 +60,15 @@ abstract class NBTTagList extends NBTBase { this.list.set(index, tag); } - public K remove(int index) { - return this.list.remove(index); + public void remove(int index) { + this.list.remove(index); } public boolean isEmpty() { return this.list.isEmpty(); } - protected K get(int index) { + protected K getElem(int index) { return index >= 0 && index < this.list.size() ? this.list.get(index) : this.getDefault(); } diff --git a/common/src/main/java/common/nbt/NBTTagStringList.java b/common/src/main/java/common/nbt/NBTTagStringList.java index b3bd787..d83838f 100644 --- a/common/src/main/java/common/nbt/NBTTagStringList.java +++ b/common/src/main/java/common/nbt/NBTTagStringList.java @@ -17,11 +17,11 @@ public class NBTTagStringList extends NBTTagList { return new NBTTagString(""); } - public String getString(int index) { - return this.get(index).getString(); + public String get(int index) { + return this.getElem(index).getString(); } public void add(String value) { - this.add(new NBTTagString(value)); + this.addElem(new NBTTagString(value)); } } diff --git a/common/src/main/java/common/nbt/NBTTagTagList.java b/common/src/main/java/common/nbt/NBTTagTagList.java index 988aebe..5c9ab1e 100644 --- a/common/src/main/java/common/nbt/NBTTagTagList.java +++ b/common/src/main/java/common/nbt/NBTTagTagList.java @@ -17,11 +17,11 @@ public class NBTTagTagList extends NBTTagList { return new NBTTagCompound(); } - public NBTTagCompound getTag(int index) { - return this.get(index); + public NBTTagCompound get(int index) { + return this.getElem(index); } public void add(NBTTagCompound value) { - super.add(value); + this.addElem(value); } } diff --git a/common/src/main/java/common/tileentity/TileEntityBanner.java b/common/src/main/java/common/tileentity/TileEntityBanner.java index 2e158fb..33879f5 100755 --- a/common/src/main/java/common/tileentity/TileEntityBanner.java +++ b/common/src/main/java/common/tileentity/TileEntityBanner.java @@ -164,7 +164,7 @@ public class TileEntityBanner extends TileEntity { for (int i = 0; i < this.patterns.size(); ++i) { - NBTTagCompound nbttagcompound = this.patterns.getTag(i); + NBTTagCompound nbttagcompound = this.patterns.get(i); TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern = TileEntityBanner.EnumBannerPattern.getPatternByID(nbttagcompound.getString("Pattern")); if (tileentitybanner$enumbannerpattern != null) diff --git a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java index f07e904..b1079e1 100755 --- a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java @@ -235,7 +235,7 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot"); if (j >= 0 && j < this.brewingItemStacks.length) diff --git a/common/src/main/java/common/tileentity/TileEntityChest.java b/common/src/main/java/common/tileentity/TileEntityChest.java index f3f872a..9d08a94 100755 --- a/common/src/main/java/common/tileentity/TileEntityChest.java +++ b/common/src/main/java/common/tileentity/TileEntityChest.java @@ -174,7 +174,7 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot") & 255; if (j >= 0 && j < this.chestContents.length) diff --git a/common/src/main/java/common/tileentity/TileEntityDispenser.java b/common/src/main/java/common/tileentity/TileEntityDispenser.java index 9096359..db09af3 100755 --- a/common/src/main/java/common/tileentity/TileEntityDispenser.java +++ b/common/src/main/java/common/tileentity/TileEntityDispenser.java @@ -160,7 +160,7 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot") & 255; if (j >= 0 && j < this.stacks.length) diff --git a/common/src/main/java/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java index 13058c6..6d190e2 100755 --- a/common/src/main/java/common/tileentity/TileEntityFurnace.java +++ b/common/src/main/java/common/tileentity/TileEntityFurnace.java @@ -164,7 +164,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot"); if (j >= 0 && j < this.furnaceItemStacks.length) diff --git a/common/src/main/java/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java index 8b7d1fc..d168cd0 100755 --- a/common/src/main/java/common/tileentity/TileEntityHopper.java +++ b/common/src/main/java/common/tileentity/TileEntityHopper.java @@ -45,7 +45,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot"); if (j >= 0 && j < this.inventory.length) diff --git a/common/src/main/java/common/tileentity/TileEntityMachine.java b/common/src/main/java/common/tileentity/TileEntityMachine.java index 9ea3593..588e27a 100755 --- a/common/src/main/java/common/tileentity/TileEntityMachine.java +++ b/common/src/main/java/common/tileentity/TileEntityMachine.java @@ -85,7 +85,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH NBTTagTagList nbttaglist = compound.getTagList("Items"); this.clear(); for(int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); int j = nbttagcompound.getByte("Slot"); if(j >= 0 && j < this.inventory.length) { @@ -98,7 +98,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH res.reset(); } for(int i = 0; i < nbttaglist.size() && i < this.inventory.length; ++i) { - this.resources[i].readFromNbt(nbttaglist.getTag(i)); + this.resources[i].readFromNbt(nbttaglist.get(i)); } // this.isCreative = compound.getBoolean("Creative"); diff --git a/common/src/main/java/common/village/MerchantRecipeList.java b/common/src/main/java/common/village/MerchantRecipeList.java index b652df2..fa2da93 100755 --- a/common/src/main/java/common/village/MerchantRecipeList.java +++ b/common/src/main/java/common/village/MerchantRecipeList.java @@ -57,7 +57,7 @@ public class MerchantRecipeList extends ArrayList { public void fromNbt(NBTTagTagList list) { this.clear(); for(int z = 0; z < list.size(); z++) { - this.add(new MerchantRecipe(list.getTag(z))); + this.add(new MerchantRecipe(list.get(z))); } } diff --git a/common/src/main/java/common/village/Village.java b/common/src/main/java/common/village/Village.java index 8ad4f1a..f2adff2 100755 --- a/common/src/main/java/common/village/Village.java +++ b/common/src/main/java/common/village/Village.java @@ -222,7 +222,7 @@ public class Village for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); VillageDoorInfo villagedoorinfo = new VillageDoorInfo(new BlockPos(nbttagcompound.getInt("X"), nbttagcompound.getInt("Y"), nbttagcompound.getInt("Z")), nbttagcompound.getInt("IDX"), nbttagcompound.getInt("IDZ"), nbttagcompound.getInt("TS")); this.doors.add(villagedoorinfo); } diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java index 2d4f6f5..0b1db9a 100755 --- a/server/src/main/java/server/Server.java +++ b/server/src/main/java/server/Server.java @@ -331,11 +331,11 @@ public final class Server implements IThreadListener { return null; NBTTagDoubleList pos = tag.getDoubleList("Pos"); NBTTagFloatList rot = tag.getFloatList("Rotation"); - double posX = pos.getDouble(0); - double posY = pos.getDouble(1); - double posZ = pos.getDouble(2); - float rotYaw = rot.getFloat(0); - float rotPitch = rot.getFloat(1); + double posX = pos.get(0); + double posY = pos.get(1); + double posZ = pos.get(2); + float rotYaw = rot.get(0); + float rotPitch = rot.get(1); int dimension = tag.getInt("Dimension"); return new Position(posX, posY, posZ, rotYaw, rotPitch, dimension); } diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index f63bdbd..c95e192 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -624,7 +624,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer this.selected = tag.getInt("selected"); NBTTagTagList list = tag.getTagList("characters"); for(int z = 0; z < list.size(); z++) { - this.characters.add(list.getTag(z)); + this.characters.add(list.get(z)); } this.selected = Math.min(this.selected, this.characters.size() - 1); this.charEditor = this.selected < 0; @@ -1656,7 +1656,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer NBTTagDoubleList position = tag.getDoubleList("Pos"); Dimension dimension = UniverseRegistry.getDimension(tag.getInt("Dimension")); String dim = dimension == null ? "???" : dimension.getFormattedName(false); - BlockPos pos = new BlockPos(position.getDouble(0), position.getDouble(1), position.getDouble(2)); + BlockPos pos = new BlockPos(position.get(0), position.get(1), position.get(2)); String type = EntityRegistry.getEntityName(tag.getString("id")); int level = tag.getInt("XpLevel"); return new PlayerCharacter(name, info, align, dim, pos, type, level); diff --git a/server/src/main/java/server/village/VillageCollection.java b/server/src/main/java/server/village/VillageCollection.java index b5ef3f2..fa0818d 100755 --- a/server/src/main/java/server/village/VillageCollection.java +++ b/server/src/main/java/server/village/VillageCollection.java @@ -30,7 +30,7 @@ public class VillageCollection for (int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getTag(i); + NBTTagCompound nbttagcompound = nbttaglist.get(i); Village village = new Village(); village.readVillageDataFromNBT(nbttagcompound); this.villageList.add(village); diff --git a/server/src/main/java/server/world/Region.java b/server/src/main/java/server/world/Region.java index 095bc9c..5f8a7b5 100755 --- a/server/src/main/java/server/world/Region.java +++ b/server/src/main/java/server/world/Region.java @@ -380,7 +380,7 @@ public class Region { boolean light = !world.dimension.hasNoLight(); for(int n = 0; n < sects.size(); ++n) { - NBTTagCompound sect = sects.getTag(n); + NBTTagCompound sect = sects.get(n); int y = sect.getInt("Y"); BlockArray storage = new BlockArray(y << 4, light, null); byte[] blocks = sect.getByteArray("Blocks"); @@ -417,7 +417,7 @@ public class Region { if(entities != null) { for(int n = 0; n < entities.size(); ++n) { - NBTTagCompound ent = entities.getTag(n); + NBTTagCompound ent = entities.get(n); Entity entity = EntityRegistry.createEntityFromNBT(ent, world); chunk.setHasEntities(true); @@ -443,7 +443,7 @@ public class Region { if(tiles != null) { for(int n = 0; n < tiles.size(); ++n) { - NBTTagCompound tile = tiles.getTag(n); + NBTTagCompound tile = tiles.get(n); TileEntity tileentity = TileEntity.createAndLoadEntity(tile); if(tileentity != null) { @@ -458,7 +458,7 @@ public class Region { if(ticks != null) { int invalid = 0; for(int n = 0; n < ticks.size(); ++n) { - NBTTagCompound tick = ticks.getTag(n); + NBTTagCompound tick = ticks.get(n); Block block; if(tick.hasString("i")) { diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 2b34c26..36a7bbe 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -451,7 +451,7 @@ public final class WorldServer extends AWorldServer { if(tag != null && tag.hasTagList("Loaders")) { NBTTagTagList list = tag.getTagList("Loaders"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound pos = list.getTag(z); + NBTTagCompound pos = list.get(z); this.addLoader(new BlockPos(pos.getInt("X"), pos.getInt("Y"), pos.getInt("Z"))); } this.loadersModified = false; @@ -954,7 +954,7 @@ public final class WorldServer extends AWorldServer { if(tag != null && tag.hasTagList("Warps")) { NBTTagTagList list = tag.getTagList("Warps"); for(int z = 0; z < list.size(); z++) { - NBTTagCompound pos = list.getTag(z); + NBTTagCompound pos = list.get(z); warps.put(pos.getString("Name"), new Position(pos.getDouble("X"), pos.getDouble("Y"), pos.getDouble("Z"), pos.getFloat("Yaw"), pos.getFloat("Pitch"), dim.getDimensionId())); } diff --git a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java index 5d77070..13899f0 100755 --- a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java +++ b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java @@ -728,7 +728,7 @@ public class StructureMineshaft for (int i = 0; i < nbttaglist.size(); ++i) { - this.roomsLinkedToTheRoom.add(new StructureBoundingBox(nbttaglist.getIntArray(i))); + this.roomsLinkedToTheRoom.add(new StructureBoundingBox(nbttaglist.get(i))); } } } diff --git a/server/src/main/java/server/worldgen/structure/StructureStart.java b/server/src/main/java/server/worldgen/structure/StructureStart.java index 9e46e3b..63d7a77 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStart.java +++ b/server/src/main/java/server/worldgen/structure/StructureStart.java @@ -104,7 +104,7 @@ public abstract class StructureStart for (int i = 0; i < nbttaglist.size(); ++i) { - this.components.add(MapGenStructureIO.getStructureComponent(nbttaglist.getTag(i), worldIn)); + this.components.add(MapGenStructureIO.getStructureComponent(nbttaglist.get(i), worldIn)); } this.readFromNBT(tagCompound);