From 6c55d59f1fdab19cdfd1b5163c9e84b9e91f3272 Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 28 May 2025 01:11:46 +0200 Subject: [PATCH] cleanup, rename, nbt->cdt "compressed data tree" --- client/src/main/java/client/Client.java | 11 +- .../client/gui/container/GuiContainer.java | 48 ++-- .../java/client/network/ClientPlayer.java | 8 +- .../renderer/entity/RenderEntityItem.java | 8 +- .../client/renderer/particle/EntityFX.java | 8 +- .../renderer/particle/EntityFirework.java | 20 +- .../TileEntityItemStackRenderer.java | 12 - .../java/client/util/PlayerController.java | 8 +- .../common/ai/EntityAIControlledByPlayer.java | 2 +- .../java/common/ai/EntityAIShareItems.java | 14 +- .../java/common/ai/EntityAITakePlace.java | 8 +- .../block/artificial/BlockFlowerPot.java | 2 +- .../java/common/block/natural/BlockOre.java | 2 +- .../java/common/block/tech/BlockCauldron.java | 10 +- .../common/block/tech/BlockDispenser.java | 2 +- .../java/common/block/tech/BlockDropper.java | 4 +- .../main/java/common/block/tech/BlockTNT.java | 2 +- .../java/common/block/tile/BlockBanner.java | 20 +- .../java/common/block/tile/BlockSkull.java | 6 - .../main/java/common/dimension/Dimension.java | 40 ++- .../main/java/common/dimension/Nameable.java | 12 +- .../common/enchantment/EnchantmentHelper.java | 44 ++-- .../src/main/java/common/entity/Entity.java | 147 +++++------ .../common/entity/EntityTrackerEntry.java | 2 +- .../java/common/entity/animal/EntityBat.java | 8 +- .../common/entity/animal/EntityChicken.java | 8 +- .../java/common/entity/animal/EntityCow.java | 2 +- .../entity/animal/EntityDragonPart.java | 4 +- .../common/entity/animal/EntityHorse.java | 22 +- .../common/entity/animal/EntityMooshroom.java | 2 +- .../common/entity/animal/EntityOcelot.java | 12 +- .../java/common/entity/animal/EntityPig.java | 8 +- .../common/entity/animal/EntityRabbit.java | 8 +- .../common/entity/animal/EntitySheep.java | 8 +- .../java/common/entity/animal/EntityWolf.java | 18 +- .../java/common/entity/item/EntityBoat.java | 4 +- .../java/common/entity/item/EntityCart.java | 4 +- .../entity/item/EntityCartContainer.java | 20 +- .../common/entity/item/EntityCrystal.java | 4 +- .../common/entity/item/EntityExplosion.java | 4 +- .../common/entity/item/EntityFalling.java | 4 +- .../common/entity/item/EntityFireworks.java | 8 +- .../common/entity/item/EntityHopperCart.java | 8 +- .../java/common/entity/item/EntityItem.java | 24 +- .../common/entity/item/EntityLeashKnot.java | 6 +- .../java/common/entity/item/EntityNuke.java | 4 +- .../java/common/entity/item/EntityTnt.java | 4 +- .../common/entity/item/EntityTntCart.java | 8 +- .../java/common/entity/item/EntityXp.java | 4 +- .../common/entity/npc/EntityGargoyle.java | 8 +- .../java/common/entity/npc/EntityHaunter.java | 8 +- .../java/common/entity/npc/EntityMobNPC.java | 8 +- .../java/common/entity/npc/EntityNPC.java | 52 ++-- .../java/common/entity/npc/EntitySlime.java | 8 +- .../common/entity/projectile/EntityArrow.java | 4 +- .../entity/projectile/EntityBullet.java | 4 +- .../common/entity/projectile/EntityDie.java | 8 +- .../entity/projectile/EntityDynamite.java | 8 +- .../entity/projectile/EntityFireball.java | 8 +- .../common/entity/projectile/EntityHook.java | 6 +- .../entity/projectile/EntityPotion.java | 12 +- .../entity/projectile/EntityProjectile.java | 6 +- .../common/entity/types/EntityAnimal.java | 12 +- .../common/entity/types/EntityLiving.java | 16 +- .../common/entity/types/EntityTameable.java | 8 +- .../common/entity/types/EntityThrowable.java | 4 +- .../entity/types/EntityWeatherEffect.java | 4 +- .../java/common/init/CraftingRegistry.java | 82 +++--- .../java/common/init/DispenserRegistry.java | 113 +------- .../main/java/common/init/EntityRegistry.java | 15 +- .../java/common/init/UniverseRegistry.java | 28 +- .../main/java/common/inventory/Container.java | 104 ++++---- .../inventory/ContainerBrewingStand.java | 4 +- .../java/common/inventory/ContainerChest.java | 2 +- .../common/inventory/ContainerDispenser.java | 4 +- .../inventory/ContainerEnchantment.java | 12 +- .../common/inventory/ContainerFurnace.java | 4 +- .../common/inventory/ContainerHopper.java | 2 +- .../inventory/ContainerHorseInventory.java | 2 +- .../common/inventory/ContainerMachine.java | 2 +- .../common/inventory/ContainerMerchant.java | 4 +- .../common/inventory/ContainerPlayer.java | 8 +- .../common/inventory/ContainerRepair.java | 10 +- .../common/inventory/ContainerWorkbench.java | 4 +- .../java/common/inventory/InventoryBasic.java | 18 +- .../common/inventory/InventoryCrafting.java | 4 +- .../common/inventory/InventoryHelper.java | 10 +- .../common/inventory/InventoryMerchant.java | 8 +- .../common/inventory/InventoryPlayer.java | 40 +-- .../common/inventory/InventoryWarpChest.java | 24 +- .../src/main/java/common/inventory/Slot.java | 2 +- .../java/common/inventory/SlotCrafting.java | 2 +- .../common/inventory/SlotFurnaceOutput.java | 2 +- .../common/inventory/SlotMerchantResult.java | 12 +- .../src/main/java/common/item/ItemArmor.java | 6 +- .../src/main/java/common/item/ItemBanner.java | 2 +- common/src/main/java/common/item/ItemBed.java | 2 +- .../src/main/java/common/item/ItemBlock.java | 4 +- .../src/main/java/common/item/ItemBoat.java | 2 +- .../src/main/java/common/item/ItemBook.java | 2 +- .../src/main/java/common/item/ItemBucket.java | 6 +- .../main/java/common/item/ItemBucketMilk.java | 4 +- .../java/common/item/ItemCarrotOnAStick.java | 2 +- .../main/java/common/item/ItemChargedOrb.java | 2 +- common/src/main/java/common/item/ItemDie.java | 2 +- .../src/main/java/common/item/ItemDoor.java | 2 +- common/src/main/java/common/item/ItemDye.java | 10 +- .../main/java/common/item/ItemDynamite.java | 2 +- common/src/main/java/common/item/ItemEgg.java | 2 +- .../main/java/common/item/ItemExpBottle.java | 2 +- .../main/java/common/item/ItemFireball.java | 2 +- .../main/java/common/item/ItemFirework.java | 2 +- .../src/main/java/common/item/ItemFood.java | 2 +- .../java/common/item/ItemGlassBottle.java | 4 +- .../main/java/common/item/ItemLilyPad.java | 2 +- .../src/main/java/common/item/ItemMetal.java | 2 +- .../main/java/common/item/ItemMetalBlock.java | 2 +- .../main/java/common/item/ItemMinecart.java | 2 +- .../java/common/item/ItemMonsterPlacer.java | 6 +- .../main/java/common/item/ItemNameTag.java | 2 +- .../main/java/common/item/ItemNpcSpawner.java | 4 +- .../src/main/java/common/item/ItemPotion.java | 6 +- .../main/java/common/item/ItemRedstone.java | 2 +- .../src/main/java/common/item/ItemReed.java | 4 +- .../src/main/java/common/item/ItemSaddle.java | 2 +- .../main/java/common/item/ItemSeedFood.java | 2 +- .../src/main/java/common/item/ItemSeeds.java | 2 +- .../src/main/java/common/item/ItemSign.java | 2 +- .../src/main/java/common/item/ItemSkull.java | 2 +- .../src/main/java/common/item/ItemSlab.java | 8 +- .../src/main/java/common/item/ItemSnow.java | 4 +- .../main/java/common/item/ItemSnowball.java | 2 +- .../src/main/java/common/item/ItemStack.java | 247 ++++++++---------- .../java/common/item/ItemWeatherToken.java | 2 +- common/src/main/java/common/item/RngLoot.java | 10 +- .../java/common/network/IClientPlayer.java | 2 +- .../java/common/network/PacketBuffer.java | 2 +- .../main/java/common/packet/CPacketCheat.java | 2 +- .../java/common/packet/SPacketJoinGame.java | 4 +- .../java/common/packet/SPacketRespawn.java | 4 +- .../packet/SPacketUpdateEntityTags.java | 2 +- .../packet/SPacketUpdateTileEntity.java | 12 +- .../main/java/common/potion/PotionEffect.java | 26 +- common/src/main/java/common/tags/TagByte.java | 4 +- .../src/main/java/common/tags/TagDouble.java | 4 +- .../src/main/java/common/tags/TagFloat.java | 4 +- common/src/main/java/common/tags/TagInt.java | 4 +- .../main/java/common/tags/TagInterpreter.java | 53 ++-- .../src/main/java/common/tags/TagLoader.java | 4 + common/src/main/java/common/tags/TagLong.java | 4 +- .../src/main/java/common/tags/TagObject.java | 2 +- .../src/main/java/common/tags/TagShort.java | 4 +- .../tileentity/TileEntityBrewingStand.java | 10 +- .../common/tileentity/TileEntityChest.java | 12 +- .../tileentity/TileEntityDispenser.java | 12 +- .../common/tileentity/TileEntityFurnace.java | 24 +- .../common/tileentity/TileEntityHopper.java | 40 +-- .../common/tileentity/TileEntityMachine.java | 22 +- .../java/common/village/MerchantRecipe.java | 14 +- .../common/village/MerchantRecipeList.java | 14 +- .../src/main/java/common/village/Village.java | 64 ++--- server/src/main/java/server/Server.java | 40 ++- .../java/server/clipboard/ClipboardBlock.java | 8 +- .../java/server/command/ArgumentSplitter.java | 165 ------------ .../main/java/server/command/TagParser.java | 2 +- .../server/command/commands/CommandSpawn.java | 8 +- .../src/main/java/server/network/Player.java | 89 +++---- .../server/village/VillageCollection.java | 32 +-- .../src/main/java/server/world/Converter.java | 59 ++--- server/src/main/java/server/world/Region.java | 10 +- .../main/java/server/world/WorldServer.java | 75 ++---- .../worldgen/structure/MapGenStructure.java | 26 +- .../worldgen/structure/MapGenStructureIO.java | 4 +- .../worldgen/structure/MapGenVillage.java | 8 +- .../worldgen/structure/StructureBridge.java | 44 ++-- .../structure/StructureComponent.java | 38 +-- .../structure/StructureMineshaft.java | 30 +-- .../structure/StructureScattered.java | 28 +- .../worldgen/structure/StructureStart.java | 46 ++-- .../structure/StructureStronghold.java | 68 ++--- .../worldgen/structure/StructureVillage.java | 60 ++--- 181 files changed, 1254 insertions(+), 1664 deletions(-) diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 5df3f6d..6829399 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -1380,7 +1380,7 @@ public class Client implements IThreadListener { if (this.world.getState(blockpos).getBlock() != Blocks.air) { - int i = itemstack != null ? itemstack.stackSize : 0; + int i = itemstack != null ? itemstack.size : 0; if (this.controller.clickRight(this.player, this.world, itemstack, blockpos, this.pointed.side, this.pointed.vec)) { @@ -1393,11 +1393,11 @@ public class Client implements IThreadListener { return; } - if (itemstack.stackSize == 0) + if (itemstack.size == 0) { this.player.inventory.mainInventory[this.player.inventory.currentItem] = null; } - else if (itemstack.stackSize != i) // || this.controller.isCreative()) + else if (itemstack.size != i) // || this.controller.isCreative()) { this.entityRenderer.itemRenderer.resetEquippedProgress(); } @@ -1426,12 +1426,9 @@ public class Client implements IThreadListener { return; } -// boolean flag = this.thePlayer.creative; int meta = 0; boolean flag1 = false; -// TileEntity tileentity = null; Item item = null; -// NBTTagCompound tag = null; if (this.pointed.type == HitPosition.ObjectType.BLOCK) { @@ -1902,7 +1899,7 @@ public class Client implements IThreadListener { : "Rüstung: n/a, Pfeile: n/a") + "\n" + // ItemStack held = ((EntityLiving)entity).getHeldItem(); (held != null ? - "Gegens.: " + ItemRegistry.REGISTRY.getNameForObject(held.getItem()) + " x" + held.stackSize + " (" + held.getMetadata() + ")" : "Gegens.: n/a") + "\n" + + "Gegens.: " + ItemRegistry.REGISTRY.getNameForObject(held.getItem()) + " x" + held.size + " (" + held.getMetadata() + ")" : "Gegens.: n/a") + "\n" + "Eigens.: " + (entity.dead ? "D" : " ") + (entity.noClip ? "N" : " ") + (entity.onGround ? "G" : " ") + (entity.canBeCollidedWith() ? "C" : " ") + (entity.canBePushed() ? "P" : " ") + (entity.isBurning() ? "B" : " ") // + (entity.isInvisible() ? "I" : " ") // + (entity.isSilent() ? "S" : " ") diff --git a/client/src/main/java/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java index c88a15b..7fe7cfd 100755 --- a/client/src/main/java/client/gui/container/GuiContainer.java +++ b/client/src/main/java/client/gui/container/GuiContainer.java @@ -374,20 +374,20 @@ public abstract class GuiContainer extends Gui if (this.draggedStack != null && this.isRightMouseClick) { itemstack = itemstack.copy(); - itemstack.stackSize = ExtMath.ceilf((float)itemstack.stackSize / 2.0F); + itemstack.size = ExtMath.ceilf((float)itemstack.size / 2.0F); } else if (this.dragSplitting && this.dragSplittingSlots.size() > 1) { itemstack = itemstack.copy(); - itemstack.stackSize = this.dragSplittingRemnant; + itemstack.size = this.dragSplittingRemnant; - if (itemstack.stackSize == 0) + if (itemstack.size == 0) { s = "" + TextColor.YELLOW + "0"; } } else if(itemstack == this.cheatStack) { - s = TextColor.DGREEN + "+" + TextColor.GREEN + ItemStack.formatAmount(itemstack.stackSize); + s = TextColor.DGREEN + "+" + TextColor.GREEN + ItemStack.formatAmount(itemstack.size); } this.drawItemStack(itemstack, mouseX - j2, mouseY - k2, s); @@ -518,7 +518,7 @@ public abstract class GuiContainer extends Gui if (slotIn == this.clickedSlot && this.draggedStack != null && this.isRightMouseClick && itemstack != null) { itemstack = itemstack.copy(); - itemstack.stackSize /= 2; + itemstack.size /= 2; } else if (this.dragSplitting && this.dragSplittingSlots.contains(slotIn) && itemstack1 != null) { @@ -531,18 +531,18 @@ public abstract class GuiContainer extends Gui { itemstack = itemstack1.copy(); flag = true; - Container.computeStackSize(this.dragSplittingSlots, this.dragSplittingLimit, itemstack, slotIn.getStack() == null ? 0 : slotIn.getStack().stackSize); + Container.computeStackSize(this.dragSplittingSlots, this.dragSplittingLimit, itemstack, slotIn.getStack() == null ? 0 : slotIn.getStack().size); - if (itemstack.stackSize > itemstack.getMaxStackSize()) + if (itemstack.size > itemstack.getMaxStackSize()) { s = TextColor.YELLOW + ItemStack.formatAmount(itemstack.getMaxStackSize()); - itemstack.stackSize = itemstack.getMaxStackSize(); + itemstack.size = itemstack.getMaxStackSize(); } - if (itemstack.stackSize > slotIn.getItemStackLimit(itemstack)) + if (itemstack.size > slotIn.getItemStackLimit(itemstack)) { s = TextColor.YELLOW + ItemStack.formatAmount(slotIn.getItemStackLimit(itemstack)); - itemstack.stackSize = slotIn.getItemStackLimit(itemstack); + itemstack.size = slotIn.getItemStackLimit(itemstack); } } else @@ -593,25 +593,25 @@ public abstract class GuiContainer extends Gui if (itemstack != null && this.dragSplitting) { - this.dragSplittingRemnant = itemstack.stackSize; + this.dragSplittingRemnant = itemstack.size; for (Slot slot : this.dragSplittingSlots) { ItemStack itemstack1 = itemstack.copy(); - int i = slot.getStack() == null ? 0 : slot.getStack().stackSize; + int i = slot.getStack() == null ? 0 : slot.getStack().size; Container.computeStackSize(this.dragSplittingSlots, this.dragSplittingLimit, itemstack1, i); - if (itemstack1.stackSize > itemstack1.getMaxStackSize()) + if (itemstack1.size > itemstack1.getMaxStackSize()) { - itemstack1.stackSize = itemstack1.getMaxStackSize(); + itemstack1.size = itemstack1.getMaxStackSize(); } - if (itemstack1.stackSize > slot.getItemStackLimit(itemstack1)) + if (itemstack1.size > slot.getItemStackLimit(itemstack1)) { - itemstack1.stackSize = slot.getItemStackLimit(itemstack1); + itemstack1.size = slot.getItemStackLimit(itemstack1); } - this.dragSplittingRemnant -= itemstack1.stackSize - i; + this.dragSplittingRemnant -= itemstack1.size - i; } } } @@ -644,7 +644,7 @@ public abstract class GuiContainer extends Gui if(this.cheatStack != null) { Slot slot = this.getSlotAtPosition(mouseX, mouseY); if((mouseButton == 0 || mouseButton == 1) && slot != null && this.gm.player != null && slot.inventory == this.gm.player.inventory) - this.gm.player.client.addToSendQueue(new CPacketCheat(this.cheatStack, slot.getIndex(), mouseButton == 0 && this.cheatStack.stackSize > 1)); + this.gm.player.client.addToSendQueue(new CPacketCheat(this.cheatStack, slot.getIndex(), mouseButton == 0 && this.cheatStack.size > 1)); if(mouseButton != 1 && !this.gm.ctrl()) this.cheatStack = null; return; @@ -811,7 +811,7 @@ public abstract class GuiContainer extends Gui // } // } // else - if (this.dragSplitting && slot != null && itemstack != null && itemstack.stackSize > this.dragSplittingSlots.size() && Container.canAddItemToSlot(slot, itemstack, true) && slot.isItemValid(itemstack) && this.inventorySlots.canDragIntoSlot(slot)) + if (this.dragSplitting && slot != null && itemstack != null && itemstack.size > this.dragSplittingSlots.size() && Container.canAddItemToSlot(slot, itemstack, true) && slot.isItemValid(itemstack) && this.inventorySlots.canDragIntoSlot(slot)) { this.dragSplittingSlots.add(slot); this.updateDragSplitting(); @@ -1090,13 +1090,13 @@ public abstract class GuiContainer extends Gui { if (stack != null) { - if (stack.stackSize != 1 || text != null) + if (stack.size != 1 || text != null) { - String s = text == null ? ItemStack.formatAmount(stack.stackSize) : text; + String s = text == null ? ItemStack.formatAmount(stack.size) : text; - if (text == null && stack.stackSize < 1) + if (text == null && stack.size < 1) { - s = TextColor.RED + ItemStack.formatAmount(stack.stackSize); + s = TextColor.RED + ItemStack.formatAmount(stack.size); } // this.drawString(s, , ); // Vec2i size = Drawing.txt_size(0, 0, 0, 0, 65536, 65536, s); @@ -1201,7 +1201,7 @@ public abstract class GuiContainer extends Gui } else { this.cheatStack = ITEM_LIST.get(i1).copy(); - this.cheatStack.stackSize = full ? this.cheatStack.getMaxStackSize() : 1; + this.cheatStack.size = full ? this.cheatStack.getMaxStackSize() : 1; } return true; } diff --git a/client/src/main/java/client/network/ClientPlayer.java b/client/src/main/java/client/network/ClientPlayer.java index 706a642..08399ac 100755 --- a/client/src/main/java/client/network/ClientPlayer.java +++ b/client/src/main/java/client/network/ClientPlayer.java @@ -1331,7 +1331,7 @@ public class ClientPlayer extends NetHandler implements IClientPlayer } /** - * Updates the NBTTagCompound metadata of instances of the following entitytypes: Mob spawners, command blocks, + * Updates the metadata of instances of the following entitytypes: Mob spawners, command blocks, * beacons, skulls, flowerpot */ public void handleUpdateTileEntity(SPacketUpdateTileEntity packetIn) @@ -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.readTags(packetIn.getNbtCompound()); + tileentity.readTags(packetIn.getTags()); } } } @@ -1714,14 +1714,14 @@ public class ClientPlayer extends NetHandler implements IClientPlayer //// } // } - public void handleEntityNBT(SPacketUpdateEntityTags packetIn) + public void handleEntityTags(SPacketUpdateEntityTags packetIn) { NetHandler.checkThread(packetIn, this, this.gameController, this.clientWorldController); Entity entity = packetIn.getEntity(this.clientWorldController); if (entity != null) { - entity.clientUpdateEntityNBT(packetIn.getTagCompound()); + entity.clientUpdateEntityTags(packetIn.getTagCompound()); } } diff --git a/client/src/main/java/client/renderer/entity/RenderEntityItem.java b/client/src/main/java/client/renderer/entity/RenderEntityItem.java index 21e8fd5..3a61d04 100755 --- a/client/src/main/java/client/renderer/entity/RenderEntityItem.java +++ b/client/src/main/java/client/renderer/entity/RenderEntityItem.java @@ -66,19 +66,19 @@ public class RenderEntityItem extends Render { int i = 1; - if (stack.stackSize > 48) + if (stack.size > 48) { i = 5; } - else if (stack.stackSize > 32) + else if (stack.size > 32) { i = 4; } - else if (stack.stackSize > 16) + else if (stack.size > 16) { i = 3; } - else if (stack.stackSize > 1) + else if (stack.size > 1) { i = 2; } diff --git a/client/src/main/java/client/renderer/particle/EntityFX.java b/client/src/main/java/client/renderer/particle/EntityFX.java index 3ef2b40..6f177ff 100755 --- a/client/src/main/java/client/renderer/particle/EntityFX.java +++ b/client/src/main/java/client/renderer/particle/EntityFX.java @@ -208,16 +208,16 @@ public class EntityFX extends Entity } /** - * (abstract) Protected helper method to write subclass entity data to NBT. + * (abstract) Protected helper method to write subclass entity data. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tag) { } /** - * (abstract) Protected helper method to read subclass entity data from NBT. + * (abstract) Protected helper method to read subclass entity data. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tag) { } diff --git a/client/src/main/java/client/renderer/particle/EntityFirework.java b/client/src/main/java/client/renderer/particle/EntityFirework.java index d134a40..00636d7 100755 --- a/client/src/main/java/client/renderer/particle/EntityFirework.java +++ b/client/src/main/java/client/renderer/particle/EntityFirework.java @@ -218,9 +218,9 @@ public class EntityFirework for (int i = 0; i < this.fireworkExplosions.size(); ++i) { - TagObject nbttagcompound = this.fireworkExplosions.get(i); + TagObject tag = this.fireworkExplosions.get(i); - if (nbttagcompound.getBool("Flicker")) + if (tag.getBool("Flicker")) { this.twinkle = true; this.particleMaxAge += 15; @@ -250,9 +250,9 @@ public class EntityFirework { for (int i = 0; i < this.fireworkExplosions.size(); ++i) { - TagObject nbttagcompound = this.fireworkExplosions.get(i); + TagObject tag = this.fireworkExplosions.get(i); - if (nbttagcompound.getByte("Type") == 1) + if (tag.getByte("Type") == 1) { flag1 = true; break; @@ -268,12 +268,12 @@ public class EntityFirework if (this.fireworkAge % 2 == 0 && this.fireworkExplosions != null && this.fireworkAge / 2 < this.fireworkExplosions.size()) { int k = this.fireworkAge / 2; - TagObject nbttagcompound1 = this.fireworkExplosions.get(k); - int l = nbttagcompound1.getByte("Type"); - boolean flag4 = nbttagcompound1.getBool("Trail"); - boolean flag2 = nbttagcompound1.getBool("Flicker"); - int[] aint = nbttagcompound1.getIntArray("Colors"); - int[] aint1 = nbttagcompound1.getIntArray("FadeColors"); + TagObject tag = this.fireworkExplosions.get(k); + int l = tag.getByte("Type"); + boolean flag4 = tag.getBool("Trail"); + boolean flag2 = tag.getBool("Flicker"); + int[] aint = tag.getIntArray("Colors"); + int[] aint1 = tag.getIntArray("FadeColors"); if (aint.length == 0) { diff --git a/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java index d7e24b3..6fcba46 100755 --- a/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java @@ -30,18 +30,6 @@ public class TileEntityItemStackRenderer } else if (itemStackIn.getItem() == Items.skull) { -// String user = null; -// -// if (itemStackIn.hasTagCompound()) -// { -// NBTTagCompound nbttagcompound = itemStackIn.getTagCompound(); -// -// if (nbttagcompound.hasString("SkullOwner") && nbttagcompound.getString("SkullOwner").length() > 0) -// { -// user = nbttagcompound.getString("SkullOwner"); -// } -// } - if (TileEntitySkullRenderer.instance != null) { GL11.glPushMatrix(); diff --git a/client/src/main/java/client/util/PlayerController.java b/client/src/main/java/client/util/PlayerController.java index b12f676..56812bc 100755 --- a/client/src/main/java/client/util/PlayerController.java +++ b/client/src/main/java/client/util/PlayerController.java @@ -64,7 +64,7 @@ public class PlayerController { if(stack != null) { stack.onBlockDestroyed(world, block, pos, this.gm.player); - if(stack.stackSize == 0) { + if(stack.size == 0) { this.gm.player.destroyCurrentEquippedItem(); } } @@ -256,13 +256,13 @@ public class PlayerController { public boolean sendUseItem(EntityNPC player, World world, ItemStack stack) { this.syncItem(); this.handler.addToSendQueue(new CPacketPlace(player.inventory.getCurrentItem())); - int size = stack.stackSize; + int size = stack.size; ItemStack changed = stack.useItemRightClick(world, player); - if(changed != stack || changed != null && changed.stackSize != size) { + if(changed != stack || changed != null && changed.size != size) { player.inventory.mainInventory[player.inventory.currentItem] = changed; - if(changed.stackSize == 0) { + if(changed.size == 0) { player.inventory.mainInventory[player.inventory.currentItem] = null; } diff --git a/common/src/main/java/common/ai/EntityAIControlledByPlayer.java b/common/src/main/java/common/ai/EntityAIControlledByPlayer.java index 711b429..7b4bed0 100755 --- a/common/src/main/java/common/ai/EntityAIControlledByPlayer.java +++ b/common/src/main/java/common/ai/EntityAIControlledByPlayer.java @@ -178,7 +178,7 @@ public class EntityAIControlledByPlayer extends EntityAIBase { itemstack.damageItem(1, entityplayer); - if (itemstack.stackSize == 0) + if (itemstack.size == 0) { ItemStack itemstack1 = new ItemStack(Items.fishing_rod); itemstack1.setTagCompound(itemstack.getTagCompound()); diff --git a/common/src/main/java/common/ai/EntityAIShareItems.java b/common/src/main/java/common/ai/EntityAIShareItems.java index b22235c..a43c792 100755 --- a/common/src/main/java/common/ai/EntityAIShareItems.java +++ b/common/src/main/java/common/ai/EntityAIShareItems.java @@ -60,21 +60,21 @@ public class EntityAIShareItems extends EntityAIWatchClosest2 { Item item = itemstack.getItem(); - if ((item == Items.bread || item == Items.potato || item == Items.carrot) && itemstack.stackSize > 3) + if ((item == Items.bread || item == Items.potato || item == Items.carrot) && itemstack.size > 3) { - int l = itemstack.stackSize / 2; - itemstack.stackSize -= l; + int l = itemstack.size / 2; + itemstack.size -= l; itemstack1 = new ItemStack(item, l, itemstack.getMetadata()); } - else if (item == Items.wheats && itemstack.stackSize > 5) + else if (item == Items.wheats && itemstack.size > 5) { - int j = itemstack.stackSize / 2 / 3 * 3; + int j = itemstack.size / 2 / 3 * 3; int k = j / 3; - itemstack.stackSize -= j; + itemstack.size -= j; itemstack1 = new ItemStack(Items.bread, k, 0); } - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { inventorybasic.setInventorySlotContents(i, (ItemStack)null); } diff --git a/common/src/main/java/common/ai/EntityAITakePlace.java b/common/src/main/java/common/ai/EntityAITakePlace.java index 287ce5a..9e6bee8 100755 --- a/common/src/main/java/common/ai/EntityAITakePlace.java +++ b/common/src/main/java/common/ai/EntityAITakePlace.java @@ -114,8 +114,8 @@ public class EntityAITakePlace extends EntityAIBase (float)this.entity.getVerticalFaceSpeed()); this.entity.swingItem(); world.setState(blockpos, state, 3); - --stack.stackSize; - if(stack.stackSize <= 0) + --stack.size; + if(stack.size <= 0) this.entity.setItemNoUpdate(0, null); } } @@ -125,14 +125,14 @@ public class EntityAITakePlace extends EntityAIBase if (STEALABLE.containsKey(state) && (this.entity.getHeldItem() == null || (ItemStack.areItemsEqual(STEALABLE.get(state), - this.entity.getHeldItem()) && this.entity.getHeldItem().stackSize < this.entity.getHeldItem().getMaxStackSize()))) + this.entity.getHeldItem()) && this.entity.getHeldItem().size < this.entity.getHeldItem().getMaxStackSize()))) { this.entity.getLookHelper().setLookPosition((double)i + 0.5, (double)j + 0.5, (double)k + 0.5, 10.0F, (float)this.entity.getVerticalFaceSpeed()); this.entity.swingItem(); world.setState(blockpos, Blocks.air.getState()); if(this.entity.getHeldItem() != null) - ++this.entity.getHeldItem().stackSize; + ++this.entity.getHeldItem().size; else this.entity.setItemNoUpdate(0, STEALABLE.get(state).copy()); } diff --git a/common/src/main/java/common/block/artificial/BlockFlowerPot.java b/common/src/main/java/common/block/artificial/BlockFlowerPot.java index 6f68e0c..d904c9f 100755 --- a/common/src/main/java/common/block/artificial/BlockFlowerPot.java +++ b/common/src/main/java/common/block/artificial/BlockFlowerPot.java @@ -191,7 +191,7 @@ public class BlockFlowerPot extends Block // Container // worldIn.markBlockForUpdate(pos); // playerIn.triggerAchievement(StatRegistry.flowerPottedStat); - if (/* !playerIn.creative && */ --itemstack.stackSize <= 0) + if (/* !playerIn.creative && */ --itemstack.size <= 0) { playerIn.inventory.setInventorySlotContents(playerIn.inventory.currentItem, (ItemStack)null); } diff --git a/common/src/main/java/common/block/natural/BlockOre.java b/common/src/main/java/common/block/natural/BlockOre.java index d4d6540..c11f0c6 100755 --- a/common/src/main/java/common/block/natural/BlockOre.java +++ b/common/src/main/java/common/block/natural/BlockOre.java @@ -60,7 +60,7 @@ public class BlockOre extends Block public int quantityDropped(Random random) { - return this.dropItem == null ? 1 : (this.dropItem.stackSize + (this.dropChance > 0 ? random.zrange(this.dropChance + 1) : 0)); + return this.dropItem == null ? 1 : (this.dropItem.size + (this.dropChance > 0 ? random.zrange(this.dropChance + 1) : 0)); // this == Blocks.lapis_ore ? 4 + random.nextInt(5) : 1; } diff --git a/common/src/main/java/common/block/tech/BlockCauldron.java b/common/src/main/java/common/block/tech/BlockCauldron.java index d686055..a2d9599 100755 --- a/common/src/main/java/common/block/tech/BlockCauldron.java +++ b/common/src/main/java/common/block/tech/BlockCauldron.java @@ -525,9 +525,9 @@ public class BlockCauldron extends Block } // playerIn.triggerAchievement(StatRegistry.cauldronUsedStat); - --itemstack.stackSize; + --itemstack.size; - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { playerIn.inventory.setInventorySlotContents(playerIn.inventory.currentItem, (ItemStack)null); } @@ -556,10 +556,10 @@ public class BlockCauldron extends Block if (i > 0 && item instanceof ItemBanner && TileEntityBanner.getPatterns(itemstack) > 0) { ItemStack itemstack1 = itemstack.copy(); - itemstack1.stackSize = 1; + itemstack1.size = 1; TileEntityBanner.removeBannerData(itemstack1); - if (itemstack.stackSize <= 1) // && !playerIn.creative) + if (itemstack.size <= 1) // && !playerIn.creative) { playerIn.inventory.setInventorySlotContents(playerIn.inventory.currentItem, itemstack1); } @@ -578,7 +578,7 @@ public class BlockCauldron extends Block // if (!playerIn.creative) // { - --itemstack.stackSize; + --itemstack.size; // } } diff --git a/common/src/main/java/common/block/tech/BlockDispenser.java b/common/src/main/java/common/block/tech/BlockDispenser.java index ed3cd28..5f25e04 100755 --- a/common/src/main/java/common/block/tech/BlockDispenser.java +++ b/common/src/main/java/common/block/tech/BlockDispenser.java @@ -144,7 +144,7 @@ public class BlockDispenser extends BlockContainer if (ibehaviordispenseitem != IBehaviorDispenseItem.itemDispenseBehaviorProvider) { ItemStack itemstack1 = ibehaviordispenseitem.dispense(blocksourceimpl, itemstack); - tileentitydispenser.setInventorySlotContents(i, itemstack1.stackSize <= 0 ? null : itemstack1); + tileentitydispenser.setInventorySlotContents(i, itemstack1.size <= 0 ? null : itemstack1); } } } diff --git a/common/src/main/java/common/block/tech/BlockDropper.java b/common/src/main/java/common/block/tech/BlockDropper.java index 5d8f39e..f6bf2d5 100755 --- a/common/src/main/java/common/block/tech/BlockDropper.java +++ b/common/src/main/java/common/block/tech/BlockDropper.java @@ -57,7 +57,7 @@ public class BlockDropper extends BlockDispenser { itemstack1 = this.dropBehavior.dispense(blocksourceimpl, itemstack); - if (itemstack1 != null && itemstack1.stackSize <= 0) + if (itemstack1 != null && itemstack1.size <= 0) { itemstack1 = null; } @@ -70,7 +70,7 @@ public class BlockDropper extends BlockDispenser { itemstack1 = itemstack.copy(); - if (--itemstack1.stackSize <= 0) + if (--itemstack1.size <= 0) { itemstack1 = null; } diff --git a/common/src/main/java/common/block/tech/BlockTNT.java b/common/src/main/java/common/block/tech/BlockTNT.java index 6d595a3..45c5fbf 100755 --- a/common/src/main/java/common/block/tech/BlockTNT.java +++ b/common/src/main/java/common/block/tech/BlockTNT.java @@ -112,7 +112,7 @@ public class BlockTNT extends Block } else // if (!playerIn.creative) { - --playerIn.getCurrentEquippedItem().stackSize; + --playerIn.getCurrentEquippedItem().size; } return true; diff --git a/common/src/main/java/common/block/tile/BlockBanner.java b/common/src/main/java/common/block/tile/BlockBanner.java index 9dad8b2..116df3b 100755 --- a/common/src/main/java/common/block/tile/BlockBanner.java +++ b/common/src/main/java/common/block/tile/BlockBanner.java @@ -125,13 +125,13 @@ public class BlockBanner extends BlockContainer if (tileentity instanceof TileEntityBanner) { ItemStack itemstack = new ItemStack(Items.banner, 1, ((TileEntityBanner)tileentity).getBaseColor()); - TagObject nbttagcompound = new TagObject(); - tileentity.writeTags(nbttagcompound); - nbttagcompound.remove("x"); - nbttagcompound.remove("y"); - nbttagcompound.remove("z"); - nbttagcompound.remove("id"); - itemstack.setTagInfo("BlockEntityTag", nbttagcompound); + TagObject tag = new TagObject(); + tileentity.writeTags(tag); + tag.remove("x"); + tag.remove("y"); + tag.remove("z"); + tag.remove("id"); + itemstack.setTagInfo("BlockEntityTag", tag); spawnAsEntity(worldIn, pos, itemstack); } else @@ -151,9 +151,9 @@ public class BlockBanner extends BlockContainer { TileEntityBanner tileentitybanner = (TileEntityBanner)te; ItemStack itemstack = new ItemStack(Items.banner, 1, ((TileEntityBanner)te).getBaseColor()); - TagObject nbttagcompound = new TagObject(); - TileEntityBanner.setBaseColorAndPatterns(nbttagcompound, tileentitybanner.getBaseColor(), tileentitybanner.getPatterns()); - itemstack.setTagInfo("BlockEntityTag", nbttagcompound); + TagObject tag = new TagObject(); + TileEntityBanner.setBaseColorAndPatterns(tag, tileentitybanner.getBaseColor(), tileentitybanner.getPatterns()); + itemstack.setTagInfo("BlockEntityTag", tag); spawnAsEntity(worldIn, pos, itemstack); } else diff --git a/common/src/main/java/common/block/tile/BlockSkull.java b/common/src/main/java/common/block/tile/BlockSkull.java index e72d161..e9395a0 100755 --- a/common/src/main/java/common/block/tile/BlockSkull.java +++ b/common/src/main/java/common/block/tile/BlockSkull.java @@ -110,13 +110,7 @@ public class BlockSkull extends BlockContainer TileEntity tileentity = worldIn.getTileEntity(pos); if (tileentity instanceof TileEntitySkull) { -// TileEntitySkull tileentityskull = (TileEntitySkull)tileentity; ItemStack itemstack = new ItemStack(Items.skull, 1, 0); -// if (tileentityskull.getUser() != null) -// { -// itemstack.setTagCompound(new NBTTagCompound()); -// itemstack.getTagCompound().setString("SkullOwner", tileentityskull.getUser()); -// } spawnAsEntity(worldIn, pos, itemstack); } super.onBlockRemoved(worldIn, pos, state); diff --git a/common/src/main/java/common/dimension/Dimension.java b/common/src/main/java/common/dimension/Dimension.java index 3fdcf7f..55636c9 100755 --- a/common/src/main/java/common/dimension/Dimension.java +++ b/common/src/main/java/common/dimension/Dimension.java @@ -802,15 +802,15 @@ public abstract class Dimension extends Nameable implements Comparable= UniverseRegistry.MORE_DIM_ID) { this.denseFog = tag.getBool("DenseFog"); @@ -1089,12 +1088,12 @@ public abstract class Dimension extends Nameable implements Comparable= UniverseRegistry.MORE_DIM_ID) ? this.toNbt() : new TagObject(); + private final TagObject toTags(boolean generator, boolean partialGen, boolean all) { + TagObject tag = (all || !generator || this.id >= UniverseRegistry.MORE_DIM_ID) ? this.toTags() : new TagObject(); if(this == Space.INSTANCE) { if(generator || partialGen) tag.setLong("Seed", this.seed); @@ -1250,9 +1249,8 @@ public abstract class Dimension extends Nameable implements Comparable= UniverseRegistry.MORE_DIM_ID) { @@ -1303,7 +1301,7 @@ public abstract class Dimension extends Nameable implements Comparable 2 -// ? new Text(this.customName.substring(1, this.customName.length() - 1)) : -// new Text(this.getNameIdentifier(), this.customName)) : -// new Text(this.getNameIdentifier(), this.getIdentifier()); -// } } diff --git a/common/src/main/java/common/enchantment/EnchantmentHelper.java b/common/src/main/java/common/enchantment/EnchantmentHelper.java index 7d9554d..8dbca50 100755 --- a/common/src/main/java/common/enchantment/EnchantmentHelper.java +++ b/common/src/main/java/common/enchantment/EnchantmentHelper.java @@ -45,18 +45,18 @@ public class EnchantmentHelper } else { - TagObjectList nbttaglist = stack.getEnchantmentTagList(); + TagObjectList list = stack.getEnchantmentTagList(); - if (nbttaglist == null) + if (list == null) { return 0; } else { - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < list.size(); ++i) { - int j = nbttaglist.get(i).getShort("id"); - int k = nbttaglist.get(i).getShort("lvl"); + int j = list.get(i).getShort("id"); + int k = list.get(i).getShort("lvl"); if (j == enchID) { @@ -72,14 +72,14 @@ public class EnchantmentHelper public static Map getEnchantments(ItemStack stack) { Map map = Maps.newLinkedHashMap(); - TagObjectList nbttaglist = stack.getItem() == Items.enchanted_book ? Items.enchanted_book.getEnchantments(stack) : stack.getEnchantmentTagList(); + TagObjectList list = stack.getItem() == Items.enchanted_book ? Items.enchanted_book.getEnchantments(stack) : stack.getEnchantmentTagList(); - if (nbttaglist != null) + if (list != null) { - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < list.size(); ++i) { - int j = nbttaglist.get(i).getShort("id"); - int k = nbttaglist.get(i).getShort("lvl"); + int j = list.get(i).getShort("id"); + int k = list.get(i).getShort("lvl"); map.put(j, k); } } @@ -92,7 +92,7 @@ public class EnchantmentHelper */ public static void setEnchantments(Map enchMap, ItemStack stack) { - TagObjectList nbttaglist = new TagObjectList(); + TagObjectList list = new TagObjectList(); Iterator iterator = enchMap.keySet().iterator(); while (iterator.hasNext()) @@ -102,10 +102,10 @@ public class EnchantmentHelper if (enchantment != null) { - TagObject nbttagcompound = new TagObject(); - nbttagcompound.setShort("id", (short)i); - nbttagcompound.setShort("lvl", (short)enchMap.get(i).intValue()); - nbttaglist.add(nbttagcompound); + TagObject tag = new TagObject(); + tag.setShort("id", (short)i); + tag.setShort("lvl", (short)enchMap.get(i).intValue()); + list.add(tag); if (stack.getItem() == Items.enchanted_book) { @@ -114,11 +114,11 @@ public class EnchantmentHelper } } - if (nbttaglist.size() > 0) + if (list.size() > 0) { if (stack.getItem() != Items.enchanted_book) { - stack.setTagInfo("ench", nbttaglist); + stack.setTagInfo("ench", list); } } else if (stack.hasTagCompound()) @@ -161,14 +161,14 @@ public class EnchantmentHelper { if (stack != null) { - TagObjectList nbttaglist = stack.getEnchantmentTagList(); + TagObjectList list = stack.getEnchantmentTagList(); - if (nbttaglist != null) + if (list != null) { - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < list.size(); ++i) { - int j = nbttaglist.get(i).getShort("id"); - int k = nbttaglist.get(i).getShort("lvl"); + int j = list.get(i).getShort("id"); + int k = list.get(i).getShort("lvl"); if (Enchantment.getEnchantmentById(j) != null) { diff --git a/common/src/main/java/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java index 944c0ad..7d5c36e 100755 --- a/common/src/main/java/common/entity/Entity.java +++ b/common/src/main/java/common/entity/Entity.java @@ -1421,17 +1421,17 @@ public abstract class Entity } /** - * Like writeToNBTOptional but does not check if the entity is ridden. Used for saving ridden entities with their + * Like writeOptional but does not check if the entity is ridden. Used for saving ridden entities with their * riders. */ - public boolean writeMountToNBT(TagObject tagCompund) + public boolean writeMount(TagObject tag) { String s = EntityRegistry.getEntityString(this); if (!this.dead && !this.isPlayer() && s != null) { - tagCompund.setString("id", s); - this.writeToNBT(tagCompund); + tag.setString("id", s); + this.writeTags(tag); return true; } else @@ -1441,18 +1441,18 @@ public abstract class Entity } /** - * Either write this entity to the NBT tag given and return true, or return false without doing anything. If this + * Either write this entity to the tag given and return true, or return false without doing anything. If this * returns false the entity is not saved on disk. Ridden entities return false here as they are saved with their * rider. */ - public boolean writeToNBTOptional(TagObject tagCompund) + public boolean writeOptional(TagObject tag) { String s = EntityRegistry.getEntityString(this); if (!this.dead && !this.isPlayer() && s != null && (this.passenger == null || this.passenger.isPlayer())) { - tagCompund.setString("id", s); - this.writeToNBT(tagCompund); + tag.setString("id", s); + this.writeTags(tag); return true; } else @@ -1486,9 +1486,9 @@ public abstract class Entity // } /** - * Save the entity to NBT (calls an abstract helper method to write extra data) + * Save the entity to tags (calls an abstract helper method to write extra data) */ - public void writeToNBT(TagObject tagCompund) + public void writeTags(TagObject tag) { // if(this.persistentId != 0L) { // tagCompund.setLong("PersistID", this.persistentId); @@ -1497,19 +1497,19 @@ public abstract class Entity // tagCompund.setString("ObjectTag", this.tag); // } - tagCompund.setDoubleList("Pos", this.newDoubleNBTList(this.posX, this.posY, this.posZ)); - tagCompund.setDoubleList("Motion", this.newDoubleNBTList(this.motionX, this.motionY, this.motionZ)); - tagCompund.setFloatList("Rotation", this.newFloatNBTList(this.rotYaw, this.rotPitch)); - tagCompund.setFloat("FallDistance", this.fallDistance); - tagCompund.setShort("Fire", (short)this.fire); + tag.setDoubleList("Pos", this.newDoubleList(this.posX, this.posY, this.posZ)); + tag.setDoubleList("Motion", this.newDoubleList(this.motionX, this.motionY, this.motionZ)); + tag.setFloatList("Rotation", this.newFloatList(this.rotYaw, this.rotPitch)); + tag.setFloat("FallDistance", this.fallDistance); + tag.setShort("Fire", (short)this.fire); // tagCompund.setShort("Air", (short)this.getAir()); - tagCompund.setBool("OnGround", this.onGround); + tag.setBool("OnGround", this.onGround); // tagCompund.setBoolean("Invulnerable", this.invulnerable); // tagCompund.setInteger("PortalCooldown", this.portalTimer); if (this.getCustomNameTag() != null && this.getCustomNameTag().length() > 0) { - tagCompund.setString("CustomName", this.getCustomNameTag()); + tag.setString("CustomName", this.getCustomNameTag()); // tagCompund.setBoolean("CustomNameVisible", this.getAlwaysRenderNameTag()); } @@ -1519,36 +1519,36 @@ public abstract class Entity // } if(this.ignoreFall) - tagCompund.setBool("IgnoreFall", this.ignoreFall); + tag.setBool("IgnoreFall", this.ignoreFall); - this.writeEntityToNBT(tagCompund); + this.writeEntity(tag); if (this.vehicle != null && !(this.isPlayer())) { - TagObject nbttagcompound = new TagObject(); + TagObject mount = new TagObject(); - if (this.vehicle.writeMountToNBT(nbttagcompound)) + if (this.vehicle.writeMount(mount)) { - tagCompund.setObject("Riding", nbttagcompound); + tag.setObject("Riding", mount); } } } /** - * Reads the entity from NBT (calls an abstract helper method to read specialized data) + * Reads the entity from tags (calls an abstract helper method to read specialized data) */ - public void readFromNBT(TagObject tagCompund) + public void readTags(TagObject tag) { // if(tagCompund.hasLong("PersistID")) // this.setPersistentId(tagCompund.getLong("PersistID")); // this.setTag(tagCompund.getString("ObjectTag")); - TagDoubleList nbttaglist = tagCompund.getDoubleList("Pos"); - TagDoubleList nbttaglist1 = tagCompund.getDoubleList("Motion"); - TagFloatList nbttaglist2 = tagCompund.getFloatList("Rotation"); - this.motionX = nbttaglist1.get(0); - this.motionY = nbttaglist1.get(1); - this.motionZ = nbttaglist1.get(2); + TagDoubleList pos = tag.getDoubleList("Pos"); + TagDoubleList motion = tag.getDoubleList("Motion"); + TagFloatList rotation = tag.getFloatList("Rotation"); + this.motionX = motion.get(0); + this.motionY = motion.get(1); + this.motionZ = motion.get(2); if (Math.abs(this.motionX) > 10.0D) { @@ -1565,32 +1565,32 @@ public abstract class Entity this.motionZ = 0.0D; } - 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.prevX = this.lastTickPosX = this.posX = pos.get(0); + this.prevY = this.lastTickPosY = this.posY = pos.get(1); + this.prevZ = this.lastTickPosZ = this.posZ = pos.get(2); + this.prevYaw = this.rotYaw = rotation.get(0); + this.prevPitch = this.rotPitch = rotation.get(1); this.setRotationYawHead(this.rotYaw); this.setRenderYawOffset(this.rotYaw); - this.fallDistance = tagCompund.getFloat("FallDistance"); - this.fire = tagCompund.getShort("Fire"); + this.fallDistance = tag.getFloat("FallDistance"); + this.fire = tag.getShort("Fire"); // this.setAir(tagCompund.getShort("Air")); - this.onGround = tagCompund.getBool("OnGround"); + this.onGround = tag.getBool("OnGround"); // this.invulnerable = tagCompund.getBoolean("Invulnerable"); // this.portalTimer = tagCompund.getInteger("PortalCooldown"); this.setPosition(this.posX, this.posY, this.posZ); this.setRotation(this.rotYaw, this.rotPitch); - if (tagCompund.hasString("CustomName") && tagCompund.getString("CustomName").length() > 0) + if (tag.hasString("CustomName") && tag.getString("CustomName").length() > 0) { - this.setCustomNameTag(tagCompund.getString("CustomName")); + this.setCustomNameTag(tag.getString("CustomName")); } // this.setAlwaysRenderNameTag(tagCompund.getBoolean("CustomNameVisible")); // this.setSilent(tagCompund.getBoolean("Silent")); - this.ignoreFall = tagCompund.getBool("IgnoreFall"); - this.readEntityFromNBT(tagCompund); + this.ignoreFall = tag.getBool("IgnoreFall"); + this.readEntity(tag); if (this.shouldSetPosAfterLoading()) { @@ -1612,47 +1612,47 @@ public abstract class Entity // } /** - * (abstract) Protected helper method to read subclass entity data from NBT. + * (abstract) Protected helper method to read subclass entity data from tags. */ - protected abstract void readEntityFromNBT(TagObject tagCompund); + protected abstract void readEntity(TagObject tag); /** - * (abstract) Protected helper method to write subclass entity data to NBT. + * (abstract) Protected helper method to write subclass entity data to tags. */ - protected abstract void writeEntityToNBT(TagObject tagCompound); + protected abstract void writeEntity(TagObject tag); public void onChunkLoad() { } /** - * creates a NBT list from the array of doubles passed to this function + * creates a list from the array of doubles passed to this function */ - protected TagDoubleList newDoubleNBTList(double... numbers) + protected TagDoubleList newDoubleList(double... numbers) { - TagDoubleList nbttaglist = new TagDoubleList(); + TagDoubleList list = new TagDoubleList(); for (double d0 : numbers) { - nbttaglist.add(d0); + list.add(d0); } - return nbttaglist; + return list; } /** - * Returns a new NBTTagList filled with the specified floats + * Returns a new list filled with the specified floats */ - protected TagFloatList newFloatNBTList(float... numbers) + protected TagFloatList newFloatList(float... numbers) { - TagFloatList nbttaglist = new TagFloatList(); + TagFloatList list = new TagFloatList(); for (float f : numbers) { - nbttaglist.add(f); + list.add(f); } - return nbttaglist; + return list; } public EntityItem dropItem(Item itemIn, int size) @@ -1670,7 +1670,7 @@ public abstract class Entity */ public EntityItem entityDropItem(ItemStack itemStackIn, float offsetY) { - if (itemStackIn.stackSize != 0 && itemStackIn.getItem() != null) + if (itemStackIn.size != 0 && itemStackIn.getItem() != null) { EntityItem entityitem = new EntityItem(this.worldObj, this.posX, this.posY + (double)offsetY, this.posZ, itemStackIn); entityitem.setDefaultPickupDelay(); @@ -2346,13 +2346,13 @@ public abstract class Entity } /** - * Prepares this entity in new dimension by copying NBT data from entity in old dimension + * Prepares this entity in new dimension by copying data from entity in old dimension */ public void copyDataFromOld(Entity entityIn) { - TagObject nbttagcompound = new TagObject(); - entityIn.writeToNBT(nbttagcompound); - this.readFromNBT(nbttagcompound); + TagObject tag = new TagObject(); + entityIn.writeTags(tag); + this.readTags(tag); // this.portalTimer = entityIn.portalTimer; // this.portalPos = entityIn.portalPos; // this.portalVec = entityIn.portalVec; @@ -2549,25 +2549,6 @@ public abstract class Entity return Facing.getHorizontal(ExtMath.floord((double)(this.rotYaw * 4.0F / 360.0F) + 0.5D) & 3); } -// protected HoverEvent getHoverEvent() -// { -// NBTTagCompound nbttagcompound = new NBTTagCompound(); -// String s = EntityRegistry.getEntityString(this); -// nbttagcompound.setString("id", "#" + this.getId()); -// if(this.hasPersistentId()) -// nbttagcompound.setString("pid", String.format("$%016x", this.getPersistentId())); -// if(this.hasTag()) -// nbttagcompound.setString("otag", this.getTag()); -// -// if (s != null) -// { -// nbttagcompound.setString("type", s); -// } -// -// nbttagcompound.setString("name", IChatComponent.Serializer.componentToJson(this.getTypeName())); -// return new HoverEvent(HoverEvent.Action.SHOW_ENTITY, new ChatComponentText(nbttagcompound.toString())); -// } - public boolean isVisibleTo(EntityNPC player) { return true; @@ -2612,15 +2593,15 @@ public abstract class Entity return new BlockPos(this.posX, this.posY + 0.5D, this.posZ); } - public TagObject getNBTTagCompound() + public TagObject getTag() { return null; } /** - * Called when client receives entity's NBTTagCompound from server. + * Called when client receives entity's tags from server. */ - public void clientUpdateEntityNBT(TagObject compound) + public void clientUpdateEntityTags(TagObject compound) { } diff --git a/common/src/main/java/common/entity/EntityTrackerEntry.java b/common/src/main/java/common/entity/EntityTrackerEntry.java index 5625de7..007b87d 100755 --- a/common/src/main/java/common/entity/EntityTrackerEntry.java +++ b/common/src/main/java/common/entity/EntityTrackerEntry.java @@ -296,7 +296,7 @@ public class EntityTrackerEntry { .sendPacket(new SPacketEntityMetadata(this.trackedEntity.getId(), this.trackedEntity.getDataWatcher(), true)); } - TagObject nbttagcompound = this.trackedEntity.getNBTTagCompound(); + TagObject nbttagcompound = this.trackedEntity.getTag(); if(nbttagcompound != null) { playerMP.connection.sendPacket(new SPacketUpdateEntityTags(this.trackedEntity.getId(), nbttagcompound)); diff --git a/common/src/main/java/common/entity/animal/EntityBat.java b/common/src/main/java/common/entity/animal/EntityBat.java index f70ec81..14297ea 100755 --- a/common/src/main/java/common/entity/animal/EntityBat.java +++ b/common/src/main/java/common/entity/animal/EntityBat.java @@ -248,18 +248,18 @@ public class EntityBat extends EntityLiving /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.dataWatcher.updateObject(16, Byte.valueOf(tagCompund.getByte("BatFlags"))); } /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setByte("BatFlags", this.dataWatcher.getWatchableObjectByte(16)); } diff --git a/common/src/main/java/common/entity/animal/EntityChicken.java b/common/src/main/java/common/entity/animal/EntityChicken.java index 1b09f69..ee1ada9 100755 --- a/common/src/main/java/common/entity/animal/EntityChicken.java +++ b/common/src/main/java/common/entity/animal/EntityChicken.java @@ -175,9 +175,9 @@ public class EntityChicken extends EntityAnimal /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.chickenJockey = tagCompund.getBool("IsChickenJockey"); this.timeUntilNextEgg = tagCompund.getInt("EggLayTime"); } @@ -193,9 +193,9 @@ public class EntityChicken extends EntityAnimal /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setBool("IsChickenJockey", this.chickenJockey); tagCompound.setInt("EggLayTime", this.timeUntilNextEgg); } diff --git a/common/src/main/java/common/entity/animal/EntityCow.java b/common/src/main/java/common/entity/animal/EntityCow.java index 4d3df31..b649434 100755 --- a/common/src/main/java/common/entity/animal/EntityCow.java +++ b/common/src/main/java/common/entity/animal/EntityCow.java @@ -125,7 +125,7 @@ public class EntityCow extends EntityAnimal if (itemstack != null && itemstack.getItem() == Items.bucket /* && !player.creative */ && !this.isChild()) { - if (itemstack.stackSize-- == 1) + if (itemstack.size-- == 1) { player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(Items.milk_bucket)); } diff --git a/common/src/main/java/common/entity/animal/EntityDragonPart.java b/common/src/main/java/common/entity/animal/EntityDragonPart.java index 70b2ab0..74ce40a 100755 --- a/common/src/main/java/common/entity/animal/EntityDragonPart.java +++ b/common/src/main/java/common/entity/animal/EntityDragonPart.java @@ -27,14 +27,14 @@ public class EntityDragonPart extends Entity /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { } /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { } diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index f0ab623..4b1a88c 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -958,7 +958,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic if (flag) { - if (/* !player.creative && */ --itemstack.stackSize == 0) + if (/* !player.creative && */ --itemstack.size == 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } @@ -1387,9 +1387,9 @@ public class EntityHorse extends EntityAnimal implements IInvBasic /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setBool("EatingHaystack", this.isEatingHaystack()); tagCompound.setBool("ChestedHorse", this.isChested()); tagCompound.setBool("HasReproduced", this.getHasReproduced()); @@ -1412,7 +1412,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - itemstack.writeToNBT(nbttagcompound); + itemstack.writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } @@ -1422,21 +1422,21 @@ public class EntityHorse extends EntityAnimal implements IInvBasic if (this.horseChest.getStackInSlot(1) != null) { - tagCompound.setObject("ArmorItem", this.horseChest.getStackInSlot(1).writeToNBT(new TagObject())); + tagCompound.setObject("ArmorItem", this.horseChest.getStackInSlot(1).writeTags(new TagObject())); } if (this.horseChest.getStackInSlot(0) != null) { - tagCompound.setObject("SaddleItem", this.horseChest.getStackInSlot(0).writeToNBT(new TagObject())); + tagCompound.setObject("SaddleItem", this.horseChest.getStackInSlot(0).writeTags(new TagObject())); } } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setEatingHaystack(tagCompund.getBool("EatingHaystack")); this.setBreeding(tagCompund.getBool("Bred")); this.setChested(tagCompund.getBool("ChestedHorse")); @@ -1476,14 +1476,14 @@ public class EntityHorse extends EntityAnimal implements IInvBasic if (j >= 2 && j < this.horseChest.getSizeInventory()) { - this.horseChest.setInventorySlotContents(j, ItemStack.loadItemStackFromNBT(nbttagcompound)); + this.horseChest.setInventorySlotContents(j, ItemStack.readFromTag(nbttagcompound)); } } } if (tagCompund.hasObject("ArmorItem")) { - ItemStack itemstack = ItemStack.loadItemStackFromNBT(tagCompund.getObject("ArmorItem")); + ItemStack itemstack = ItemStack.readFromTag(tagCompund.getObject("ArmorItem")); if (itemstack != null && isArmorItem(itemstack.getItem())) { @@ -1493,7 +1493,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic if (tagCompund.hasObject("SaddleItem")) { - ItemStack itemstack1 = ItemStack.loadItemStackFromNBT(tagCompund.getObject("SaddleItem")); + ItemStack itemstack1 = ItemStack.readFromTag(tagCompund.getObject("SaddleItem")); if (itemstack1 != null && itemstack1.getItem() == Items.saddle) { diff --git a/common/src/main/java/common/entity/animal/EntityMooshroom.java b/common/src/main/java/common/entity/animal/EntityMooshroom.java index b87afa5..76747d4 100755 --- a/common/src/main/java/common/entity/animal/EntityMooshroom.java +++ b/common/src/main/java/common/entity/animal/EntityMooshroom.java @@ -30,7 +30,7 @@ public class EntityMooshroom extends EntityCow if (itemstack != null && itemstack.getItem() == Items.bowl && !this.isChild()) { - if (itemstack.stackSize == 1) + if (itemstack.size == 1) { player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(Items.mushroom_stew)); return true; diff --git a/common/src/main/java/common/entity/animal/EntityOcelot.java b/common/src/main/java/common/entity/animal/EntityOcelot.java index 0e0bb78..de02698 100755 --- a/common/src/main/java/common/entity/animal/EntityOcelot.java +++ b/common/src/main/java/common/entity/animal/EntityOcelot.java @@ -123,18 +123,18 @@ public class EntityOcelot extends EntityTameable /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("CatType", this.getTameSkin()); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setTameSkin(tagCompund.getInt("CatType")); } @@ -227,10 +227,10 @@ public class EntityOcelot extends EntityTameable { // if (!player.creative) // { - --itemstack.stackSize; + --itemstack.size; // } - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } diff --git a/common/src/main/java/common/entity/animal/EntityPig.java b/common/src/main/java/common/entity/animal/EntityPig.java index 3ad0786..17edb16 100755 --- a/common/src/main/java/common/entity/animal/EntityPig.java +++ b/common/src/main/java/common/entity/animal/EntityPig.java @@ -69,18 +69,18 @@ public class EntityPig extends EntityAnimal /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setBool("Saddle", this.getSaddled()); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setSaddled(tagCompund.getBool("Saddle")); } diff --git a/common/src/main/java/common/entity/animal/EntityRabbit.java b/common/src/main/java/common/entity/animal/EntityRabbit.java index a9c2abd..61c9319 100755 --- a/common/src/main/java/common/entity/animal/EntityRabbit.java +++ b/common/src/main/java/common/entity/animal/EntityRabbit.java @@ -198,14 +198,14 @@ public class EntityRabbit extends EntityAnimal { this.getEntityAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.30000001192092896D); } - public void writeEntityToNBT(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + public void writeEntity(TagObject tagCompound) { + super.writeEntity(tagCompound); tagCompound.setInt("RabbitType", this.getRabbitType()); tagCompound.setInt("MoreCarrotTicks", this.foodCooldown); } - public void readEntityFromNBT(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + public void readEntity(TagObject tagCompund) { + super.readEntity(tagCompund); this.setRabbitType(tagCompund.getInt("RabbitType")); this.foodCooldown = tagCompund.getInt("MoreCarrotTicks"); } diff --git a/common/src/main/java/common/entity/animal/EntitySheep.java b/common/src/main/java/common/entity/animal/EntitySheep.java index 4090fd6..2966c1b 100755 --- a/common/src/main/java/common/entity/animal/EntitySheep.java +++ b/common/src/main/java/common/entity/animal/EntitySheep.java @@ -210,9 +210,9 @@ public class EntitySheep extends EntityAnimal /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setBool("Sheared", this.getSheared()); tagCompound.setByte("Color", (byte)this.getFleeceColor().getMetadata()); } @@ -220,9 +220,9 @@ public class EntitySheep extends EntityAnimal /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setSheared(tagCompund.getBool("Sheared")); this.setFleeceColor(DyeColor.byMetadata(tagCompund.getByte("Color"))); } diff --git a/common/src/main/java/common/entity/animal/EntityWolf.java b/common/src/main/java/common/entity/animal/EntityWolf.java index 3c09a1a..ef9a419 100755 --- a/common/src/main/java/common/entity/animal/EntityWolf.java +++ b/common/src/main/java/common/entity/animal/EntityWolf.java @@ -139,9 +139,9 @@ public class EntityWolf extends EntityTameable /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setBool("Angry", this.isAngry()); tagCompound.setByte("CollarColor", (byte)this.getCollarColor().getDyeDamage()); } @@ -149,9 +149,9 @@ public class EntityWolf extends EntityTameable /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setAngry(tagCompund.getBool("Angry")); if (tagCompund.hasByte("CollarColor")) @@ -399,12 +399,12 @@ public class EntityWolf extends EntityTameable { // if (!player.creative) // { - --itemstack.stackSize; + --itemstack.size; // } this.heal(itemfood.getHealAmount(itemstack)); - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } @@ -420,7 +420,7 @@ public class EntityWolf extends EntityTameable { this.setCollarColor(enumdyecolor); - if (/* !player.creative && */ --itemstack.stackSize <= 0) + if (/* !player.creative && */ --itemstack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } @@ -442,10 +442,10 @@ public class EntityWolf extends EntityTameable { // if (!player.creative) // { - --itemstack.stackSize; + --itemstack.size; // } - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } diff --git a/common/src/main/java/common/entity/item/EntityBoat.java b/common/src/main/java/common/entity/item/EntityBoat.java index 98b26d7..502059c 100755 --- a/common/src/main/java/common/entity/item/EntityBoat.java +++ b/common/src/main/java/common/entity/item/EntityBoat.java @@ -501,14 +501,14 @@ public class EntityBoat extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { } diff --git a/common/src/main/java/common/entity/item/EntityCart.java b/common/src/main/java/common/entity/item/EntityCart.java index bb65039..1757b7f 100755 --- a/common/src/main/java/common/entity/item/EntityCart.java +++ b/common/src/main/java/common/entity/item/EntityCart.java @@ -753,7 +753,7 @@ public abstract class EntityCart extends Entity implements IWorldNameable /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { if (tagCompund.getBool("CustomDisplayTile")) { @@ -798,7 +798,7 @@ public abstract class EntityCart extends Entity implements IWorldNameable /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { if (this.hasDisplayTile()) { diff --git a/common/src/main/java/common/entity/item/EntityCartContainer.java b/common/src/main/java/common/entity/item/EntityCartContainer.java index ee58e73..bb84638 100755 --- a/common/src/main/java/common/entity/item/EntityCartContainer.java +++ b/common/src/main/java/common/entity/item/EntityCartContainer.java @@ -60,7 +60,7 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl { if (this.minecartContainerItems[index] != null) { - if (this.minecartContainerItems[index].stackSize <= count) + if (this.minecartContainerItems[index].size <= count) { ItemStack itemstack1 = this.minecartContainerItems[index]; this.minecartContainerItems[index] = null; @@ -70,7 +70,7 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl { ItemStack itemstack = this.minecartContainerItems[index].splitStack(count); - if (this.minecartContainerItems[index].stackSize == 0) + if (this.minecartContainerItems[index].size == 0) { this.minecartContainerItems[index] = null; } @@ -108,9 +108,9 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl { this.minecartContainerItems[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } } @@ -187,9 +187,9 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); TagObjectList nbttaglist = new TagObjectList(); for (int i = 0; i < this.minecartContainerItems.length; ++i) @@ -198,7 +198,7 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.minecartContainerItems[i].writeToNBT(nbttagcompound); + this.minecartContainerItems[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } @@ -209,9 +209,9 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); TagObjectList nbttaglist = tagCompund.getObjectList("Items"); this.minecartContainerItems = new ItemStack[this.getSizeInventory()]; @@ -222,7 +222,7 @@ public abstract class EntityCartContainer extends EntityCart implements ILockabl if (j >= 0 && j < this.minecartContainerItems.length) { - this.minecartContainerItems[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.minecartContainerItems[j] = ItemStack.readFromTag(nbttagcompound); } } } diff --git a/common/src/main/java/common/entity/item/EntityCrystal.java b/common/src/main/java/common/entity/item/EntityCrystal.java index 6c5fbed..855697f 100755 --- a/common/src/main/java/common/entity/item/EntityCrystal.java +++ b/common/src/main/java/common/entity/item/EntityCrystal.java @@ -63,14 +63,14 @@ public class EntityCrystal extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { } diff --git a/common/src/main/java/common/entity/item/EntityExplosion.java b/common/src/main/java/common/entity/item/EntityExplosion.java index dbf7725..f457c71 100755 --- a/common/src/main/java/common/entity/item/EntityExplosion.java +++ b/common/src/main/java/common/entity/item/EntityExplosion.java @@ -62,13 +62,13 @@ public class EntityExplosion extends Entity Explosion.doExplosionAlgo3(this.worldObj, this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, this.rand, min + 6.0d, min); } - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { tagCompound.setInt("Progress", this.progress); tagCompound.setInt("Radius", this.radius); } - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { this.progress = tagCompund.getInt("Progress"); this.radius = tagCompund.getInt("Radius"); diff --git a/common/src/main/java/common/entity/item/EntityFalling.java b/common/src/main/java/common/entity/item/EntityFalling.java index 97f008d..76607be 100755 --- a/common/src/main/java/common/entity/item/EntityFalling.java +++ b/common/src/main/java/common/entity/item/EntityFalling.java @@ -228,7 +228,7 @@ public class EntityFalling extends Entity implements IObjectData /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { Block block = this.fallTile != null ? this.fallTile.getBlock() : Blocks.air; String resourcelocation = BlockRegistry.REGISTRY.getNameForObject(block); @@ -249,7 +249,7 @@ public class EntityFalling extends Entity implements IObjectData /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { int i = tagCompund.getByte("Data") & 255; diff --git a/common/src/main/java/common/entity/item/EntityFireworks.java b/common/src/main/java/common/entity/item/EntityFireworks.java index 8e5cbe4..d2cb725 100755 --- a/common/src/main/java/common/entity/item/EntityFireworks.java +++ b/common/src/main/java/common/entity/item/EntityFireworks.java @@ -167,7 +167,7 @@ public class EntityFireworks extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setInt("Life", this.fireworkAge); tagCompound.setInt("LifeTime", this.lifetime); @@ -176,7 +176,7 @@ public class EntityFireworks extends Entity if (itemstack != null) { TagObject nbttagcompound = new TagObject(); - itemstack.writeToNBT(nbttagcompound); + itemstack.writeTags(nbttagcompound); tagCompound.setObject("FireworksItem", nbttagcompound); } } @@ -184,7 +184,7 @@ public class EntityFireworks extends Entity /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.fireworkAge = tagCompund.getInt("Life"); this.lifetime = tagCompund.getInt("LifeTime"); @@ -192,7 +192,7 @@ public class EntityFireworks extends Entity if (nbttagcompound != null) { - ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); + ItemStack itemstack = ItemStack.readFromTag(nbttagcompound); if (itemstack != null) { diff --git a/common/src/main/java/common/entity/item/EntityHopperCart.java b/common/src/main/java/common/entity/item/EntityHopperCart.java index 9d38ba4..2e6783c 100755 --- a/common/src/main/java/common/entity/item/EntityHopperCart.java +++ b/common/src/main/java/common/entity/item/EntityHopperCart.java @@ -201,18 +201,18 @@ public class EntityHopperCart extends EntityCartContainer implements IHopper /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("TransferCooldown", this.transferTicker); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.transferTicker = tagCompund.getInt("TransferCooldown"); } diff --git a/common/src/main/java/common/entity/item/EntityItem.java b/common/src/main/java/common/entity/item/EntityItem.java index 205d953..6c48e0d 100755 --- a/common/src/main/java/common/entity/item/EntityItem.java +++ b/common/src/main/java/common/entity/item/EntityItem.java @@ -237,17 +237,17 @@ public class EntityItem extends Entity { return false; } - else if (itemstack1.stackSize < itemstack.stackSize) + else if (itemstack1.size < itemstack.size) { return other.combineItems(this); } - else if (itemstack1.stackSize + itemstack.stackSize > itemstack1.getMaxStackSize()) + else if (itemstack1.size + itemstack.size > itemstack1.getMaxStackSize()) { return false; } else { - itemstack1.stackSize += itemstack.stackSize; + itemstack1.size += itemstack.size; other.delayBeforeCanPickup = Math.max(other.delayBeforeCanPickup, this.delayBeforeCanPickup); other.age = Math.min(other.age, this.age); other.setEntityItemStack(itemstack1); @@ -342,7 +342,7 @@ public class EntityItem extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setShort("Health", (short)((byte)this.health)); tagCompound.setShort("Age", (short)this.age); @@ -360,14 +360,14 @@ public class EntityItem extends Entity if (this.getEntityItem() != null) { - tagCompound.setObject("Item", this.getEntityItem().writeToNBT(new TagObject())); + tagCompound.setObject("Item", this.getEntityItem().writeTags(new TagObject())); } } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.health = tagCompund.getShort("Health") & 255; this.age = tagCompund.getShort("Age"); @@ -385,7 +385,7 @@ public class EntityItem extends Entity // } TagObject nbttagcompound = tagCompund.getObject("Item"); - this.setEntityItemStack(ItemStack.loadItemStackFromNBT(nbttagcompound)); + this.setEntityItemStack(ItemStack.readFromTag(nbttagcompound)); if (this.getEntityItem() == null) { @@ -401,7 +401,7 @@ public class EntityItem extends Entity if (!this.worldObj.client) { ItemStack itemstack = this.getEntityItem(); - int i = itemstack.stackSize; + int i = itemstack.size; if (this.delayBeforeCanPickup == 0 // && (this.owner == null || 6000 - this.age <= 200 || this.owner.equals(entityIn.getUser())) && entityIn.inventory.addItemStackToInventory(itemstack)) @@ -448,7 +448,7 @@ public class EntityItem extends Entity entityIn.onItemPickup(this, i); - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { this.setDead(); } @@ -464,7 +464,7 @@ public class EntityItem extends Entity if(this.hasCustomName()) return this.getCustomNameTag(); String comp = super.getTypeName(); - comp += " (" + this.getEntityItem().stackSize + " * " + + comp += " (" + this.getEntityItem().size + " * " + ItemRegistry.REGISTRY.getNameForObject(this.getEntityItem().getItem()) + ":" + this.getEntityItem().getMetadata() + ")"; return comp; } @@ -612,9 +612,9 @@ public class EntityItem extends Entity public String getDisplayName() { ItemStack stack = this.getEntityItem(); - if(stack.stackSize <= 1) + if(stack.size <= 1) return null; - return TextColor.DGREEN + "" + stack.stackSize; + return TextColor.DGREEN + "" + stack.size; } public EntityType getType() { diff --git a/common/src/main/java/common/entity/item/EntityLeashKnot.java b/common/src/main/java/common/entity/item/EntityLeashKnot.java index 9686a54..d5c74e7 100755 --- a/common/src/main/java/common/entity/item/EntityLeashKnot.java +++ b/common/src/main/java/common/entity/item/EntityLeashKnot.java @@ -375,7 +375,7 @@ public class EntityLeashKnot extends Entity * returns false the entity is not saved on disk. Ridden entities return false here as they are saved with their * rider. */ - public boolean writeToNBTOptional(TagObject tagCompund) + public boolean writeOptional(TagObject tagCompund) { return false; } @@ -383,14 +383,14 @@ public class EntityLeashKnot extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { } diff --git a/common/src/main/java/common/entity/item/EntityNuke.java b/common/src/main/java/common/entity/item/EntityNuke.java index 535a481..a94953d 100755 --- a/common/src/main/java/common/entity/item/EntityNuke.java +++ b/common/src/main/java/common/entity/item/EntityNuke.java @@ -93,12 +93,12 @@ public class EntityNuke extends Entity // Explosion.doExplosionAlgo3(this.worldObj, this.posX, this.posY + (double)(this.height / 2.0F), this.posZ, this.rand, min + 6.0d, min); // } - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { tagCompound.setInt("Fuse", this.fuse); } - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { this.fuse = tagCompund.getInt("Fuse"); } diff --git a/common/src/main/java/common/entity/item/EntityTnt.java b/common/src/main/java/common/entity/item/EntityTnt.java index 0868cea..84e398c 100755 --- a/common/src/main/java/common/entity/item/EntityTnt.java +++ b/common/src/main/java/common/entity/item/EntityTnt.java @@ -109,7 +109,7 @@ public class EntityTnt extends Entity implements IObjectData /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { tagCompound.setByte("Fuse", (byte)this.fuse); tagCompound.setByte("Power", (byte)this.explosionSize); @@ -118,7 +118,7 @@ public class EntityTnt extends Entity implements IObjectData /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { this.fuse = tagCompund.getByte("Fuse"); this.explosionSize = ((int)tagCompund.getByte("Power")) & 7; diff --git a/common/src/main/java/common/entity/item/EntityTntCart.java b/common/src/main/java/common/entity/item/EntityTntCart.java index 31f8257..b9157fc 100755 --- a/common/src/main/java/common/entity/item/EntityTntCart.java +++ b/common/src/main/java/common/entity/item/EntityTntCart.java @@ -206,18 +206,18 @@ public class EntityTntCart extends EntityCart /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(TagObject tagCompund) + protected void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.minecartTNTFuse = tagCompund.getInt("TNTFuse"); } /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(TagObject tagCompound) + protected void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("TNTFuse", this.minecartTNTFuse); } } diff --git a/common/src/main/java/common/entity/item/EntityXp.java b/common/src/main/java/common/entity/item/EntityXp.java index 069e6e5..e60dd20 100755 --- a/common/src/main/java/common/entity/item/EntityXp.java +++ b/common/src/main/java/common/entity/item/EntityXp.java @@ -293,7 +293,7 @@ public class EntityXp extends Entity implements IObjectData /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setShort("Health", (short)((byte)this.xpOrbHealth)); tagCompound.setShort("Age", (short)this.xpOrbAge); @@ -303,7 +303,7 @@ public class EntityXp extends Entity implements IObjectData /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.xpOrbHealth = tagCompund.getShort("Health") & 255; this.xpOrbAge = tagCompund.getShort("Age"); diff --git a/common/src/main/java/common/entity/npc/EntityGargoyle.java b/common/src/main/java/common/entity/npc/EntityGargoyle.java index ecb3ccb..2c3c874 100755 --- a/common/src/main/java/common/entity/npc/EntityGargoyle.java +++ b/common/src/main/java/common/entity/npc/EntityGargoyle.java @@ -35,15 +35,15 @@ public class EntityGargoyle extends EntityFlyingNPC this.dataWatcher.addObject(23, 0); } - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("Invul", this.getInvulTime()); } - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setInvulTime(tagCompund.getInt("Invul")); } diff --git a/common/src/main/java/common/entity/npc/EntityHaunter.java b/common/src/main/java/common/entity/npc/EntityHaunter.java index 14babae..ec73db7 100755 --- a/common/src/main/java/common/entity/npc/EntityHaunter.java +++ b/common/src/main/java/common/entity/npc/EntityHaunter.java @@ -58,9 +58,9 @@ public class EntityHaunter extends EntityNPC { /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); if (this.isCharged()) { @@ -74,9 +74,9 @@ public class EntityHaunter extends EntityNPC { /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setCharged(tagCompund.getBool("Charge")); this.fuseTime = tagCompund.getShort("Fuse"); diff --git a/common/src/main/java/common/entity/npc/EntityMobNPC.java b/common/src/main/java/common/entity/npc/EntityMobNPC.java index 60b2f74..e1a5706 100755 --- a/common/src/main/java/common/entity/npc/EntityMobNPC.java +++ b/common/src/main/java/common/entity/npc/EntityMobNPC.java @@ -107,9 +107,9 @@ public abstract class EntityMobNPC extends EntityNPC /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setShort("Anger", (short)this.angerLevel); // if (this.angerTarget != null) @@ -125,9 +125,9 @@ public abstract class EntityMobNPC extends EntityNPC /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.angerLevel = tagCompund.getShort("Anger"); // String s = tagCompund.getString("HurtBy"); // diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java index ef24d2c..9f47198 100755 --- a/common/src/main/java/common/entity/npc/EntityNPC.java +++ b/common/src/main/java/common/entity/npc/EntityNPC.java @@ -562,9 +562,9 @@ public abstract class EntityNPC extends EntityLiving { // if (!player.creative) // { - --stack.stackSize; + --stack.size; - if (stack.stackSize <= 0) + if (stack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } @@ -1445,7 +1445,7 @@ public abstract class EntityNPC extends EntityLiving } else { - stack.stackSize = remain.stackSize; + stack.size = remain.size; } } } @@ -1973,7 +1973,7 @@ public abstract class EntityNPC extends EntityLiving this.client.addToSendQueue(new CPacketBreak(c07packetplayerdigging$action, BlockPos.ORIGIN, Facing.DOWN)); return null; } - return this.dropItem(this.inventory.decrStackSize(this.inventory.currentItem, dropAll && this.inventory.getCurrentItem() != null ? this.inventory.getCurrentItem().stackSize : 1), false, true); + return this.dropItem(this.inventory.decrStackSize(this.inventory.currentItem, dropAll && this.inventory.getCurrentItem() != null ? this.inventory.getCurrentItem().size : 1), false, true); } /** @@ -2958,14 +2958,14 @@ public abstract class EntityNPC extends EntityLiving if (this.itemInUse != null) { this.updateItemUse(this.itemInUse, 16); - int i = this.itemInUse.stackSize; + int i = this.itemInUse.size; ItemStack itemstack = this.itemInUse.onItemUseFinish(this.worldObj, this); - if (itemstack != this.itemInUse || itemstack != null && itemstack.stackSize != i) + if (itemstack != this.itemInUse || itemstack != null && itemstack.size != i) { this.inventory.mainInventory[this.inventory.currentItem] = itemstack; - if (itemstack.stackSize == 0) + if (itemstack.size == 0) { this.inventory.mainInventory[this.inventory.currentItem] = null; } @@ -3264,7 +3264,7 @@ public abstract class EntityNPC extends EntityLiving { return null; } - else if (droppedItem.stackSize == 0) + else if (droppedItem.size == 0) { return null; } @@ -3380,10 +3380,10 @@ public abstract class EntityNPC extends EntityLiving /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { // super.readEntityFromNBT(tagCompund); - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); // if(tagCompund.hasBoolean("CanPickUpLoot")) { // this.setCanPickUpLoot(tagCompund.getBoolean("CanPickUpLoot")); @@ -3393,7 +3393,7 @@ public abstract class EntityNPC extends EntityLiving TagObjectList nbttaglist = tagCompund.getObjectList("Equipment"); for(int i = 0; i < this.equipment.length; ++i) { - this.equipment[i] = ItemStack.loadItemStackFromNBT(nbttaglist.get(i)); + this.equipment[i] = ItemStack.readFromTag(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.get(i)); + ItemStack itemstack = ItemStack.readFromTag(nbttaglist.get(i)); if (itemstack != null) { @@ -3437,7 +3437,7 @@ public abstract class EntityNPC extends EntityLiving if(tagCompund.hasObjectList("Offers")) { this.trades = new MerchantRecipeList(); - this.trades.fromNbt(tagCompund.getObjectList("Offers")); + this.trades.fromTags(tagCompund.getObjectList("Offers")); } this.healTimer = tagCompund.getInt("healTimer"); if(tagCompund.hasByteArray("Skin")) @@ -3498,7 +3498,7 @@ public abstract class EntityNPC extends EntityLiving if (tagCompund.hasObjectList("WarpItems")) { TagObjectList nbttaglist1 = tagCompund.getObjectList("WarpItems"); - this.warpChest.loadInventoryFromNBT(nbttaglist1); + this.warpChest.readTags(nbttaglist1); } // ModelType // model; @@ -3518,7 +3518,7 @@ public abstract class EntityNPC extends EntityLiving /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { if(this.isPlayer()) { for (int z = 0; z < this.inventory.mainInventory.length; z++) @@ -3526,12 +3526,12 @@ public abstract class EntityNPC extends EntityLiving ItemStack itemstack = this.inventory.mainInventory[z]; if (itemstack != null) { - this.getAttributeMap().removeAttributeModifiers(itemstack.getAttributeModifiers(2), z, itemstack.stackSize); + this.getAttributeMap().removeAttributeModifiers(itemstack.getAttributeModifiers(2), z, itemstack.size); } } } // super.writeEntityToNBT(tagCompound); - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); // tagCompound.setBoolean("CanPickUpLoot", this.canPickUpLoot()); TagObjectList nbttaglist0 = new TagObjectList(); @@ -3540,7 +3540,7 @@ public abstract class EntityNPC extends EntityLiving TagObject nbttagcompound = new TagObject(); if(this.equipment[i] != null) { - this.equipment[i].writeToNBT(nbttagcompound); + this.equipment[i].writeTags(nbttagcompound); } nbttaglist0.add(nbttagcompound); @@ -3567,13 +3567,13 @@ public abstract class EntityNPC extends EntityLiving if (itemstack != null) { - nbttaglist.add(itemstack.writeToNBT(new TagObject())); + nbttaglist.add(itemstack.writeTags(new TagObject())); } } tagCompound.setObjectList("Items", nbttaglist); if(this.trades != null) - tagCompound.setObjectList("Offers", this.trades.toNbt()); + tagCompound.setObjectList("Offers", this.trades.toTags()); tagCompound.setInt("healTimer", this.healTimer); if(this.skin != null) tagCompound.setByteArray("Skin", this.skin); @@ -3584,7 +3584,7 @@ public abstract class EntityNPC extends EntityLiving ItemStack itemstack = this.inventory.mainInventory[z]; if (itemstack != null) { - this.getAttributeMap().applyAttributeModifiers(itemstack.getAttributeModifiers(2), z, itemstack.stackSize); + this.getAttributeMap().applyAttributeModifiers(itemstack.getAttributeModifiers(2), z, itemstack.size); } } tagCompound.setObjectList("Inventory", this.inventory.writeToNBT(new TagObjectList())); @@ -3624,12 +3624,12 @@ public abstract class EntityNPC extends EntityLiving // tagCompound.setBoolean("alwaysFly", this.allowFlyingPersist); tagCompound.setBool("noClip", this.noclip); - tagCompound.setObjectList("WarpItems", this.warpChest.saveInventoryToNBT()); + tagCompound.setObjectList("WarpItems", this.warpChest.writeTags()); ItemStack itemstack = this.inventory.getCurrentItem(); if (itemstack != null && itemstack.getItem() != null) { - tagCompound.setObject("SelectedItem", itemstack.writeToNBT(new TagObject())); + tagCompound.setObject("SelectedItem", itemstack.writeTags(new TagObject())); } // tagCompound.setString("Model", this.getModel().name); @@ -3679,7 +3679,7 @@ public abstract class EntityNPC extends EntityLiving if (itemstack.interactWithEntity(this, (EntityLiving)targetEntity)) { - if (itemstack.stackSize <= 0) // && !this.creative) + if (itemstack.size <= 0) // && !this.creative) { this.destroyCurrentEquippedItem(); } @@ -3694,7 +3694,7 @@ public abstract class EntityNPC extends EntityLiving { if (itemstack != null && itemstack == this.getCurrentEquippedItem()) { - if (itemstack.stackSize <= 0) // && !this.creative) + if (itemstack.size <= 0) // && !this.creative) { this.destroyCurrentEquippedItem(); } @@ -3847,7 +3847,7 @@ public abstract class EntityNPC extends EntityLiving { itemstack.hitEntity((EntityLiving)entity, this); - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { this.destroyCurrentEquippedItem(); } diff --git a/common/src/main/java/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java index d5bffa5..4f5b5cc 100755 --- a/common/src/main/java/common/entity/npc/EntitySlime.java +++ b/common/src/main/java/common/entity/npc/EntitySlime.java @@ -134,9 +134,9 @@ public class EntitySlime extends EntityNPC /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); // tagCompound.setInteger("Size", this.getSlimeSize() - 1); tagCompound.setBool("wasOnGround", this.wasOnGround); } @@ -144,9 +144,9 @@ public class EntitySlime extends EntityNPC /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); // int i = tagCompund.getInteger("Size"); // // if (i < 0) diff --git a/common/src/main/java/common/entity/projectile/EntityArrow.java b/common/src/main/java/common/entity/projectile/EntityArrow.java index ce3be77..5751b7e 100755 --- a/common/src/main/java/common/entity/projectile/EntityArrow.java +++ b/common/src/main/java/common/entity/projectile/EntityArrow.java @@ -471,7 +471,7 @@ public class EntityArrow extends Entity implements IProjectile, IObjectData /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); @@ -491,7 +491,7 @@ public class EntityArrow extends Entity implements IProjectile, IObjectData /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.xTile = tagCompund.getShort("xTile"); this.yTile = tagCompund.getShort("yTile"); diff --git a/common/src/main/java/common/entity/projectile/EntityBullet.java b/common/src/main/java/common/entity/projectile/EntityBullet.java index 8f57c92..6243a0d 100755 --- a/common/src/main/java/common/entity/projectile/EntityBullet.java +++ b/common/src/main/java/common/entity/projectile/EntityBullet.java @@ -347,13 +347,13 @@ public class EntityBullet extends Entity implements IProjectile, IObjectData // this.doBlockCollisions(); } - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setInt("damage", this.damage); tagCompound.setInt("age", this.age); } - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.damage = tagCompund.getInt("damage"); this.age = tagCompund.getInt("age"); diff --git a/common/src/main/java/common/entity/projectile/EntityDie.java b/common/src/main/java/common/entity/projectile/EntityDie.java index 77b8cdd..bc655a6 100755 --- a/common/src/main/java/common/entity/projectile/EntityDie.java +++ b/common/src/main/java/common/entity/projectile/EntityDie.java @@ -64,17 +64,17 @@ public class EntityDie extends EntityThrowable implements IObjectData return this.dataWatcher.getWatchableObjectInt(16); } - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("Sides", this.sides); tagCompound.setInt("Value", this.getValue()); tagCompound.setBool("NoPickup", this.noPickup); } - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.sides = tagCompund.getInt("Sides"); this.setValue(tagCompund.getInt("Value")); this.noPickup = tagCompund.getBool("NoPickup"); diff --git a/common/src/main/java/common/entity/projectile/EntityDynamite.java b/common/src/main/java/common/entity/projectile/EntityDynamite.java index 3584248..ad145bb 100755 --- a/common/src/main/java/common/entity/projectile/EntityDynamite.java +++ b/common/src/main/java/common/entity/projectile/EntityDynamite.java @@ -59,15 +59,15 @@ public class EntityDynamite extends EntityThrowable implements IObjectData } } - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setByte("Power", (byte)this.explosionSize); } - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.explosionSize = ((int)tagCompund.getByte("Power")) & 7; } diff --git a/common/src/main/java/common/entity/projectile/EntityFireball.java b/common/src/main/java/common/entity/projectile/EntityFireball.java index 6c85f9f..b262fbf 100755 --- a/common/src/main/java/common/entity/projectile/EntityFireball.java +++ b/common/src/main/java/common/entity/projectile/EntityFireball.java @@ -56,18 +56,18 @@ public class EntityFireball extends EntityProjectile /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("ExplosionPower", this.explosionPower); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.explosionPower = tagCompund.getInt("ExplosionPower"); } } diff --git a/common/src/main/java/common/entity/projectile/EntityHook.java b/common/src/main/java/common/entity/projectile/EntityHook.java index 9b1fd22..559912b 100755 --- a/common/src/main/java/common/entity/projectile/EntityHook.java +++ b/common/src/main/java/common/entity/projectile/EntityHook.java @@ -121,7 +121,7 @@ public class EntityHook extends Entity implements IObjectData { } - public boolean writeToNBTOptional(TagObject tagCompund) + public boolean writeOptional(TagObject tagCompund) { return false; } @@ -517,7 +517,7 @@ public class EntityHook extends Entity implements IObjectData /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); @@ -533,7 +533,7 @@ public class EntityHook extends Entity implements IObjectData /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.xTile = tagCompund.getShort("xTile"); this.yTile = tagCompund.getShort("yTile"); diff --git a/common/src/main/java/common/entity/projectile/EntityPotion.java b/common/src/main/java/common/entity/projectile/EntityPotion.java index bbbb326..031b3b2 100755 --- a/common/src/main/java/common/entity/projectile/EntityPotion.java +++ b/common/src/main/java/common/entity/projectile/EntityPotion.java @@ -158,13 +158,13 @@ public class EntityPotion extends EntityThrowable implements IObjectData /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); if (tagCompund.hasObject("Potion")) { - this.potionDamage = ItemStack.loadItemStackFromNBT(tagCompund.getObject("Potion")); + this.potionDamage = ItemStack.readFromTag(tagCompund.getObject("Potion")); } else { @@ -180,13 +180,13 @@ public class EntityPotion extends EntityThrowable implements IObjectData /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); if (this.potionDamage != null) { - tagCompound.setObject("Potion", this.potionDamage.writeToNBT(new TagObject())); + tagCompound.setObject("Potion", this.potionDamage.writeTags(new TagObject())); } } diff --git a/common/src/main/java/common/entity/projectile/EntityProjectile.java b/common/src/main/java/common/entity/projectile/EntityProjectile.java index 3fc52a0..03d67e2 100755 --- a/common/src/main/java/common/entity/projectile/EntityProjectile.java +++ b/common/src/main/java/common/entity/projectile/EntityProjectile.java @@ -254,7 +254,7 @@ public abstract class EntityProjectile extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); @@ -262,14 +262,14 @@ public abstract class EntityProjectile extends Entity String resourcelocation = BlockRegistry.REGISTRY.getNameForObject(this.inTile); tagCompound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); tagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); - tagCompound.setDoubleList("direction", this.newDoubleNBTList(this.motionX, this.motionY, this.motionZ)); + tagCompound.setDoubleList("direction", this.newDoubleList(this.motionX, this.motionY, this.motionZ)); tagCompound.setInt("Age", this.age); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.xTile = tagCompund.getShort("xTile"); this.yTile = tagCompund.getShort("yTile"); diff --git a/common/src/main/java/common/entity/types/EntityAnimal.java b/common/src/main/java/common/entity/types/EntityAnimal.java index 9328f76..e8a0542 100755 --- a/common/src/main/java/common/entity/types/EntityAnimal.java +++ b/common/src/main/java/common/entity/types/EntityAnimal.java @@ -100,18 +100,18 @@ public abstract class EntityAnimal extends EntityLiving /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); tagCompound.setInt("InLove", this.inLove); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); this.setInLove(tagCompund.getInt("InLove"), true); } @@ -200,9 +200,9 @@ public abstract class EntityAnimal extends EntityLiving { // if (!player.creative) // { - --stack.stackSize; + --stack.size; - if (stack.stackSize <= 0) + if (stack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index f97b69a..ec0f089 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -539,7 +539,7 @@ public abstract class EntityLiving extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setInt("Health", this.getHealth()); // tagCompound.setShort("Health", (short)((int)Math.ceil((double)this.getHealth()))); @@ -573,7 +573,7 @@ public abstract class EntityLiving extends Entity for (PotionEffect potioneffect : this.effects.values()) { - nbttaglist.add(potioneffect.toNbt()); + nbttaglist.add(potioneffect.toTags()); } tagCompound.setObjectList("ActiveEffects", nbttaglist); @@ -609,7 +609,7 @@ public abstract class EntityLiving extends Entity /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.setAbsorptionAmount(tagCompund.getInt("Absorption")); @@ -625,7 +625,7 @@ public abstract class EntityLiving extends Entity for (int i = 0; i < nbttaglist.size(); ++i) { TagObject nbttagcompound = nbttaglist.get(i); - PotionEffect potioneffect = PotionEffect.fromNbt(nbttagcompound); + PotionEffect potioneffect = PotionEffect.fromTags(nbttagcompound); if (potioneffect != null && !potioneffect.getPotion().isInstant()) { @@ -2775,13 +2775,13 @@ public abstract class EntityLiving extends Entity if(stack != null && stack.getItem() == Items.lead && this.allowLeashing()) { if(!(this instanceof EntityTameable) || !((EntityTameable)this).isTamed()) { this.setLeashedTo(player, true); - --stack.stackSize; + --stack.size; return true; } if(((EntityTameable)this).isOwner(player)) { this.setLeashedTo(player, true); - --stack.stackSize; + --stack.size; return true; } } @@ -3222,9 +3222,9 @@ public abstract class EntityLiving extends Entity // if (!player.creative) // { - --itemstack.stackSize; + --itemstack.size; - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } diff --git a/common/src/main/java/common/entity/types/EntityTameable.java b/common/src/main/java/common/entity/types/EntityTameable.java index 2757197..eb6e0c9 100755 --- a/common/src/main/java/common/entity/types/EntityTameable.java +++ b/common/src/main/java/common/entity/types/EntityTameable.java @@ -25,9 +25,9 @@ public abstract class EntityTameable extends EntityAnimal implements IEntityOwna /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { - super.writeEntityToNBT(tagCompound); + super.writeEntity(tagCompound); // if (this.getOwnerId() == null) // { @@ -45,9 +45,9 @@ public abstract class EntityTameable extends EntityAnimal implements IEntityOwna /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { - super.readEntityFromNBT(tagCompund); + super.readEntity(tagCompund); // String s = ""; // // if (tagCompund.hasString("Owner")) diff --git a/common/src/main/java/common/entity/types/EntityThrowable.java b/common/src/main/java/common/entity/types/EntityThrowable.java index 1eb8853..69e13ac 100755 --- a/common/src/main/java/common/entity/types/EntityThrowable.java +++ b/common/src/main/java/common/entity/types/EntityThrowable.java @@ -303,7 +303,7 @@ public abstract class EntityThrowable extends Entity implements IProjectile /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(TagObject tagCompound) + public void writeEntity(TagObject tagCompound) { tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); @@ -326,7 +326,7 @@ public abstract class EntityThrowable extends Entity implements IProjectile /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(TagObject tagCompund) + public void readEntity(TagObject tagCompund) { this.xTile = tagCompund.getShort("xTile"); this.yTile = tagCompund.getShort("yTile"); diff --git a/common/src/main/java/common/entity/types/EntityWeatherEffect.java b/common/src/main/java/common/entity/types/EntityWeatherEffect.java index e8cb01f..315c0a0 100755 --- a/common/src/main/java/common/entity/types/EntityWeatherEffect.java +++ b/common/src/main/java/common/entity/types/EntityWeatherEffect.java @@ -25,10 +25,10 @@ public abstract class EntityWeatherEffect extends Entity { protected final void entityInit() { } - protected final void readEntityFromNBT(TagObject tagCompund) { + protected final void readEntity(TagObject tagCompund) { } - protected final void writeEntityToNBT(TagObject tagCompound) { + protected final void writeEntity(TagObject tagCompound) { } public final EntityType getType() { diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index 793d84e..7e1b890 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -594,14 +594,14 @@ public abstract class CraftingRegistry if (itemstack1 != null && itemstack1.getItem() == Items.banner) { itemstack = itemstack1.copy(); - itemstack.stackSize = 1; + itemstack.size = 1; break; } } - TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern = this.getBannerPattern(inv); + TileEntityBanner.EnumBannerPattern type = this.getBannerPattern(inv); - if (tileentitybanner$enumbannerpattern != null) + if (type != null) { int k = 0; @@ -616,23 +616,23 @@ public abstract class CraftingRegistry } } - TagObject nbttagcompound1 = itemstack.getSubCompound("BlockEntityTag", true); - TagObjectList nbttaglist = null; + TagObject tag = itemstack.getSubCompound("BlockEntityTag", true); + TagObjectList list = null; - if (nbttagcompound1.hasObjectList("Patterns")) + if (tag.hasObjectList("Patterns")) { - nbttaglist = nbttagcompound1.getObjectList("Patterns"); + list = tag.getObjectList("Patterns"); } else { - nbttaglist = new TagObjectList(); - nbttagcompound1.setObjectList("Patterns", nbttaglist); + list = new TagObjectList(); + tag.setObjectList("Patterns", list); } - TagObject nbttagcompound = new TagObject(); - nbttagcompound.setString("Pattern", tileentitybanner$enumbannerpattern.getPatternID()); - nbttagcompound.setInt("Color", k); - nbttaglist.add(nbttagcompound); + TagObject pattern = new TagObject(); + pattern.setString("Pattern", type.getPatternID()); + pattern.setInt("Color", k); + list.add(pattern); } return itemstack; @@ -844,7 +844,7 @@ public abstract class CraftingRegistry if (itemstack != null && TileEntityBanner.getPatterns(itemstack) > 0) { ItemStack itemstack1 = itemstack.copy(); - itemstack1.stackSize = 1; + itemstack1.size = 1; return itemstack1; } } @@ -879,7 +879,7 @@ public abstract class CraftingRegistry else if (itemstack.hasTagCompound() && TileEntityBanner.getPatterns(itemstack) > 0) { aitemstack[i] = itemstack.copy(); - aitemstack[i].stackSize = 1; + aitemstack[i].size = 1; } } } @@ -969,9 +969,9 @@ public abstract class CraftingRegistry if (l > 0) { - TagObject nbttagcompound1 = new TagObject(); - TagObject nbttagcompound3 = new TagObject(); - TagObjectList nbttaglist = new TagObjectList(); + TagObject tag = new TagObject(); + TagObject data = new TagObject(); + TagObjectList list = new TagObjectList(); for (int k2 = 0; k2 < inv.getSizeInventory(); ++k2) { @@ -979,14 +979,14 @@ public abstract class CraftingRegistry if (itemstack3 != null && itemstack3.getItem() == Items.firework_charge && itemstack3.hasTagCompound() && itemstack3.getTagCompound().hasObject("Explosion")) { - nbttaglist.add(itemstack3.getTagCompound().getObject("Explosion")); + list.add(itemstack3.getTagCompound().getObject("Explosion")); } } - nbttagcompound3.setObjectList("Explosions", nbttaglist); - nbttagcompound3.setByte("Flight", (byte)j); - nbttagcompound1.setObject("Fireworks", nbttagcompound3); - this.field_92102_a.setTagCompound(nbttagcompound1); + data.setObjectList("Explosions", list); + data.setByte("Flight", (byte)j); + tag.setObject("Fireworks", data); + this.field_92102_a.setTagCompound(tag); } return true; @@ -994,8 +994,8 @@ public abstract class CraftingRegistry else if (j == 1 && i == 0 && l == 0 && k > 0 && j1 <= 1) { this.field_92102_a = new ItemStack(Items.firework_charge); - TagObject nbttagcompound = new TagObject(); - TagObject nbttagcompound2 = new TagObject(); + TagObject tag = new TagObject(); + TagObject data = new TagObject(); byte b0 = 0; List list = Lists.newArrayList(); @@ -1011,11 +1011,11 @@ public abstract class CraftingRegistry } else if (itemstack2.getItem() == Items.glowstone_dust) { - nbttagcompound2.setBool("Flicker", true); + data.setBool("Flicker", true); } else if (itemstack2.getItem() == Items.diamond) { - nbttagcompound2.setBool("Trail", true); + data.setBool("Trail", true); } else if (itemstack2.getItem() == Items.fire_charge) { @@ -1043,10 +1043,10 @@ public abstract class CraftingRegistry aint1[l2] = ((Integer)list.get(l2)).intValue(); } - nbttagcompound2.setIntArray("Colors", aint1); - nbttagcompound2.setByte("Type", b0); - nbttagcompound.setObject("Explosion", nbttagcompound2); - this.field_92102_a.setTagCompound(nbttagcompound); + data.setIntArray("Colors", aint1); + data.setByte("Type", b0); + tag.setObject("Explosion", data); + this.field_92102_a.setTagCompound(tag); return true; } else if (j == 0 && i == 0 && l == 1 && k > 0 && k == i1) @@ -1066,7 +1066,7 @@ public abstract class CraftingRegistry else if (itemstack1.getItem() == Items.firework_charge) { this.field_92102_a = itemstack1.copy(); - this.field_92102_a.stackSize = 1; + this.field_92102_a.size = 1; } } } @@ -1080,15 +1080,15 @@ public abstract class CraftingRegistry if (this.field_92102_a != null && this.field_92102_a.hasTagCompound()) { - TagObject nbttagcompound4 = this.field_92102_a.getTagCompound().getObject("Explosion"); + TagObject tag = this.field_92102_a.getTagCompound().getObject("Explosion"); - if (nbttagcompound4 == null) + if (tag == null) { return false; } else { - nbttagcompound4.setIntArray("FadeColors", aint); + tag.setIntArray("FadeColors", aint); return true; } } @@ -1168,7 +1168,7 @@ public abstract class CraftingRegistry { ItemStack itemstack1 = (ItemStack)list.get(0); - if (itemstack.getItem() != itemstack1.getItem() || itemstack1.stackSize != 1 || itemstack.stackSize != 1 || !itemstack1.getItem().isDamageable()) + if (itemstack.getItem() != itemstack1.getItem() || itemstack1.size != 1 || itemstack.size != 1 || !itemstack1.getItem().isDamageable()) { return false; } @@ -1198,7 +1198,7 @@ public abstract class CraftingRegistry { ItemStack itemstack1 = (ItemStack)list.get(0); - if (itemstack.getItem() != itemstack1.getItem() || itemstack1.stackSize != 1 || itemstack.stackSize != 1 || !itemstack1.getItem().isDamageable()) + if (itemstack.getItem() != itemstack1.getItem() || itemstack1.size != 1 || itemstack.size != 1 || !itemstack1.getItem().isDamageable()) { return null; } @@ -1211,7 +1211,7 @@ public abstract class CraftingRegistry ItemStack itemstack2 = (ItemStack)list.get(0); ItemStack itemstack3 = (ItemStack)list.get(1); - if (itemstack2.getItem() == itemstack3.getItem() && itemstack2.stackSize == 1 && itemstack3.stackSize == 1 && itemstack2.getItem().isDamageable()) + if (itemstack2.getItem() == itemstack3.getItem() && itemstack2.size == 1 && itemstack3.size == 1 && itemstack2.getItem().isDamageable()) { Item item = itemstack2.getItem(); int j = item.getMaxDamage() - itemstack2.getItemDamage(); @@ -1331,7 +1331,7 @@ public abstract class CraftingRegistry } itemstack = itemstack1.copy(); - itemstack.stackSize = 1; + itemstack.size = 1; if (itemarmor.hasColor(itemstack1)) { @@ -1431,7 +1431,7 @@ public abstract class CraftingRegistry /** Is the ItemStack that you get when craft the recipe. */ private final ItemStack recipeOutput; - private boolean copyIngredientNBT; + private boolean copyIngredientTag; public ShapedRecipes(int width, int height, ItemStack[] p_i1917_3_, ItemStack output) { @@ -1544,7 +1544,7 @@ public abstract class CraftingRegistry { ItemStack itemstack = this.getRecipeOutput().copy(); - if (this.copyIngredientNBT) + if (this.copyIngredientTag) { for (int i = 0; i < inv.getSizeInventory(); ++i) { diff --git a/common/src/main/java/common/init/DispenserRegistry.java b/common/src/main/java/common/init/DispenserRegistry.java index e5c776c..dc3235e 100755 --- a/common/src/main/java/common/init/DispenserRegistry.java +++ b/common/src/main/java/common/init/DispenserRegistry.java @@ -243,7 +243,7 @@ public abstract class DispenserRegistry { if (itembucket.tryPlaceContainedLiquid(source.getWorld(), blockpos)) { stack.setItem(Items.bucket); - stack.stackSize = 1; + stack.size = 1; return stack; } else @@ -300,10 +300,10 @@ public abstract class DispenserRegistry { world.setBlockToAir(blockpos); - if (--stack.stackSize == 0) + if (--stack.size == 0) { stack.setItem(item); - stack.stackSize = 1; + stack.size = 1; } else if (((TileEntityDispenser)source.getBlockTileEntity()).addItemStack(new ItemStack(item)) < 0) { @@ -327,7 +327,7 @@ public abstract class DispenserRegistry { if (stack.attemptDamageItem(1, world.rand)) { - stack.stackSize = 0; + stack.size = 0; } } else if (world.getState(blockpos).getBlock() == Blocks.tnt) @@ -404,112 +404,9 @@ public abstract class DispenserRegistry { EntityTnt entitytntprimed = new EntityTnt(world, (double)blockpos.getX() + 0.5D, (double)blockpos.getY(), (double)blockpos.getZ() + 0.5D, (EntityLiving)null, stack.getMetadata()); world.spawnEntityInWorld(entitytntprimed); world.playSoundAtEntity(entitytntprimed, SoundEvent.FUSE, 1.0F); - --stack.stackSize; + --stack.size; return stack; } }); -// REGISTRY.putObject(Items.skull, new BehaviorDefaultDispenseItem() -// { -// private boolean field_179240_b = true; -// protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) -// { -// World world = source.getWorld(); -// EnumFacing enumfacing = BlockDispenser.getFacing(source.getBlockMetadata()); -// BlockPos blockpos = source.getBlockPos().offset(enumfacing); -// BlockSkull blockskull = Blocks.skull; -// -// if (world.isAirBlock(blockpos) && blockskull.canDispenserPlace(world, blockpos, stack)) -// { -// if (!world.client) -// { -// world.setBlockState(blockpos, blockskull.getDefaultState().withProperty(BlockSkull.FACING, EnumFacing.UP), 3); -// TileEntity tileentity = world.getTileEntity(blockpos); -// -// if (tileentity instanceof TileEntitySkull) -// { -// if (stack.getMetadata() == 3) -// { -// String user = null; -// -// if (stack.hasTagCompound()) -// { -// NBTTagCompound nbttagcompound = stack.getTagCompound(); -// -// if (nbttagcompound.hasString("SkullOwner") && nbttagcompound.getString("SkullOwner").length() > 0) -// { -// user = nbttagcompound.getString("SkullOwner"); -// } -// } -// -// ((TileEntitySkull)tileentity).setUser(user); -// } -// else -// { -// ((TileEntitySkull)tileentity).setType(stack.getMetadata()); -// } -// -// ((TileEntitySkull)tileentity).setSkullRotation(enumfacing.getOpposite().getHorizontalIndex() * 4); -//// Blocks.skull.checkWitherSpawn(world, blockpos, (TileEntitySkull)tileentity); -// } -// -// --stack.stackSize; -// } -// } -// else -// { -// this.field_179240_b = false; -// } -// -// return stack; -// } -// protected void playDispenseSound(IBlockSource source) -// { -// if (this.field_179240_b) -// { -// source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0); -// } -// else -// { -// source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0); -// } -// } -// }); -// REGISTRY.putObject(ItemRegistry.getItemFromBlock(Blocks.pumpkin), new BehaviorDefaultDispenseItem() -// { -// private boolean field_179241_b = true; -// protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) -// { -// World world = source.getWorld(); -// BlockPos blockpos = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata())); -// BlockPumpkin blockpumpkin = (BlockPumpkin)Blocks.pumpkin; -// -// if (world.isAirBlock(blockpos) && blockpumpkin.canDispenserPlace(world, blockpos)) -// { -// if (!world.client) -// { -// world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); -// } -// -// --stack.stackSize; -// } -// else -// { -// this.field_179241_b = false; -// } -// -// return stack; -// } -// protected void playDispenseSound(IBlockSource source) -// { -// if (this.field_179241_b) -// { -// source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0); -// } -// else -// { -// source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0); -// } -// } -// }); } } diff --git a/common/src/main/java/common/init/EntityRegistry.java b/common/src/main/java/common/init/EntityRegistry.java index a9ed6a7..1213843 100755 --- a/common/src/main/java/common/init/EntityRegistry.java +++ b/common/src/main/java/common/init/EntityRegistry.java @@ -117,19 +117,14 @@ public abstract class EntityRegistry { return entity; } - public static Entity createEntityFromNBT(TagObject nbt, World worldIn) { + public static Entity createFromTags(TagObject tag, World world) { Entity entity = null; -// if("Minecart".equals(nbt.getString("id"))) { -// nbt.setString("id", EntityMinecart.EnumMinecartType.byNetworkID(nbt.getInteger("Type")).getName()); -// nbt.removeTag("Type"); -// } - try { - Class oclass = (Class)STRING_TO_CLASS.get(nbt.getString("id")); + Class oclass = (Class)STRING_TO_CLASS.get(tag.getString("id")); if(oclass != null) { - entity = (Entity)oclass.getConstructor(World.class).newInstance(worldIn); + entity = (Entity)oclass.getConstructor(World.class).newInstance(world); } } catch(Exception exception) { @@ -137,10 +132,10 @@ public abstract class EntityRegistry { } if(entity != null) { - entity.readFromNBT(nbt); + entity.readTags(tag); } else { - Log.TICK.warn("Ignoriere Objekt mit Name " + nbt.getString("id")); + Log.TICK.warn("Ignoriere Objekt mit Name " + tag.getString("id")); } return entity; diff --git a/common/src/main/java/common/init/UniverseRegistry.java b/common/src/main/java/common/init/UniverseRegistry.java index c52f81d..ee194b1 100755 --- a/common/src/main/java/common/init/UniverseRegistry.java +++ b/common/src/main/java/common/init/UniverseRegistry.java @@ -92,10 +92,10 @@ public abstract class UniverseRegistry { } } - public static void loadNbt(TagObject tag) { + public static void fromTags(TagObject tag) { TagObjectList list = tag.getObjectList("Dimensions"); for(int z = 0; z < list.size(); z++) { - Dimension dim = Dimension.getByNbt(list.get(z)); + Dimension dim = Dimension.getByTag(list.get(z)); if(!REGISTRY.containsKey(dim.getDimensionId()) && !ALIASES.containsKey(dim.getDimensionName())) register(dim); } @@ -107,7 +107,7 @@ public abstract class UniverseRegistry { // if(BASE_ALIASES.containsKey(id)) { Dimension dim = ALIASES.get(id); if(dim != null && dim != Space.INSTANCE) - dim.readNbt(data); + dim.readTags(data); // } } @@ -118,7 +118,7 @@ public abstract class UniverseRegistry { Sector sector = SECTORS.get(id); if(sector == null) SECTORS.put(id, sector = new Sector(id)); - sector.readNbt(data); + sector.readTags(data); } list = tag.getObjectList("Galaxies"); @@ -128,7 +128,7 @@ public abstract class UniverseRegistry { Galaxy galaxy = GALAXIES.get(id); if(galaxy == null) GALAXIES.put(id, galaxy = new Galaxy(id)); - galaxy.readNbt(data); + galaxy.readTags(data); } list = tag.getObjectList("Domains"); @@ -138,7 +138,7 @@ public abstract class UniverseRegistry { Domain domain = DOMAINS.get(id); if(domain == null) DOMAINS.put(id, domain = new Domain(id)); - domain.readNbt(data); + domain.readTags(data); } list = tag.getObjectList("Barycenters"); @@ -149,13 +149,13 @@ public abstract class UniverseRegistry { } } - public static TagObject saveNbt() { + public static TagObject toTags() { TagObject tag = new TagObject(); TagObjectList list = new TagObjectList(); for(Dimension dim : DIMENSIONS) { if(!BASE_REGISTRY.containsKey(dim.getDimensionId()) && dim != Space.INSTANCE) - list.add(dim.toNbt()); + list.add(dim.toTags()); } if(!list.isEmpty()) tag.setObjectList("Dimensions", list); @@ -164,7 +164,7 @@ public abstract class UniverseRegistry { for(Dimension dim : DIMENSIONS) { if(/* BASE_REGISTRY.containsKey(dim.getDimensionId()) */ dim != Space.INSTANCE) { TagObject data = new TagObject(); - dim.writeNbt(data); + dim.writeTags(data); if(!data.isEmpty()) { data.setString("ID", dim.getDimensionName()); list.add(data); @@ -177,7 +177,7 @@ public abstract class UniverseRegistry { list = new TagObjectList(); for(Sector sector : SECTORS.values()) { TagObject data = new TagObject(); - sector.writeNbt(data); + sector.writeTags(data); if(!data.isEmpty()) { data.setString("ID", sector.id); list.add(data); @@ -189,7 +189,7 @@ public abstract class UniverseRegistry { list = new TagObjectList(); for(Galaxy galaxy : GALAXIES.values()) { TagObject data = new TagObject(); - galaxy.writeNbt(data); + galaxy.writeTags(data); if(!data.isEmpty()) { data.setString("ID", galaxy.id); list.add(data); @@ -201,7 +201,7 @@ public abstract class UniverseRegistry { list = new TagObjectList(); for(Domain domain : DOMAINS.values()) { TagObject data = new TagObject(); - domain.writeNbt(data); + domain.writeTags(data); if(!data.isEmpty()) { data.setString("ID", domain.id); list.add(data); @@ -708,7 +708,7 @@ public abstract class UniverseRegistry { catch(TagException e) { throw new RuntimeException(e); } - TagObject dtag = dim.toNbt(true); + TagObject dtag = dim.toTags(true); if(ptag.getBool("ClearGenerator")) { ptag.remove("ClearGenerator"); dtag.remove("FloorBlock"); @@ -754,7 +754,7 @@ public abstract class UniverseRegistry { dtag.setString("CaveFillBlock", BlockRegistry.toIdName(Blocks.air.getState())); } dtag.merge(ptag); - dim.fromNbt(dtag); + dim.fromTags(dtag); dim.setCustomName(name); // BASE_DIMS.add(dim); return dim; diff --git a/common/src/main/java/common/inventory/Container.java b/common/src/main/java/common/inventory/Container.java index 80ae090..d7bcfbf 100755 --- a/common/src/main/java/common/inventory/Container.java +++ b/common/src/main/java/common/inventory/Container.java @@ -173,7 +173,7 @@ public abstract class Container { Slot slot = (Slot)this.inventorySlots.get(slotId); - if (slot != null && canAddItemToSlot(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize > this.dragSlots.size() && this.canDragIntoSlot(slot)) + if (slot != null && canAddItemToSlot(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().size > this.dragSlots.size() && this.canDragIntoSlot(slot)) { this.dragSlots.add(slot); } @@ -183,34 +183,34 @@ public abstract class Container if (!this.dragSlots.isEmpty()) { ItemStack itemstack3 = inventoryplayer.getItemStack().copy(); - int j = inventoryplayer.getItemStack().stackSize; + int j = inventoryplayer.getItemStack().size; for (Slot slot1 : this.dragSlots) { - if (slot1 != null && canAddItemToSlot(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize >= this.dragSlots.size() && this.canDragIntoSlot(slot1)) + if (slot1 != null && canAddItemToSlot(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().size >= this.dragSlots.size() && this.canDragIntoSlot(slot1)) { ItemStack itemstack1 = itemstack3.copy(); - int k = slot1.getHasStack() ? slot1.getStack().stackSize : 0; + int k = slot1.getHasStack() ? slot1.getStack().size : 0; computeStackSize(this.dragSlots, this.dragMode, itemstack1, k); - if (itemstack1.stackSize > itemstack1.getMaxStackSize()) + if (itemstack1.size > itemstack1.getMaxStackSize()) { - itemstack1.stackSize = itemstack1.getMaxStackSize(); + itemstack1.size = itemstack1.getMaxStackSize(); } - if (itemstack1.stackSize > slot1.getItemStackLimit(itemstack1)) + if (itemstack1.size > slot1.getItemStackLimit(itemstack1)) { - itemstack1.stackSize = slot1.getItemStackLimit(itemstack1); + itemstack1.size = slot1.getItemStackLimit(itemstack1); } - j -= itemstack1.stackSize - k; + j -= itemstack1.size - k; slot1.putStack(itemstack1); } } - itemstack3.stackSize = j; + itemstack3.size = j; - if (itemstack3.stackSize <= 0) + if (itemstack3.size <= 0) { itemstack3 = null; } @@ -245,7 +245,7 @@ public abstract class Container { playerIn.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1), true); - if (inventoryplayer.getItemStack().stackSize == 0) + if (inventoryplayer.getItemStack().size == 0) { inventoryplayer.setItemStack((ItemStack)null); } @@ -300,19 +300,19 @@ public abstract class Container { if (itemstack10 != null && slot7.isItemValid(itemstack10)) { - int k2 = clickedButton == 0 ? itemstack10.stackSize : 1; + int k2 = clickedButton == 0 ? itemstack10.size : 1; if (k2 > slot7.getItemStackLimit(itemstack10)) { k2 = slot7.getItemStackLimit(itemstack10); } - if (itemstack10.stackSize >= k2) + if (itemstack10.size >= k2) { slot7.putStack(itemstack10.splitStack(k2)); } - if (itemstack10.stackSize == 0) + if (itemstack10.size == 0) { inventoryplayer.setItemStack((ItemStack)null); } @@ -322,11 +322,11 @@ public abstract class Container { if (itemstack10 == null) { - int j2 = clickedButton == 0 ? itemstack9.stackSize : (itemstack9.stackSize + 1) / 2; + int j2 = clickedButton == 0 ? itemstack9.size : (itemstack9.size + 1) / 2; ItemStack itemstack12 = slot7.decrStackSize(j2); inventoryplayer.setItemStack(itemstack12); - if (itemstack9.stackSize == 0) + if (itemstack9.size == 0) { slot7.putStack((ItemStack)null); } @@ -337,28 +337,28 @@ public abstract class Container { if (itemstack9.getItem() == itemstack10.getItem() && itemstack9.getMetadata() == itemstack10.getMetadata() && ItemStack.areItemStackTagsEqual(itemstack9, itemstack10)) { - int i2 = clickedButton == 0 ? itemstack10.stackSize : 1; + int i2 = clickedButton == 0 ? itemstack10.size : 1; - if (i2 > slot7.getItemStackLimit(itemstack10) - itemstack9.stackSize) + if (i2 > slot7.getItemStackLimit(itemstack10) - itemstack9.size) { - i2 = slot7.getItemStackLimit(itemstack10) - itemstack9.stackSize; + i2 = slot7.getItemStackLimit(itemstack10) - itemstack9.size; } - if (i2 > itemstack10.getMaxStackSize() - itemstack9.stackSize) + if (i2 > itemstack10.getMaxStackSize() - itemstack9.size) { - i2 = itemstack10.getMaxStackSize() - itemstack9.stackSize; + i2 = itemstack10.getMaxStackSize() - itemstack9.size; } itemstack10.splitStack(i2); - if (itemstack10.stackSize == 0) + if (itemstack10.size == 0) { inventoryplayer.setItemStack((ItemStack)null); } - itemstack9.stackSize += i2; + itemstack9.size += i2; } - else if (itemstack10.stackSize <= slot7.getItemStackLimit(itemstack10)) + else if (itemstack10.size <= slot7.getItemStackLimit(itemstack10)) { slot7.putStack(itemstack10); inventoryplayer.setItemStack(itemstack9); @@ -366,14 +366,14 @@ public abstract class Container } else if (itemstack9.getItem() == itemstack10.getItem() && itemstack10.getMaxStackSize() > 1 && (!itemstack9.getHasSubtypes() || itemstack9.getMetadata() == itemstack10.getMetadata()) && ItemStack.areItemStackTagsEqual(itemstack9, itemstack10)) { - int l1 = itemstack9.stackSize; + int l1 = itemstack9.size; - if (l1 > 0 && l1 + itemstack10.stackSize <= itemstack10.getMaxStackSize()) + if (l1 > 0 && l1 + itemstack10.size <= itemstack10.getMaxStackSize()) { - itemstack10.stackSize += l1; + itemstack10.size += l1; itemstack9 = slot7.decrStackSize(l1); - if (itemstack9.stackSize == 0) + if (itemstack9.size == 0) { slot7.putStack((ItemStack)null); } @@ -413,14 +413,14 @@ public abstract class Container if (k1 > -1) { inventoryplayer.addItemStackToInventory(itemstack7); - slot5.decrStackSize(itemstack11.stackSize); + slot5.decrStackSize(itemstack11.size); slot5.putStack((ItemStack)null); slot5.onPickupFromSlot(playerIn, itemstack11); } } else { - slot5.decrStackSize(itemstack11.stackSize); + slot5.decrStackSize(itemstack11.size); slot5.putStack(itemstack7); slot5.onPickupFromSlot(playerIn, itemstack11); } @@ -449,7 +449,7 @@ public abstract class Container if (slot3 != null && slot3.getHasStack() && slot3.canTakeStack(playerIn)) { - ItemStack itemstack5 = slot3.decrStackSize(clickedButton == 0 ? 1 : slot3.getStack().stackSize); + ItemStack itemstack5 = slot3.decrStackSize(clickedButton == 0 ? 1 : slot3.getStack().size); slot3.onPickupFromSlot(playerIn, itemstack5); playerIn.dropPlayerItemWithRandomChoice(itemstack5, true); } @@ -466,17 +466,17 @@ public abstract class Container for (int l2 = 0; l2 < 2; ++l2) { - for (int i3 = i1; i3 >= 0 && i3 < this.inventorySlots.size() && itemstack4.stackSize < itemstack4.getMaxStackSize(); i3 += j1) + for (int i3 = i1; i3 >= 0 && i3 < this.inventorySlots.size() && itemstack4.size < itemstack4.getMaxStackSize(); i3 += j1) { Slot slot8 = (Slot)this.inventorySlots.get(i3); - if (slot8.getHasStack() && canAddItemToSlot(slot8, itemstack4, true) && slot8.canTakeStack(playerIn) && this.canMergeSlot(itemstack4, slot8) && (l2 != 0 || slot8.getStack().stackSize != slot8.getStack().getMaxStackSize())) + if (slot8.getHasStack() && canAddItemToSlot(slot8, itemstack4, true) && slot8.canTakeStack(playerIn) && this.canMergeSlot(itemstack4, slot8) && (l2 != 0 || slot8.getStack().size != slot8.getStack().getMaxStackSize())) { - int l = Math.min(itemstack4.getMaxStackSize() - itemstack4.stackSize, slot8.getStack().stackSize); + int l = Math.min(itemstack4.getMaxStackSize() - itemstack4.size, slot8.getStack().size); ItemStack itemstack2 = slot8.decrStackSize(l); - itemstack4.stackSize += l; + itemstack4.size += l; - if (itemstack2.stackSize <= 0) + if (itemstack2.size <= 0) { slot8.putStack((ItemStack)null); } @@ -606,26 +606,26 @@ public abstract class Container if (stack.isStackable()) { - while (stack.stackSize > 0 && (!reverseDirection && i < endIndex || reverseDirection && i >= startIndex)) + while (stack.size > 0 && (!reverseDirection && i < endIndex || reverseDirection && i >= startIndex)) { Slot slot = (Slot)this.inventorySlots.get(i); ItemStack itemstack = slot.getStack(); if (itemstack != null && itemstack.getItem() == stack.getItem() && (!stack.getHasSubtypes() || stack.getMetadata() == itemstack.getMetadata()) && ItemStack.areItemStackTagsEqual(stack, itemstack)) { - int j = itemstack.stackSize + stack.stackSize; + int j = itemstack.size + stack.size; if (j <= stack.getMaxStackSize()) { - stack.stackSize = 0; - itemstack.stackSize = j; + stack.size = 0; + itemstack.size = j; slot.onSlotChanged(); flag = true; } - else if (itemstack.stackSize < stack.getMaxStackSize()) + else if (itemstack.size < stack.getMaxStackSize()) { - stack.stackSize -= stack.getMaxStackSize() - itemstack.stackSize; - itemstack.stackSize = stack.getMaxStackSize(); + stack.size -= stack.getMaxStackSize() - itemstack.size; + itemstack.size = stack.getMaxStackSize(); slot.onSlotChanged(); flag = true; } @@ -642,7 +642,7 @@ public abstract class Container } } - if (stack.stackSize > 0) + if (stack.size > 0) { if (reverseDirection) { @@ -662,7 +662,7 @@ public abstract class Container { slot1.putStack(stack.copy()); slot1.onSlotChanged(); - stack.stackSize = 0; + stack.size = 0; flag = true; break; } @@ -729,7 +729,7 @@ public abstract class Container if (slotIn != null && slotIn.getHasStack() && stack != null && stack.isItemEqual(slotIn.getStack()) && ItemStack.areItemStackTagsEqual(slotIn.getStack(), stack)) { - flag |= slotIn.getStack().stackSize + (stackSizeMatters ? 0 : stack.stackSize) <= stack.getMaxStackSize(); + flag |= slotIn.getStack().size + (stackSizeMatters ? 0 : stack.size) <= stack.getMaxStackSize(); } return flag; @@ -744,18 +744,18 @@ public abstract class Container switch (p_94525_1_) { case 0: - p_94525_2_.stackSize = ExtMath.floorf((float)p_94525_2_.stackSize / (float)p_94525_0_.size()); + p_94525_2_.size = ExtMath.floorf((float)p_94525_2_.size / (float)p_94525_0_.size()); break; case 1: - p_94525_2_.stackSize = 1; + p_94525_2_.size = 1; break; case 2: - p_94525_2_.stackSize = p_94525_2_.getItem().getItemStackLimit(); + p_94525_2_.size = p_94525_2_.getItem().getItemStackLimit(); } - p_94525_2_.stackSize += p_94525_3_; + p_94525_2_.size += p_94525_3_; } /** @@ -792,7 +792,7 @@ public abstract class Container if (itemstack != null) { - f += (float)itemstack.stackSize / (float)Math.min(inv.getInventoryStackLimit(), itemstack.getMaxStackSize()); + f += (float)itemstack.size / (float)Math.min(inv.getInventoryStackLimit(), itemstack.getMaxStackSize()); ++i; } } diff --git a/common/src/main/java/common/inventory/ContainerBrewingStand.java b/common/src/main/java/common/inventory/ContainerBrewingStand.java index d4c461a..cd28bb7 100755 --- a/common/src/main/java/common/inventory/ContainerBrewingStand.java +++ b/common/src/main/java/common/inventory/ContainerBrewingStand.java @@ -128,7 +128,7 @@ public class ContainerBrewingStand extends Container slot.onSlotChange(itemstack1, itemstack); } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -137,7 +137,7 @@ public class ContainerBrewingStand extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerChest.java b/common/src/main/java/common/inventory/ContainerChest.java index f53fe5e..c20fb4d 100755 --- a/common/src/main/java/common/inventory/ContainerChest.java +++ b/common/src/main/java/common/inventory/ContainerChest.java @@ -67,7 +67,7 @@ public class ContainerChest extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } diff --git a/common/src/main/java/common/inventory/ContainerDispenser.java b/common/src/main/java/common/inventory/ContainerDispenser.java index 6caa6dc..5ed17e5 100755 --- a/common/src/main/java/common/inventory/ContainerDispenser.java +++ b/common/src/main/java/common/inventory/ContainerDispenser.java @@ -63,7 +63,7 @@ public class ContainerDispenser extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -72,7 +72,7 @@ public class ContainerDispenser extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerEnchantment.java b/common/src/main/java/common/inventory/ContainerEnchantment.java index f630bbe..ae9b48e 100755 --- a/common/src/main/java/common/inventory/ContainerEnchantment.java +++ b/common/src/main/java/common/inventory/ContainerEnchantment.java @@ -390,19 +390,19 @@ public class ContainerEnchantment extends Container return null; } - if (itemstack1.hasTagCompound() && itemstack1.stackSize == 1) + if (itemstack1.hasTagCompound() && itemstack1.size == 1) { ((Slot)this.inventorySlots.get(0)).putStack(itemstack1.copy()); - itemstack1.stackSize = 0; + itemstack1.size = 0; } - else if (itemstack1.stackSize >= 1) + else if (itemstack1.size >= 1) { ((Slot)this.inventorySlots.get(0)).putStack(new ItemStack(itemstack1.getItem(), 1, itemstack1.getMetadata())); - --itemstack1.stackSize; + --itemstack1.size; } } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -411,7 +411,7 @@ public class ContainerEnchantment extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerFurnace.java b/common/src/main/java/common/inventory/ContainerFurnace.java index ae7cc2d..a4c67ff 100755 --- a/common/src/main/java/common/inventory/ContainerFurnace.java +++ b/common/src/main/java/common/inventory/ContainerFurnace.java @@ -143,7 +143,7 @@ public class ContainerFurnace extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -152,7 +152,7 @@ public class ContainerFurnace extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerHopper.java b/common/src/main/java/common/inventory/ContainerHopper.java index 99d9283..9b8326b 100755 --- a/common/src/main/java/common/inventory/ContainerHopper.java +++ b/common/src/main/java/common/inventory/ContainerHopper.java @@ -62,7 +62,7 @@ public class ContainerHopper extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } diff --git a/common/src/main/java/common/inventory/ContainerHorseInventory.java b/common/src/main/java/common/inventory/ContainerHorseInventory.java index 928b183..abc7c96 100755 --- a/common/src/main/java/common/inventory/ContainerHorseInventory.java +++ b/common/src/main/java/common/inventory/ContainerHorseInventory.java @@ -105,7 +105,7 @@ public class ContainerHorseInventory extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } diff --git a/common/src/main/java/common/inventory/ContainerMachine.java b/common/src/main/java/common/inventory/ContainerMachine.java index 0a71f19..d9c894b 100755 --- a/common/src/main/java/common/inventory/ContainerMachine.java +++ b/common/src/main/java/common/inventory/ContainerMachine.java @@ -77,7 +77,7 @@ public class ContainerMachine extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } diff --git a/common/src/main/java/common/inventory/ContainerMerchant.java b/common/src/main/java/common/inventory/ContainerMerchant.java index dd43752..96c4a4b 100755 --- a/common/src/main/java/common/inventory/ContainerMerchant.java +++ b/common/src/main/java/common/inventory/ContainerMerchant.java @@ -115,7 +115,7 @@ public class ContainerMerchant extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -124,7 +124,7 @@ public class ContainerMerchant extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerPlayer.java b/common/src/main/java/common/inventory/ContainerPlayer.java index 1512068..9c48af2 100755 --- a/common/src/main/java/common/inventory/ContainerPlayer.java +++ b/common/src/main/java/common/inventory/ContainerPlayer.java @@ -90,12 +90,12 @@ public class ContainerPlayer extends Container { if (last != null) { - this.attributes.removeAttributeModifiers(last.getAttributeModifiers(2), slot.getIndex(), last.stackSize); + this.attributes.removeAttributeModifiers(last.getAttributeModifiers(2), slot.getIndex(), last.size); } if (current != null) { - this.attributes.applyAttributeModifiers(current.getAttributeModifiers(2), slot.getIndex(), current.stackSize); + this.attributes.applyAttributeModifiers(current.getAttributeModifiers(2), slot.getIndex(), current.size); } last = current == null ? null : current.copy(); @@ -202,7 +202,7 @@ public class ContainerPlayer extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -211,7 +211,7 @@ public class ContainerPlayer extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerRepair.java b/common/src/main/java/common/inventory/ContainerRepair.java index a73a24d..1770b94 100755 --- a/common/src/main/java/common/inventory/ContainerRepair.java +++ b/common/src/main/java/common/inventory/ContainerRepair.java @@ -81,9 +81,9 @@ public class ContainerRepair extends Container { ItemStack itemstack = ContainerRepair.this.inputSlots.getStackInSlot(1); - if (itemstack != null && itemstack.stackSize > ContainerRepair.this.materialCost) + if (itemstack != null && itemstack.size > ContainerRepair.this.materialCost) { - itemstack.stackSize -= ContainerRepair.this.materialCost; + itemstack.size -= ContainerRepair.this.materialCost; ContainerRepair.this.inputSlots.setInventorySlotContents(1, itemstack); } else @@ -198,7 +198,7 @@ public class ContainerRepair extends Container int cost; - for (cost = 0; damage > 0 && cost < repStack.stackSize; ++cost) + for (cost = 0; damage > 0 && cost < repStack.size; ++cost) { int j5 = newStack.getItemDamage() - damage; newStack.setItemDamage(j5); @@ -458,7 +458,7 @@ public class ContainerRepair extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -467,7 +467,7 @@ public class ContainerRepair extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/ContainerWorkbench.java b/common/src/main/java/common/inventory/ContainerWorkbench.java index e25af25..c0dbf6f 100755 --- a/common/src/main/java/common/inventory/ContainerWorkbench.java +++ b/common/src/main/java/common/inventory/ContainerWorkbench.java @@ -125,7 +125,7 @@ public class ContainerWorkbench extends Container return null; } - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { slot.putStack((ItemStack)null); } @@ -134,7 +134,7 @@ public class ContainerWorkbench extends Container slot.onSlotChanged(); } - if (itemstack1.stackSize == itemstack.stackSize) + if (itemstack1.size == itemstack.size) { return null; } diff --git a/common/src/main/java/common/inventory/InventoryBasic.java b/common/src/main/java/common/inventory/InventoryBasic.java index 15853bd..1e7086d 100755 --- a/common/src/main/java/common/inventory/InventoryBasic.java +++ b/common/src/main/java/common/inventory/InventoryBasic.java @@ -68,7 +68,7 @@ public class InventoryBasic implements IInventory { if (this.inventoryContents[index] != null) { - if (this.inventoryContents[index].stackSize <= count) + if (this.inventoryContents[index].size <= count) { ItemStack itemstack1 = this.inventoryContents[index]; this.inventoryContents[index] = null; @@ -79,7 +79,7 @@ public class InventoryBasic implements IInventory { ItemStack itemstack = this.inventoryContents[index].splitStack(count); - if (this.inventoryContents[index].stackSize == 0) + if (this.inventoryContents[index].size == 0) { this.inventoryContents[index] = null; } @@ -112,14 +112,14 @@ public class InventoryBasic implements IInventory if (ItemStack.areItemsEqual(itemstack1, itemstack)) { int j = Math.min(this.getInventoryStackLimit(), itemstack1.getMaxStackSize()); - int k = Math.min(itemstack.stackSize, j - itemstack1.stackSize); + int k = Math.min(itemstack.size, j - itemstack1.size); if (k > 0) { - itemstack1.stackSize += k; - itemstack.stackSize -= k; + itemstack1.size += k; + itemstack.size -= k; - if (itemstack.stackSize <= 0) + if (itemstack.size <= 0) { this.markDirty(); return null; @@ -128,7 +128,7 @@ public class InventoryBasic implements IInventory } } - if (itemstack.stackSize != stack.stackSize) + if (itemstack.size != stack.size) { this.markDirty(); } @@ -160,9 +160,9 @@ public class InventoryBasic implements IInventory { this.inventoryContents[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } this.markDirty(); diff --git a/common/src/main/java/common/inventory/InventoryCrafting.java b/common/src/main/java/common/inventory/InventoryCrafting.java index e1b6d39..e026d87 100755 --- a/common/src/main/java/common/inventory/InventoryCrafting.java +++ b/common/src/main/java/common/inventory/InventoryCrafting.java @@ -98,7 +98,7 @@ public class InventoryCrafting implements IInventory { if (this.stackList[index] != null) { - if (this.stackList[index].stackSize <= count) + if (this.stackList[index].size <= count) { ItemStack itemstack1 = this.stackList[index]; this.stackList[index] = null; @@ -109,7 +109,7 @@ public class InventoryCrafting implements IInventory { ItemStack itemstack = this.stackList[index].splitStack(count); - if (this.stackList[index].stackSize == 0) + if (this.stackList[index].size == 0) { this.stackList[index] = null; } diff --git a/common/src/main/java/common/inventory/InventoryHelper.java b/common/src/main/java/common/inventory/InventoryHelper.java index 2f89367..9b1d4fd 100755 --- a/common/src/main/java/common/inventory/InventoryHelper.java +++ b/common/src/main/java/common/inventory/InventoryHelper.java @@ -41,16 +41,16 @@ public class InventoryHelper float f1 = RANDOM.floatv() * 0.8F + 0.1F; float f2 = RANDOM.floatv() * 0.8F + 0.1F; - while (stack.stackSize > 0) + while (stack.size > 0) { - int i = stack.stackSize > 64 ? stack.stackSize : (RANDOM.zrange(21) + 10); + int i = stack.size > 64 ? stack.size : (RANDOM.zrange(21) + 10); - if (i > stack.stackSize) + if (i > stack.size) { - i = stack.stackSize; + i = stack.size; } - stack.stackSize -= i; + stack.size -= i; EntityItem entityitem = new EntityItem(worldIn, x + (double)f, y + (double)f1, z + (double)f2, new ItemStack(stack.getItem(), i, stack.getMetadata())); if (stack.hasTagCompound()) diff --git a/common/src/main/java/common/inventory/InventoryMerchant.java b/common/src/main/java/common/inventory/InventoryMerchant.java index 10cc4c6..5bed206 100755 --- a/common/src/main/java/common/inventory/InventoryMerchant.java +++ b/common/src/main/java/common/inventory/InventoryMerchant.java @@ -59,7 +59,7 @@ public class InventoryMerchant implements IInventory this.theInventory[index] = null; return itemstack2; } - else if (this.theInventory[index].stackSize <= count) + else if (this.theInventory[index].size <= count) { ItemStack itemstack1 = this.theInventory[index]; this.theInventory[index] = null; @@ -75,7 +75,7 @@ public class InventoryMerchant implements IInventory { ItemStack itemstack = this.theInventory[index].splitStack(count); - if (this.theInventory[index].stackSize == 0) + if (this.theInventory[index].size == 0) { this.theInventory[index] = null; } @@ -126,9 +126,9 @@ public class InventoryMerchant implements IInventory { this.theInventory[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } if (this.inventoryResetNeededOnSlotChange(index)) diff --git a/common/src/main/java/common/inventory/InventoryPlayer.java b/common/src/main/java/common/inventory/InventoryPlayer.java index d30269c..21c9308 100755 --- a/common/src/main/java/common/inventory/InventoryPlayer.java +++ b/common/src/main/java/common/inventory/InventoryPlayer.java @@ -85,7 +85,7 @@ public class InventoryPlayer implements IInventory { for (int i = 0; i < this.mainInventory.length; ++i) { - if (this.mainInventory[i] != null && this.mainInventory[i].getItem() == itemStackIn.getItem() && this.mainInventory[i].isStackable() && this.mainInventory[i].stackSize < this.mainInventory[i].getMaxStackSize() && this.mainInventory[i].stackSize < this.getInventoryStackLimit() && (!this.mainInventory[i].getHasSubtypes() || this.mainInventory[i].getMetadata() == itemStackIn.getMetadata()) && ItemStack.areItemStackTagsEqual(this.mainInventory[i], itemStackIn)) + if (this.mainInventory[i] != null && this.mainInventory[i].getItem() == itemStackIn.getItem() && this.mainInventory[i].isStackable() && this.mainInventory[i].size < this.mainInventory[i].getMaxStackSize() && this.mainInventory[i].size < this.getInventoryStackLimit() && (!this.mainInventory[i].getHasSubtypes() || this.mainInventory[i].getMetadata() == itemStackIn.getMetadata()) && ItemStack.areItemStackTagsEqual(this.mainInventory[i], itemStackIn)) { return i; } @@ -196,7 +196,7 @@ public class InventoryPlayer implements IInventory private int storePartialItemStack(ItemStack itemStackIn) { Item item = itemStackIn.getItem(); - int i = itemStackIn.stackSize; + int i = itemStackIn.size; int j = this.storeItemStack(itemStackIn); if (j < 0) @@ -222,14 +222,14 @@ public class InventoryPlayer implements IInventory int k = i; - if (i > this.mainInventory[j].getMaxStackSize() - this.mainInventory[j].stackSize) + if (i > this.mainInventory[j].getMaxStackSize() - this.mainInventory[j].size) { - k = this.mainInventory[j].getMaxStackSize() - this.mainInventory[j].stackSize; + k = this.mainInventory[j].getMaxStackSize() - this.mainInventory[j].size; } - if (k > this.getInventoryStackLimit() - this.mainInventory[j].stackSize) + if (k > this.getInventoryStackLimit() - this.mainInventory[j].size) { - k = this.getInventoryStackLimit() - this.mainInventory[j].stackSize; + k = this.getInventoryStackLimit() - this.mainInventory[j].size; } if (k == 0) @@ -239,7 +239,7 @@ public class InventoryPlayer implements IInventory else { i = i - k; - this.mainInventory[j].stackSize += k; + this.mainInventory[j].size += k; // this.mainInventory[j].animationsToGo = 5; return i; } @@ -274,7 +274,7 @@ public class InventoryPlayer implements IInventory } else { - if (--this.mainInventory[i].stackSize <= 0) + if (--this.mainInventory[i].size <= 0) { this.mainInventory[i] = null; } @@ -297,7 +297,7 @@ public class InventoryPlayer implements IInventory */ public boolean addItemStackToInventory(final ItemStack itemStackIn) { - if (itemStackIn != null && itemStackIn.stackSize != 0 && itemStackIn.getItem() != null) + if (itemStackIn != null && itemStackIn.size != 0 && itemStackIn.getItem() != null) { if (itemStackIn.isItemDamaged()) { @@ -307,7 +307,7 @@ public class InventoryPlayer implements IInventory { this.mainInventory[j] = ItemStack.copyItemStack(itemStackIn); // this.mainInventory[j].animationsToGo = 5; - itemStackIn.stackSize = 0; + itemStackIn.size = 0; return true; } // else if (this.player.creative) @@ -326,10 +326,10 @@ public class InventoryPlayer implements IInventory while (true) { - i = itemStackIn.stackSize; - itemStackIn.stackSize = this.storePartialItemStack(itemStackIn); + i = itemStackIn.size; + itemStackIn.size = this.storePartialItemStack(itemStackIn); - if (itemStackIn.stackSize <= 0 || itemStackIn.stackSize >= i) + if (itemStackIn.size <= 0 || itemStackIn.size >= i) { break; } @@ -342,7 +342,7 @@ public class InventoryPlayer implements IInventory // } // else // { - return itemStackIn.stackSize < i; + return itemStackIn.size < i; // } } } @@ -367,7 +367,7 @@ public class InventoryPlayer implements IInventory if (aitemstack[index] != null) { - if (aitemstack[index].stackSize <= count) + if (aitemstack[index].size <= count) { ItemStack itemstack1 = aitemstack[index]; aitemstack[index] = null; @@ -377,7 +377,7 @@ public class InventoryPlayer implements IInventory { ItemStack itemstack = aitemstack[index].splitStack(count); - if (aitemstack[index].stackSize == 0) + if (aitemstack[index].size == 0) { aitemstack[index] = null; } @@ -458,7 +458,7 @@ public class InventoryPlayer implements IInventory { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.mainInventory[i].writeToNBT(nbttagcompound); + this.mainInventory[i].writeTags(nbttagcompound); nbtTagListIn.add(nbttagcompound); } } @@ -469,7 +469,7 @@ public class InventoryPlayer implements IInventory { TagObject nbttagcompound1 = new TagObject(); nbttagcompound1.setByte("Slot", (byte)(j + 100)); - this.armorInventory[j].writeToNBT(nbttagcompound1); + this.armorInventory[j].writeTags(nbttagcompound1); nbtTagListIn.add(nbttagcompound1); } } @@ -491,7 +491,7 @@ public class InventoryPlayer implements IInventory { TagObject nbttagcompound = nbtTagListIn.get(i); int j = nbttagcompound.getByte("Slot") & 255; - ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); + ItemStack itemstack = ItemStack.readFromTag(nbttagcompound); if (itemstack != null) { @@ -618,7 +618,7 @@ public class InventoryPlayer implements IInventory { this.armorInventory[i].damageItem(damage, this.player); - if (this.armorInventory[i].stackSize == 0) + if (this.armorInventory[i].size == 0) { this.armorInventory[i] = null; } diff --git a/common/src/main/java/common/inventory/InventoryWarpChest.java b/common/src/main/java/common/inventory/InventoryWarpChest.java index de188f1..6a4ff75 100755 --- a/common/src/main/java/common/inventory/InventoryWarpChest.java +++ b/common/src/main/java/common/inventory/InventoryWarpChest.java @@ -21,28 +21,28 @@ public class InventoryWarpChest extends InventoryBasic this.associatedChest = chestTileEntity; } - public void loadInventoryFromNBT(TagObjectList p_70486_1_) + public void readTags(TagObjectList list) { for (int i = 0; i < this.getSizeInventory(); ++i) { this.setInventorySlotContents(i, (ItemStack)null); } - for (int k = 0; k < p_70486_1_.size(); ++k) + for (int k = 0; k < list.size(); ++k) { - TagObject nbttagcompound = p_70486_1_.get(k); - int j = nbttagcompound.getByte("Slot") & 255; + TagObject tag = list.get(k); + int j = tag.getByte("Slot") & 255; if (j >= 0 && j < this.getSizeInventory()) { - this.setInventorySlotContents(j, ItemStack.loadItemStackFromNBT(nbttagcompound)); + this.setInventorySlotContents(j, ItemStack.readFromTag(tag)); } } } - public TagObjectList saveInventoryToNBT() + public TagObjectList writeTags() { - TagObjectList nbttaglist = new TagObjectList(); + TagObjectList list = new TagObjectList(); for (int i = 0; i < this.getSizeInventory(); ++i) { @@ -50,14 +50,14 @@ public class InventoryWarpChest extends InventoryBasic if (itemstack != null) { - TagObject nbttagcompound = new TagObject(); - nbttagcompound.setByte("Slot", (byte)i); - itemstack.writeToNBT(nbttagcompound); - nbttaglist.add(nbttagcompound); + TagObject tag = new TagObject(); + tag.setByte("Slot", (byte)i); + itemstack.writeTags(tag); + list.add(tag); } } - return nbttaglist; + return list; } public boolean isUseableByPlayer(EntityNPC player) diff --git a/common/src/main/java/common/inventory/Slot.java b/common/src/main/java/common/inventory/Slot.java index 9176b08..d386abc 100755 --- a/common/src/main/java/common/inventory/Slot.java +++ b/common/src/main/java/common/inventory/Slot.java @@ -37,7 +37,7 @@ public class Slot { if (p_75220_1_.getItem() == p_75220_2_.getItem()) { - int i = p_75220_2_.stackSize - p_75220_1_.stackSize; + int i = p_75220_2_.size - p_75220_1_.size; if (i > 0) { diff --git a/common/src/main/java/common/inventory/SlotCrafting.java b/common/src/main/java/common/inventory/SlotCrafting.java index a598f45..363b5e9 100755 --- a/common/src/main/java/common/inventory/SlotCrafting.java +++ b/common/src/main/java/common/inventory/SlotCrafting.java @@ -40,7 +40,7 @@ public class SlotCrafting extends Slot { if (this.getHasStack()) { - this.amountCrafted += Math.min(amount, this.getStack().stackSize); + this.amountCrafted += Math.min(amount, this.getStack().size); } return super.decrStackSize(amount); diff --git a/common/src/main/java/common/inventory/SlotFurnaceOutput.java b/common/src/main/java/common/inventory/SlotFurnaceOutput.java index 930318a..a1c81f6 100755 --- a/common/src/main/java/common/inventory/SlotFurnaceOutput.java +++ b/common/src/main/java/common/inventory/SlotFurnaceOutput.java @@ -35,7 +35,7 @@ public class SlotFurnaceOutput extends Slot { if (this.getHasStack()) { - this.smelted += Math.min(amount, this.getStack().stackSize); + this.smelted += Math.min(amount, this.getStack().size); } return super.decrStackSize(amount); diff --git a/common/src/main/java/common/inventory/SlotMerchantResult.java b/common/src/main/java/common/inventory/SlotMerchantResult.java index 11032f2..3fb685b 100755 --- a/common/src/main/java/common/inventory/SlotMerchantResult.java +++ b/common/src/main/java/common/inventory/SlotMerchantResult.java @@ -35,7 +35,7 @@ public class SlotMerchantResult extends Slot { if (this.getHasStack()) { - this.traded += Math.min(amount, this.getStack().stackSize); + this.traded += Math.min(amount, this.getStack().size); } return super.decrStackSize(amount); @@ -76,12 +76,12 @@ public class SlotMerchantResult extends Slot // this.theMerchant.useRecipe(merchantrecipe); // playerIn.triggerAchievement(StatRegistry.timesTradedWithNpcStat); - if (itemstack != null && itemstack.stackSize <= 0) + if (itemstack != null && itemstack.size <= 0) { itemstack = null; } - if (itemstack1 != null && itemstack1.stackSize <= 0) + if (itemstack1 != null && itemstack1.size <= 0) { itemstack1 = null; } @@ -101,14 +101,14 @@ public class SlotMerchantResult extends Slot { if (itemstack1 != null && secondItem != null && itemstack1.getItem() == secondItem.getItem()) { - firstItem.stackSize -= itemstack.stackSize; - secondItem.stackSize -= itemstack1.stackSize; + firstItem.size -= itemstack.size; + secondItem.size -= itemstack1.size; return true; } if (itemstack1 == null && secondItem == null) { - firstItem.stackSize -= itemstack.stackSize; + firstItem.size -= itemstack.size; return true; } } diff --git a/common/src/main/java/common/item/ItemArmor.java b/common/src/main/java/common/item/ItemArmor.java index 459fc17..e0f928f 100755 --- a/common/src/main/java/common/item/ItemArmor.java +++ b/common/src/main/java/common/item/ItemArmor.java @@ -50,7 +50,7 @@ public class ItemArmor extends Item int l = entitylivingbase.isPlayer() ? 1 : 0; int i1 = ItemArmor.getArmorPosition(stack); ItemStack itemstack = stack.copy(); - itemstack.stackSize = 1; + itemstack.size = 1; entitylivingbase.setItem(i1 - l, itemstack); // if (entitylivingbase instanceof EntityLiving) @@ -58,7 +58,7 @@ public class ItemArmor extends Item // ((EntityLiving)entitylivingbase).setDropChance(i1, 2.0F); // } - --stack.stackSize; + --stack.size; return stack; } else @@ -246,7 +246,7 @@ public class ItemArmor extends Item if (itemstack == null) { playerIn.setItem(i, itemStackIn.copy()); - itemStackIn.stackSize = 0; + itemStackIn.size = 0; } return itemStackIn; diff --git a/common/src/main/java/common/item/ItemBanner.java b/common/src/main/java/common/item/ItemBanner.java index 38e6ccc..1b5549e 100755 --- a/common/src/main/java/common/item/ItemBanner.java +++ b/common/src/main/java/common/item/ItemBanner.java @@ -70,7 +70,7 @@ public class ItemBanner extends ItemBlock worldIn.setState(pos, Blocks.wall_banner.getState().withProperty(BlockWallSign.FACING, side), 3); } - --stack.stackSize; + --stack.size; TileEntity tileentity = worldIn.getTileEntity(pos); if (tileentity instanceof TileEntityBanner) diff --git a/common/src/main/java/common/item/ItemBed.java b/common/src/main/java/common/item/ItemBed.java index 5baaa20..0f17218 100755 --- a/common/src/main/java/common/item/ItemBed.java +++ b/common/src/main/java/common/item/ItemBed.java @@ -68,7 +68,7 @@ public class ItemBed extends Item worldIn.setState(blockpos, iblockstate2, 3); } - --stack.stackSize; + --stack.size; return true; } else diff --git a/common/src/main/java/common/item/ItemBlock.java b/common/src/main/java/common/item/ItemBlock.java index 7c718b4..c63754f 100755 --- a/common/src/main/java/common/item/ItemBlock.java +++ b/common/src/main/java/common/item/ItemBlock.java @@ -62,7 +62,7 @@ public class ItemBlock extends Item pos = pos.offset(side); } - if (stack.stackSize == 0) + if (stack.size == 0) { return false; } @@ -86,7 +86,7 @@ public class ItemBlock extends Item } worldIn.playSound(this.block.sound.getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); - --stack.stackSize; + --stack.size; } return true; diff --git a/common/src/main/java/common/item/ItemBoat.java b/common/src/main/java/common/item/ItemBoat.java index d6810ba..2d78fcf 100755 --- a/common/src/main/java/common/item/ItemBoat.java +++ b/common/src/main/java/common/item/ItemBoat.java @@ -100,7 +100,7 @@ public class ItemBoat extends Item // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); diff --git a/common/src/main/java/common/item/ItemBook.java b/common/src/main/java/common/item/ItemBook.java index f1d7b20..16c714e 100755 --- a/common/src/main/java/common/item/ItemBook.java +++ b/common/src/main/java/common/item/ItemBook.java @@ -7,7 +7,7 @@ public class ItemBook extends Item */ public boolean isItemTool(ItemStack stack) { - return stack.stackSize == 1; + return stack.size == 1; } /** diff --git a/common/src/main/java/common/item/ItemBucket.java b/common/src/main/java/common/item/ItemBucket.java index a3aa306..43e2168 100755 --- a/common/src/main/java/common/item/ItemBucket.java +++ b/common/src/main/java/common/item/ItemBucket.java @@ -165,7 +165,7 @@ public class ItemBucket extends Item setRecursive((AWorldServer)worldIn, blockpos, 4, null); // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); // if(!playerIn.creative) - --itemStackIn.stackSize; + --itemStackIn.size; return itemStackIn; } } @@ -200,7 +200,7 @@ public class ItemBucket extends Item { // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); if(this.recursive) { - --itemStackIn.stackSize; + --itemStackIn.size; return itemStackIn; } return new ItemStack(Items.bucket); @@ -219,7 +219,7 @@ public class ItemBucket extends Item // return emptyBuckets; // } // else - if (--emptyBuckets.stackSize <= 0) + if (--emptyBuckets.size <= 0) { return fullBucket; } diff --git a/common/src/main/java/common/item/ItemBucketMilk.java b/common/src/main/java/common/item/ItemBucketMilk.java index 0da249b..849163b 100755 --- a/common/src/main/java/common/item/ItemBucketMilk.java +++ b/common/src/main/java/common/item/ItemBucketMilk.java @@ -27,7 +27,7 @@ public class ItemBucketMilk extends Item { // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } if (!worldIn.client) @@ -36,7 +36,7 @@ public class ItemBucketMilk extends Item } // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); - return stack.stackSize <= 0 ? new ItemStack(Items.bucket) : stack; + return stack.size <= 0 ? new ItemStack(Items.bucket) : stack; } /** diff --git a/common/src/main/java/common/item/ItemCarrotOnAStick.java b/common/src/main/java/common/item/ItemCarrotOnAStick.java index 18290c5..83d923c 100755 --- a/common/src/main/java/common/item/ItemCarrotOnAStick.java +++ b/common/src/main/java/common/item/ItemCarrotOnAStick.java @@ -46,7 +46,7 @@ public class ItemCarrotOnAStick extends Item entitypig.getAIControlledByPlayer().boostSpeed(); itemStackIn.damageItem(7, playerIn); - if (itemStackIn.stackSize == 0) + if (itemStackIn.size == 0) { ItemStack itemstack = new ItemStack(Items.fishing_rod); itemstack.setTagCompound(itemStackIn.getTagCompound()); diff --git a/common/src/main/java/common/item/ItemChargedOrb.java b/common/src/main/java/common/item/ItemChargedOrb.java index ba3a48e..0b29515 100755 --- a/common/src/main/java/common/item/ItemChargedOrb.java +++ b/common/src/main/java/common/item/ItemChargedOrb.java @@ -57,7 +57,7 @@ public class ItemChargedOrb extends ItemFragile { worldIn.setState(pos, iblockstate.withProperty(BlockPortalFrame.ORB, Boolean.valueOf(true)), 2); worldIn.updateComparatorOutputLevel(pos, Blocks.portal_frame); - --stack.stackSize; + --stack.size; for (int i = 0; i < 16; ++i) { diff --git a/common/src/main/java/common/item/ItemDie.java b/common/src/main/java/common/item/ItemDie.java index 4976c5b..1afefd9 100755 --- a/common/src/main/java/common/item/ItemDie.java +++ b/common/src/main/java/common/item/ItemDie.java @@ -29,7 +29,7 @@ public class ItemDie extends Item { // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); diff --git a/common/src/main/java/common/item/ItemDoor.java b/common/src/main/java/common/item/ItemDoor.java index 996c573..6a050be 100755 --- a/common/src/main/java/common/item/ItemDoor.java +++ b/common/src/main/java/common/item/ItemDoor.java @@ -55,7 +55,7 @@ public class ItemDoor extends Item else { placeDoor(worldIn, pos, Facing.fromAngle((double)playerIn.rotYaw), this.block, true); - --stack.stackSize; + --stack.size; return true; } } diff --git a/common/src/main/java/common/item/ItemDye.java b/common/src/main/java/common/item/ItemDye.java index eb745f7..9cc09ce 100755 --- a/common/src/main/java/common/item/ItemDye.java +++ b/common/src/main/java/common/item/ItemDye.java @@ -94,7 +94,7 @@ public class ItemDye extends Item // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } } @@ -127,7 +127,7 @@ public class ItemDye extends Item worldIn.setState(pos, iblockstate1, 2); } // if(!playerIn.creative) - --stack.stackSize; + --stack.size; return true; } } @@ -136,7 +136,7 @@ public class ItemDye extends Item if(te instanceof TileEntityBeacon) { ((TileEntityBeacon)te).setBeamColor(enumdyecolor); // if(!playerIn.creative) - --stack.stackSize; + --stack.size; } } @@ -161,7 +161,7 @@ public class ItemDye extends Item igrowable.grow((AWorldServer)worldIn, worldIn.rand, target, iblockstate); } - --stack.stackSize; + --stack.size; } return true; @@ -207,7 +207,7 @@ public class ItemDye extends Item if (!entitysheep.getSheared() && entitysheep.getFleeceColor() != enumdyecolor) { entitysheep.setFleeceColor(enumdyecolor); - --stack.stackSize; + --stack.size; } return true; diff --git a/common/src/main/java/common/item/ItemDynamite.java b/common/src/main/java/common/item/ItemDynamite.java index 073d23a..d343350 100755 --- a/common/src/main/java/common/item/ItemDynamite.java +++ b/common/src/main/java/common/item/ItemDynamite.java @@ -28,7 +28,7 @@ public class ItemDynamite extends Item { // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); diff --git a/common/src/main/java/common/item/ItemEgg.java b/common/src/main/java/common/item/ItemEgg.java index 2d9d77c..10a8f70 100755 --- a/common/src/main/java/common/item/ItemEgg.java +++ b/common/src/main/java/common/item/ItemEgg.java @@ -19,7 +19,7 @@ public class ItemEgg extends Item { // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); diff --git a/common/src/main/java/common/item/ItemExpBottle.java b/common/src/main/java/common/item/ItemExpBottle.java index 8c0ee7f..754f347 100755 --- a/common/src/main/java/common/item/ItemExpBottle.java +++ b/common/src/main/java/common/item/ItemExpBottle.java @@ -24,7 +24,7 @@ public class ItemExpBottle extends Item { // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); diff --git a/common/src/main/java/common/item/ItemFireball.java b/common/src/main/java/common/item/ItemFireball.java index 86d6e01..4cacb31 100755 --- a/common/src/main/java/common/item/ItemFireball.java +++ b/common/src/main/java/common/item/ItemFireball.java @@ -41,7 +41,7 @@ public class ItemFireball extends Item // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } return true; diff --git a/common/src/main/java/common/item/ItemFirework.java b/common/src/main/java/common/item/ItemFirework.java index 16502d3..3cd1f8b 100755 --- a/common/src/main/java/common/item/ItemFirework.java +++ b/common/src/main/java/common/item/ItemFirework.java @@ -25,7 +25,7 @@ public class ItemFirework extends Item // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } return true; diff --git a/common/src/main/java/common/item/ItemFood.java b/common/src/main/java/common/item/ItemFood.java index c7ee6bc..9052904 100755 --- a/common/src/main/java/common/item/ItemFood.java +++ b/common/src/main/java/common/item/ItemFood.java @@ -31,7 +31,7 @@ public class ItemFood extends Item public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityNPC playerIn) { // if(!playerIn.creative) - --stack.stackSize; + --stack.size; worldIn.playSoundAtEntity(playerIn, SoundEvent.EAT, 0.5F); playerIn.heal((int)((float)this.getHealAmount(stack) * 0.5f * (1.0f + worldIn.rand.floatv()))); this.onFoodEaten(stack, worldIn, playerIn); diff --git a/common/src/main/java/common/item/ItemGlassBottle.java b/common/src/main/java/common/item/ItemGlassBottle.java index 7f73248..d4b046a 100755 --- a/common/src/main/java/common/item/ItemGlassBottle.java +++ b/common/src/main/java/common/item/ItemGlassBottle.java @@ -45,10 +45,10 @@ public class ItemGlassBottle extends Item if (worldIn.getState(blockpos).getBlock().getMaterial() == Material.WATER) { - --itemStackIn.stackSize; + --itemStackIn.size; // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); - if (itemStackIn.stackSize <= 0) + if (itemStackIn.size <= 0) { return new ItemStack(Items.potion); } diff --git a/common/src/main/java/common/item/ItemLilyPad.java b/common/src/main/java/common/item/ItemLilyPad.java index c8ad9e4..efe834d 100755 --- a/common/src/main/java/common/item/ItemLilyPad.java +++ b/common/src/main/java/common/item/ItemLilyPad.java @@ -50,7 +50,7 @@ public class ItemLilyPad extends ItemColored // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); diff --git a/common/src/main/java/common/item/ItemMetal.java b/common/src/main/java/common/item/ItemMetal.java index 9962259..c4b3df6 100755 --- a/common/src/main/java/common/item/ItemMetal.java +++ b/common/src/main/java/common/item/ItemMetal.java @@ -44,7 +44,7 @@ public class ItemMetal extends Item { } public float getRadiation(ItemStack stack) { - return this.metal.radioactivity * 0.25f * (float)stack.stackSize; + return this.metal.radioactivity * 0.25f * (float)stack.size; } public boolean isMagnetic() { diff --git a/common/src/main/java/common/item/ItemMetalBlock.java b/common/src/main/java/common/item/ItemMetalBlock.java index c43e4f2..112005e 100755 --- a/common/src/main/java/common/item/ItemMetalBlock.java +++ b/common/src/main/java/common/item/ItemMetalBlock.java @@ -48,7 +48,7 @@ public class ItemMetalBlock extends ItemBlock { } public float getRadiation(ItemStack stack) { - return this.metal.radioactivity * (this.ore ? 0.5f : 2.0f) * (float)stack.stackSize; + return this.metal.radioactivity * (this.ore ? 0.5f : 2.0f) * (float)stack.size; } public boolean isMagnetic() { diff --git a/common/src/main/java/common/item/ItemMinecart.java b/common/src/main/java/common/item/ItemMinecart.java index 4146eb5..ccc8a41 100755 --- a/common/src/main/java/common/item/ItemMinecart.java +++ b/common/src/main/java/common/item/ItemMinecart.java @@ -129,7 +129,7 @@ public class ItemMinecart extends Item // ((EntityMinecartCommandBlock)entityminecart).getCommandBlockLogic().setEnabled(((EntityNPCMP)playerIn).canUse(Permissions.CMDBLOCK)); } - --stack.stackSize; + --stack.size; return true; } else diff --git a/common/src/main/java/common/item/ItemMonsterPlacer.java b/common/src/main/java/common/item/ItemMonsterPlacer.java index e98d610..0174fa6 100755 --- a/common/src/main/java/common/item/ItemMonsterPlacer.java +++ b/common/src/main/java/common/item/ItemMonsterPlacer.java @@ -96,7 +96,7 @@ public class ItemMonsterPlacer extends Item // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } return true; @@ -130,7 +130,7 @@ public class ItemMonsterPlacer extends Item // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } } // } @@ -192,7 +192,7 @@ public class ItemMonsterPlacer extends Item // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } // if(z == 0) diff --git a/common/src/main/java/common/item/ItemNameTag.java b/common/src/main/java/common/item/ItemNameTag.java index fd24634..109c2e0 100755 --- a/common/src/main/java/common/item/ItemNameTag.java +++ b/common/src/main/java/common/item/ItemNameTag.java @@ -24,7 +24,7 @@ public class ItemNameTag extends Item EntityLiving entityliving = (EntityLiving)target; entityliving.setCustomNameTag(stack.getDisplayName()); // entityliving.disableDespawn(); - --stack.stackSize; + --stack.size; return true; } else diff --git a/common/src/main/java/common/item/ItemNpcSpawner.java b/common/src/main/java/common/item/ItemNpcSpawner.java index c0f707e..a586fa8 100755 --- a/common/src/main/java/common/item/ItemNpcSpawner.java +++ b/common/src/main/java/common/item/ItemNpcSpawner.java @@ -92,7 +92,7 @@ public class ItemNpcSpawner extends Item // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } } // } @@ -146,7 +146,7 @@ public class ItemNpcSpawner extends Item // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } // if(z == 0) diff --git a/common/src/main/java/common/item/ItemPotion.java b/common/src/main/java/common/item/ItemPotion.java index a6ecbc8..e9c17ad 100755 --- a/common/src/main/java/common/item/ItemPotion.java +++ b/common/src/main/java/common/item/ItemPotion.java @@ -93,7 +93,7 @@ public class ItemPotion extends Item { // if (!playerIn.creative) // { - --stack.stackSize; + --stack.size; // } if (!worldIn.client) @@ -113,7 +113,7 @@ public class ItemPotion extends Item // if (!playerIn.creative) // { - if (stack.stackSize <= 0) + if (stack.size <= 0) { return new ItemStack(Items.glass_bottle); } @@ -149,7 +149,7 @@ public class ItemPotion extends Item { // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); diff --git a/common/src/main/java/common/item/ItemRedstone.java b/common/src/main/java/common/item/ItemRedstone.java index 0abb535..27a1662 100755 --- a/common/src/main/java/common/item/ItemRedstone.java +++ b/common/src/main/java/common/item/ItemRedstone.java @@ -42,7 +42,7 @@ public class ItemRedstone extends Item } else if (Blocks.redstone.canPlaceBlockAt(worldIn, blockpos)) { - --stack.stackSize; + --stack.size; worldIn.setState(blockpos, Blocks.redstone.getState()); return true; } diff --git a/common/src/main/java/common/item/ItemReed.java b/common/src/main/java/common/item/ItemReed.java index 91853cf..db37a32 100755 --- a/common/src/main/java/common/item/ItemReed.java +++ b/common/src/main/java/common/item/ItemReed.java @@ -45,7 +45,7 @@ public class ItemReed extends Item { return false; } - else if (stack.stackSize == 0) + else if (stack.size == 0) { return false; } @@ -66,7 +66,7 @@ public class ItemReed extends Item } worldIn.playSound(this.block.sound.getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); - --stack.stackSize; + --stack.size; return true; } } diff --git a/common/src/main/java/common/item/ItemSaddle.java b/common/src/main/java/common/item/ItemSaddle.java index 2ed413f..be30a91 100755 --- a/common/src/main/java/common/item/ItemSaddle.java +++ b/common/src/main/java/common/item/ItemSaddle.java @@ -25,7 +25,7 @@ public class ItemSaddle extends Item { entitypig.setSaddled(true); // entitypig.worldObj.playSoundAtEntity(entitypig, "mob.horse.leather", 0.5F, 1.0F); - --stack.stackSize; + --stack.size; } return true; diff --git a/common/src/main/java/common/item/ItemSeedFood.java b/common/src/main/java/common/item/ItemSeedFood.java index 09e565e..e7f7fb1 100755 --- a/common/src/main/java/common/item/ItemSeedFood.java +++ b/common/src/main/java/common/item/ItemSeedFood.java @@ -42,7 +42,7 @@ public class ItemSeedFood extends ItemFood else if (worldIn.getState(pos).getBlock() == this.soilId && worldIn.isAirBlock(pos.up())) { worldIn.setState(pos.up(), this.crops.getState()); - --stack.stackSize; + --stack.size; return true; } else diff --git a/common/src/main/java/common/item/ItemSeeds.java b/common/src/main/java/common/item/ItemSeeds.java index dc70608..6604c20 100755 --- a/common/src/main/java/common/item/ItemSeeds.java +++ b/common/src/main/java/common/item/ItemSeeds.java @@ -42,7 +42,7 @@ public class ItemSeeds extends Item else if (worldIn.getState(pos).getBlock() == this.soilBlockID && worldIn.isAirBlock(pos.up())) { worldIn.setState(pos.up(), this.crops.getState()); - --stack.stackSize; + --stack.size; return true; } else diff --git a/common/src/main/java/common/item/ItemSign.java b/common/src/main/java/common/item/ItemSign.java index b38240f..d96831a 100755 --- a/common/src/main/java/common/item/ItemSign.java +++ b/common/src/main/java/common/item/ItemSign.java @@ -65,7 +65,7 @@ public class ItemSign extends Item worldIn.setState(pos, Blocks.wall_sign.getState().withProperty(BlockWallSign.FACING, side), 3); } - --stack.stackSize; + --stack.size; TileEntity tileentity = worldIn.getTileEntity(pos); if (tileentity instanceof TileEntitySign && !ItemBlock.setTileEntityNBT(worldIn, playerIn, pos, stack)) diff --git a/common/src/main/java/common/item/ItemSkull.java b/common/src/main/java/common/item/ItemSkull.java index 1147790..e6315b8 100755 --- a/common/src/main/java/common/item/ItemSkull.java +++ b/common/src/main/java/common/item/ItemSkull.java @@ -105,7 +105,7 @@ public class ItemSkull extends Item // Blocks.skull.checkWitherSpawn(worldIn, pos, tileentityskull); } - --stack.stackSize; + --stack.size; } return true; diff --git a/common/src/main/java/common/item/ItemSlab.java b/common/src/main/java/common/item/ItemSlab.java index 919e9ba..e30370b 100755 --- a/common/src/main/java/common/item/ItemSlab.java +++ b/common/src/main/java/common/item/ItemSlab.java @@ -43,7 +43,7 @@ public class ItemSlab extends ItemBlock */ public boolean onItemUse(ItemStack stack, EntityNPC playerIn, World worldIn, BlockPos pos, Facing side, float hitX, float hitY, float hitZ) { - if (stack.stackSize == 0) + if (stack.size == 0) { return false; } @@ -69,7 +69,7 @@ public class ItemSlab extends ItemBlock if (worldIn.checkNoEntityCollision(this.slab.getCollisionBoundingBox(worldIn, pos, iblockstate1)) && worldIn.setState(pos, iblockstate1, 3)) { worldIn.playSound(this.slab.sound.getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); - --stack.stackSize; + --stack.size; } return true; @@ -143,7 +143,7 @@ public class ItemSlab extends ItemBlock if (worldIn.checkNoEntityCollision(this.slab.getCollisionBoundingBox(worldIn, pos, iblockstate1)) && worldIn.setState(pos, iblockstate1, 3)) { worldIn.playSound(this.slab.sound.getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); - --stack.stackSize; + --stack.size; } return true; @@ -173,7 +173,7 @@ public class ItemSlab extends ItemBlock if (worldIn.setState(pos, iblockstate1, 3)) { worldIn.playSound(this.slab.sound.getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); - --stack.stackSize; + --stack.size; } return true; diff --git a/common/src/main/java/common/item/ItemSnow.java b/common/src/main/java/common/item/ItemSnow.java index 30bd2fc..f19ba09 100755 --- a/common/src/main/java/common/item/ItemSnow.java +++ b/common/src/main/java/common/item/ItemSnow.java @@ -23,7 +23,7 @@ public class ItemSnow extends ItemBlock */ public boolean onItemUse(ItemStack stack, EntityNPC playerIn, World worldIn, BlockPos pos, Facing side, float hitX, float hitY, float hitZ) { - if (stack.stackSize == 0) + if (stack.size == 0) { return false; } @@ -56,7 +56,7 @@ public class ItemSnow extends ItemBlock if (axisalignedbb != null && worldIn.checkNoEntityCollision(axisalignedbb) && worldIn.setState(blockpos, iblockstate1, 2)) { worldIn.playSound(this.block.sound.getPlaceSound(), (double)((float)blockpos.getX() + 0.5F), (double)((float)blockpos.getY() + 0.5F), (double)((float)blockpos.getZ() + 0.5F), 1.0F); - --stack.stackSize; + --stack.size; return true; } } diff --git a/common/src/main/java/common/item/ItemSnowball.java b/common/src/main/java/common/item/ItemSnowball.java index f048210..08177e5 100755 --- a/common/src/main/java/common/item/ItemSnowball.java +++ b/common/src/main/java/common/item/ItemSnowball.java @@ -19,7 +19,7 @@ public class ItemSnowball extends Item { // if (!playerIn.creative) // { - --itemStackIn.stackSize; + --itemStackIn.size; // } worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); diff --git a/common/src/main/java/common/item/ItemStack.java b/common/src/main/java/common/item/ItemStack.java index c39839e..a97992f 100755 --- a/common/src/main/java/common/item/ItemStack.java +++ b/common/src/main/java/common/item/ItemStack.java @@ -34,66 +34,49 @@ public final class ItemStack public static final int MAX_SIZE = 67108864; public static final DecimalFormat DECIMALFORMAT = new DecimalFormat("#.###"); - /** Size of the stack. */ - public int stackSize; - - /** - * Number of animation frames to go when receiving an item (by walking into it, for example). - */ -// public int animationsToGo; + public int size; private Item item; + private TagObject tag; + private int meta; - /** - * A NBTTagMap containing data about an ItemStack. Can only be used for non stackable items - */ - private TagObject stackTagCompound; - private int itemDamage; - - /** Item frame this stack is on, or null if not on an item frame. */ -// private EntityFrame itemFrame; -// private Block canDestroyCacheBlock; -// private boolean canDestroyCacheResult; -// private Block canPlaceOnCacheBlock; -// private boolean canPlaceOnCacheResult; - - public ItemStack(Block blockIn) + public ItemStack(Block block) { - this((Block)blockIn, 1); + this(block, 1); } - public ItemStack(Block blockIn, int amount) + public ItemStack(Block block, int amount) { - this((Block)blockIn, amount, 0); + this(block, amount, 0); } - public ItemStack(Block blockIn, int amount, int meta) + public ItemStack(Block block, int amount, int meta) { - this(ItemRegistry.getItemFromBlock(blockIn), amount, meta); + this(ItemRegistry.getItemFromBlock(block), amount, meta); } - public ItemStack(Item itemIn) + public ItemStack(Item item) { - this((Item)itemIn, 1); + this(item, 1); } - public ItemStack(Item itemIn, int amount) + public ItemStack(Item item, int amount) { - this((Item)itemIn, amount, 0); + this(item, amount, 0); } - public ItemStack(Item itemIn, int amount, int meta) + public ItemStack(Item item, int amount, int meta) { // this.canDestroyCacheBlock = null; // this.canDestroyCacheResult = false; // this.canPlaceOnCacheBlock = null; // this.canPlaceOnCacheResult = false; - this.item = itemIn; - this.stackSize = amount; - this.itemDamage = meta; + this.item = item; + this.size = amount; + this.meta = meta; - if (this.itemDamage < 0) + if (this.meta < 0) { - this.itemDamage = 0; + this.meta = 0; } } @@ -114,10 +97,10 @@ public final class ItemStack return (amount / 1000000000) + "B+"; } - public static ItemStack loadItemStackFromNBT(TagObject nbt) + public static ItemStack readFromTag(TagObject tag) { ItemStack itemstack = new ItemStack(); - itemstack.readFromNBT(nbt); + itemstack.readTags(tag); return itemstack.getItem() != null ? itemstack : null; } @@ -134,14 +117,14 @@ public final class ItemStack */ public ItemStack splitStack(int amount) { - ItemStack itemstack = new ItemStack(this.item, amount, this.itemDamage); + ItemStack itemstack = new ItemStack(this.item, amount, this.meta); - if (this.stackTagCompound != null) + if (this.tag != null) { - itemstack.stackTagCompound = (TagObject)this.stackTagCompound.copy(); + itemstack.tag = (TagObject)this.tag.copy(); } - this.stackSize -= amount; + this.size -= amount; return itemstack; } @@ -192,52 +175,52 @@ public final class ItemStack } /** - * Write the stack fields to a NBT object. Return the new NBT object. + * Write the stack fields to a object. Return the new object. */ - public TagObject writeToNBT(TagObject nbt) + public TagObject writeTags(TagObject tag) { String resourcelocation = ItemRegistry.REGISTRY.getNameForObject(this.item); - nbt.setString("id", resourcelocation == null ? "air" : resourcelocation.toString()); - nbt.setInt("Count", this.stackSize); - nbt.setShort("Damage", (short)this.itemDamage); + tag.setString("id", resourcelocation == null ? "air" : resourcelocation.toString()); + tag.setInt("Count", this.size); + tag.setShort("Damage", (short)this.meta); - if (this.stackTagCompound != null) + if (this.tag != null) { - nbt.setObject("tag", this.stackTagCompound); + tag.setObject("tag", this.tag); } - return nbt; + return tag; } /** - * Read the stack fields from a NBT object. + * Read the stack fields from a object. */ - public void readFromNBT(TagObject nbt) + public void readTags(TagObject tag) { - if (nbt.hasString("id")) + if (tag.hasString("id")) { - this.item = ItemRegistry.getRegisteredItem(nbt.getString("id")); + this.item = ItemRegistry.getRegisteredItem(tag.getString("id")); } else { - this.item = ItemRegistry.getItemById(nbt.getShort("id")); + this.item = ItemRegistry.getItemById(tag.getShort("id")); } - this.stackSize = nbt.getInt("Count"); - this.itemDamage = nbt.getShort("Damage"); + this.size = tag.getInt("Count"); + this.meta = tag.getShort("Damage"); - if (this.itemDamage < 0) + if (this.meta < 0) { - this.itemDamage = 0; + this.meta = 0; } - if (nbt.hasObject("tag")) + if (tag.hasObject("tag")) { - this.stackTagCompound = nbt.getObject("tag"); + this.tag = tag.getObject("tag"); if (this.item != null) { - this.item.updateItemStackNBT(this.stackTagCompound); + this.item.updateItemStackNBT(this.tag); } } } @@ -270,7 +253,7 @@ public final class ItemStack // { // if(!breakable) { // if(this.stackTagCompound == null) { -// this.setTagCompound(new NBTTagCompound()); +// this.setTagCompound(new TagObject()); // } // this.stackTagCompound.setBoolean("Unbreakable", true); // this.setItemDamage(0); @@ -295,26 +278,26 @@ public final class ItemStack */ public boolean isItemDamaged() { - return this.isItemStackDamageable() && this.itemDamage > 0; + return this.isItemStackDamageable() && this.meta > 0; } public int getItemDamage() { - return this.itemDamage; + return this.meta; } public int getMetadata() { - return this.itemDamage; + return this.meta; } public void setItemDamage(int meta) { - this.itemDamage = meta; + this.meta = meta; - if (this.itemDamage < 0) + if (this.meta < 0) { - this.itemDamage = 0; + this.meta = 0; } } @@ -361,8 +344,8 @@ public final class ItemStack } } - this.itemDamage += amount; - return this.itemDamage > this.getMaxDamage(); + this.meta += amount; + return this.meta > this.getMaxDamage(); } } @@ -378,25 +361,25 @@ public final class ItemStack if (this.attemptDamageItem(amount, entityIn.getRNG())) { entityIn.renderBrokenItemStack(this); - --this.stackSize; + --this.size; if (entityIn.isPlayer()) { EntityNPC entityplayer = (EntityNPC)entityIn; // entityplayer.triggerAchievement(StatRegistry.objectBreakStats[ItemRegistry.getIdFromItem(this.item)]); - if (this.stackSize == 0 && this.getItem() instanceof ItemBow) + if (this.size == 0 && this.getItem() instanceof ItemBow) { entityplayer.destroyCurrentEquippedItem(); } } - if (this.stackSize < 0) + if (this.size < 0) { - this.stackSize = 0; + this.size = 0; } - this.itemDamage = 0; + this.meta = 0; } } // } @@ -446,11 +429,11 @@ public final class ItemStack */ public ItemStack copy() { - ItemStack itemstack = new ItemStack(this.item, this.stackSize, this.itemDamage); + ItemStack itemstack = new ItemStack(this.item, this.size, this.meta); - if (this.stackTagCompound != null) + if (this.tag != null) { - itemstack.stackTagCompound = (TagObject)this.stackTagCompound.copy(); + itemstack.tag = (TagObject)this.tag.copy(); } return itemstack; @@ -458,7 +441,7 @@ public final class ItemStack public static boolean areItemStackTagsEqual(ItemStack stackA, ItemStack stackB) { - return stackA == null && stackB == null ? true : (stackA != null && stackB != null ? (stackA.stackTagCompound == null && stackB.stackTagCompound != null ? false : stackA.stackTagCompound == null || stackA.stackTagCompound.equals(stackB.stackTagCompound)) : false); + return stackA == null && stackB == null ? true : (stackA != null && stackB != null ? (stackA.tag == null && stackB.tag != null ? false : stackA.tag == null || stackA.tag.equals(stackB.tag)) : false); } /** @@ -474,7 +457,7 @@ public final class ItemStack */ private boolean isItemStackEqual(ItemStack other) { - return this.stackSize != other.stackSize ? false : (this.item != other.item ? false : (this.itemDamage != other.itemDamage ? false : (this.stackTagCompound == null && other.stackTagCompound != null ? false : this.stackTagCompound == null || this.stackTagCompound.equals(other.stackTagCompound)))); + return this.size != other.size ? false : (this.item != other.item ? false : (this.meta != other.meta ? false : (this.tag == null && other.tag != null ? false : this.tag == null || this.tag.equals(other.tag)))); } /** @@ -491,7 +474,7 @@ public final class ItemStack */ public boolean isItemEqual(ItemStack other) { - return other != null && this.item == other.item && this.itemDamage == other.itemDamage; + return other != null && this.item == other.item && this.meta == other.meta; } // public String getUnlocalizedName() @@ -565,7 +548,7 @@ public final class ItemStack */ public boolean hasTagCompound() { - return this.stackTagCompound != null; + return this.tag != null; } /** @@ -573,7 +556,7 @@ public final class ItemStack */ public TagObject getTagCompound() { - return this.stackTagCompound; + return this.tag; } /** @@ -581,9 +564,9 @@ public final class ItemStack */ public TagObject getSubCompound(String key, boolean create) { - if (this.stackTagCompound != null && this.stackTagCompound.hasObject(key)) + if (this.tag != null && this.tag.hasObject(key)) { - return this.stackTagCompound.getObject(key); + return this.tag.getObject(key); } else if (create) { @@ -599,7 +582,7 @@ public final class ItemStack public TagObjectList getEnchantmentTagList() { - return this.stackTagCompound == null ? null : this.stackTagCompound.getObjectList("ench"); + return this.tag == null ? null : this.tag.getObjectList("ench"); } /** @@ -607,7 +590,7 @@ public final class ItemStack */ public void setTagCompound(TagObject nbt) { - this.stackTagCompound = nbt; + this.tag = nbt; } /** @@ -617,13 +600,13 @@ public final class ItemStack { String s = this.getItem().getDisplay(this); - if (this.stackTagCompound != null && this.stackTagCompound.hasString("Name")) + if (this.tag != null && this.tag.hasString("Name")) { // NBTTagCompound nbttagcompound = this.stackTagCompound.getCompoundTag("display"); // // if (nbttagcompound.hasString("Name")) // { - s = this.stackTagCompound.getString("Name"); + s = this.tag.getString("Name"); // } } @@ -640,9 +623,9 @@ public final class ItemStack public ItemStack setStackDisplayName(String displayName) { - if (this.stackTagCompound == null) + if (this.tag == null) { - this.stackTagCompound = new TagObject(); + this.tag = new TagObject(); } // if (!this.stackTagCompound.hasTag("display")) @@ -650,7 +633,7 @@ public final class ItemStack // this.stackTagCompound.setTag("display", new NBTTagCompound()); // } - this.stackTagCompound.setString("Name", displayName); + this.tag.setString("Name", displayName); return this; } @@ -725,14 +708,14 @@ public final class ItemStack */ public void clearCustomName() { - if (this.stackTagCompound != null) + if (this.tag != null) { - if (this.stackTagCompound.hasString("Name")) + if (this.tag.hasString("Name")) { // NBTTagCompound nbttagcompound = this.stackTagCompound.getCompoundTag("display"); - this.stackTagCompound.remove("Name"); + this.tag.remove("Name"); - if (this.stackTagCompound.isEmpty()) + if (this.tag.isEmpty()) { // this.stackTagCompound.removeTag("display"); // @@ -772,7 +755,7 @@ public final class ItemStack */ public boolean hasDisplayName() { - return this.stackTagCompound != null && this.stackTagCompound.hasString("Name"); + return this.tag != null && this.tag.hasString("Name"); } public List getTooltip(EntityNPC playerIn) @@ -785,8 +768,8 @@ public final class ItemStack // s = ChatFormat.ITALIC + s; // } - if(this.stackSize != 1) - s = TextColor.YELLOW + "" + this.stackSize + " " + TextColor.RESET + s; + if(this.size != 1) + s = TextColor.YELLOW + "" + this.size + " " + TextColor.RESET + s; s = s + TextColor.RESET; @@ -806,7 +789,7 @@ public final class ItemStack if (this.getHasSubtypes()) { - s1 = s1 + String.format("%d", this.itemDamage); + s1 = s1 + String.format("%d", this.meta); } // else // { @@ -917,12 +900,12 @@ public final class ItemStack num = amt * 100.0D; } - if(mod.isInventory() && this.stackSize != 1) { - double total = num * (double)this.stackSize; + if(mod.isInventory() && this.size != 1) { + double total = num * (double)this.size; if (amt > 0.0D) - list.add(TextColor.BLUE + String.format("+%s" + (mod.isMultiplied() ? "%%" : "") + " %s [%dx +%s" + (mod.isMultiplied() ? "%%" : "") + "]", DECIMALFORMAT.format(total), entry.getKey().getDisplayName(), this.stackSize, DECIMALFORMAT.format(num))); + list.add(TextColor.BLUE + String.format("+%s" + (mod.isMultiplied() ? "%%" : "") + " %s [%dx +%s" + (mod.isMultiplied() ? "%%" : "") + "]", DECIMALFORMAT.format(total), entry.getKey().getDisplayName(), this.size, DECIMALFORMAT.format(num))); else if (amt < 0.0D) - list.add(TextColor.RED + String.format("-%s" + (mod.isMultiplied() ? "%%" : "") + " %s [%dx -%s" + (mod.isMultiplied() ? "%%" : "") + "]", DECIMALFORMAT.format(total * -1.0), entry.getKey().getDisplayName(), this.stackSize, DECIMALFORMAT.format(num * -1.0))); + list.add(TextColor.RED + String.format("-%s" + (mod.isMultiplied() ? "%%" : "") + " %s [%dx -%s" + (mod.isMultiplied() ? "%%" : "") + "]", DECIMALFORMAT.format(total * -1.0), entry.getKey().getDisplayName(), this.size, DECIMALFORMAT.format(num * -1.0))); } else { if (amt > 0.0D) @@ -1031,17 +1014,17 @@ public final class ItemStack */ public void addEnchantment(Enchantment ench, int level) { - if (this.stackTagCompound == null) + if (this.tag == null) { this.setTagCompound(new TagObject()); } - if (!this.stackTagCompound.hasObjectList("ench")) + if (!this.tag.hasObjectList("ench")) { - this.stackTagCompound.setObjectList("ench", new TagObjectList()); + this.tag.setObjectList("ench", new TagObjectList()); } - TagObjectList nbttaglist = this.stackTagCompound.getObjectList("ench"); + TagObjectList nbttaglist = this.tag.getObjectList("ench"); TagObject nbttagcompound = new TagObject(); nbttagcompound.setShort("id", (short)ench.effectId); nbttagcompound.setShort("lvl", (short)(/* (byte) */ level)); @@ -1052,13 +1035,13 @@ public final class ItemStack * Removes an enchantment from the ItemStack. */ public boolean removeEnchantment(Enchantment ench) { - if(this.stackTagCompound == null) { + if(this.tag == null) { return false; } - if(!this.stackTagCompound.hasObjectList("ench")) { + if(!this.tag.hasObjectList("ench")) { return false; } - TagObjectList oldEnch = this.stackTagCompound.getObjectList("ench"); + TagObjectList oldEnch = this.tag.getObjectList("ench"); TagObjectList newEnch = new TagObjectList(); boolean changed = false; TagObject tag; @@ -1075,13 +1058,13 @@ public final class ItemStack return false; } if(newEnch.size() == 0) { - this.stackTagCompound.remove("ench"); - if(this.stackTagCompound.isEmpty()) { - this.stackTagCompound = null; + this.tag.remove("ench"); + if(this.tag.isEmpty()) { + this.tag = null; } } else { - this.stackTagCompound.setObjectList("ench", newEnch); + this.tag.setObjectList("ench", newEnch); } return true; } @@ -1090,15 +1073,15 @@ public final class ItemStack * Removes all enchantments from the ItemStack. */ public boolean clearEnchantments() { - if(this.stackTagCompound == null) { + if(this.tag == null) { return false; } - if(!this.stackTagCompound.hasObjectList("ench")) { + if(!this.tag.hasObjectList("ench")) { return false; } - this.stackTagCompound.remove("ench"); - if(this.stackTagCompound.isEmpty()) { - this.stackTagCompound = null; + this.tag.remove("ench"); + if(this.tag.isEmpty()) { + this.tag = null; } return true; } @@ -1108,17 +1091,17 @@ public final class ItemStack */ public boolean isItemEnchanted() { - return this.stackTagCompound != null && this.stackTagCompound.hasObjectList("ench"); + return this.tag != null && this.tag.hasObjectList("ench"); } public void setTagInfo(String key, Tag value) { - if (this.stackTagCompound == null) + if (this.tag == null) { this.setTagCompound(new TagObject()); } - this.stackTagCompound.set(key, value); + this.tag.set(key, value); } // public boolean canEditBlocks() @@ -1155,7 +1138,7 @@ public final class ItemStack */ public int getRepairCost() { - return this.hasTagCompound() && this.stackTagCompound.hasInt("RepairCost") ? this.stackTagCompound.getInt("RepairCost") : 0; + return this.hasTagCompound() && this.tag.hasInt("RepairCost") ? this.tag.getInt("RepairCost") : 0; } /** @@ -1164,25 +1147,25 @@ public final class ItemStack public void setRepairCost(int cost) { if(cost == 0) { - if(this.stackTagCompound == null) { + if(this.tag == null) { return; } - if(!this.stackTagCompound.hasInt("RepairCost")) { + if(!this.tag.hasInt("RepairCost")) { return; } - this.stackTagCompound.remove("RepairCost"); - if(this.stackTagCompound.isEmpty()) { - this.stackTagCompound = null; + this.tag.remove("RepairCost"); + if(this.tag.isEmpty()) { + this.tag = null; } return; } if (!this.hasTagCompound()) { - this.stackTagCompound = new TagObject(); + this.tag = new TagObject(); } - this.stackTagCompound.setInt("RepairCost", cost); + this.tag.setInt("RepairCost", cost); } public Map> getAttributeModifiers(int type) diff --git a/common/src/main/java/common/item/ItemWeatherToken.java b/common/src/main/java/common/item/ItemWeatherToken.java index ccb48e4..bff9568 100755 --- a/common/src/main/java/common/item/ItemWeatherToken.java +++ b/common/src/main/java/common/item/ItemWeatherToken.java @@ -20,7 +20,7 @@ public class ItemWeatherToken extends ItemMagnetic { { if(worldIn.dimension.getType().weather) { // if (!playerIn.creative) - --itemStackIn.stackSize; + --itemStackIn.size; worldIn.playSoundAtEntity(playerIn, SoundEvent.SPELL, 0.5F); if (!worldIn.client) { diff --git a/common/src/main/java/common/item/RngLoot.java b/common/src/main/java/common/item/RngLoot.java index 8c59985..b8c9c4e 100755 --- a/common/src/main/java/common/item/RngLoot.java +++ b/common/src/main/java/common/item/RngLoot.java @@ -34,7 +34,7 @@ public class RngLoot extends RngItem if(this.item == null) return null; ItemStack stack = this.item.copy(); - stack.stackSize = this.minStackSize + rand.zrange(this.maxStackSize - this.minStackSize + 1); + stack.size = this.minStackSize + rand.zrange(this.maxStackSize - this.minStackSize + 1); return stack; } @@ -48,7 +48,7 @@ public class RngLoot extends RngItem if (loot.item.getMaxStackSize() >= j) { ItemStack itemstack1 = loot.item.copy(); - itemstack1.stackSize = j; + itemstack1.size = j; inv.setInventorySlotContents(random.zrange(inv.getSizeInventory()), itemstack1); } else @@ -56,7 +56,7 @@ public class RngLoot extends RngItem for (int k = 0; k < j; ++k) { ItemStack itemstack = loot.item.copy(); - itemstack.stackSize = 1; + itemstack.size = 1; inv.setInventorySlotContents(random.zrange(inv.getSizeInventory()), itemstack); } } @@ -73,7 +73,7 @@ public class RngLoot extends RngItem if (loot.item.getMaxStackSize() >= j) { ItemStack itemstack1 = loot.item.copy(); - itemstack1.stackSize = j; + itemstack1.size = j; dispenser.setInventorySlotContents(random.zrange(dispenser.getSizeInventory()), itemstack1); } else @@ -81,7 +81,7 @@ public class RngLoot extends RngItem for (int k = 0; k < j; ++k) { ItemStack itemstack = loot.item.copy(); - itemstack.stackSize = 1; + itemstack.size = 1; dispenser.setInventorySlotContents(random.zrange(dispenser.getSizeInventory()), itemstack); } } diff --git a/common/src/main/java/common/network/IClientPlayer.java b/common/src/main/java/common/network/IClientPlayer.java index 05b4705..4c67e3d 100644 --- a/common/src/main/java/common/network/IClientPlayer.java +++ b/common/src/main/java/common/network/IClientPlayer.java @@ -140,7 +140,7 @@ public interface IClientPlayer { void handlePlayerAbilities(SPacketPlayerAbilities packet); void handleTabComplete(SPacketTabComplete packet); void handleSoundEffect(SPacketSoundEffect packet); - void handleEntityNBT(SPacketUpdateEntityTags packet); + void handleEntityTags(SPacketUpdateEntityTags packet); void handleParticles(SPacketParticles packet); void handleEntityProperties(SPacketEntityProperties packet); void handleSkin(SPacketSkin packet); diff --git a/common/src/main/java/common/network/PacketBuffer.java b/common/src/main/java/common/network/PacketBuffer.java index 78992c5..0fff7a6 100755 --- a/common/src/main/java/common/network/PacketBuffer.java +++ b/common/src/main/java/common/network/PacketBuffer.java @@ -120,7 +120,7 @@ public class PacketBuffer { return; } this.writeShort(ItemRegistry.getIdFromItem(stack.getItem())); - this.writeVarInt(stack.stackSize); + this.writeVarInt(stack.size); this.writeShort(stack.getMetadata()); this.writeTag(stack.getTagCompound()); } diff --git a/common/src/main/java/common/packet/CPacketCheat.java b/common/src/main/java/common/packet/CPacketCheat.java index 2ce9395..eb02559 100755 --- a/common/src/main/java/common/packet/CPacketCheat.java +++ b/common/src/main/java/common/packet/CPacketCheat.java @@ -20,7 +20,7 @@ public class CPacketCheat implements Packet { this.stack = stackIn.copy(); this.slot = slot; - this.stack.stackSize = full ? this.stack.getMaxStackSize() : 1; + this.stack.size = full ? this.stack.getMaxStackSize() : 1; } public void processPacket(IPlayer handler) diff --git a/common/src/main/java/common/packet/SPacketJoinGame.java b/common/src/main/java/common/packet/SPacketJoinGame.java index 2c77683..2d6606d 100755 --- a/common/src/main/java/common/packet/SPacketJoinGame.java +++ b/common/src/main/java/common/packet/SPacketJoinGame.java @@ -19,7 +19,7 @@ public class SPacketJoinGame implements Packet { public SPacketJoinGame(int entityIdIn, Dimension dimensionIn, int type, boolean editor) { this.entityId = entityIdIn; - this.dimension = dimensionIn.toNbt(false); + this.dimension = dimensionIn.toTags(false); this.type = type; this.editor = editor; } @@ -47,7 +47,7 @@ public class SPacketJoinGame implements Packet { } public Dimension getDimension() { - return Dimension.getByNbt(this.dimension, false); + return Dimension.getByTag(this.dimension, false); } public int getEntityType() { diff --git a/common/src/main/java/common/packet/SPacketRespawn.java b/common/src/main/java/common/packet/SPacketRespawn.java index 08f012a..fba7d5a 100755 --- a/common/src/main/java/common/packet/SPacketRespawn.java +++ b/common/src/main/java/common/packet/SPacketRespawn.java @@ -20,7 +20,7 @@ public class SPacketRespawn implements Packet public SPacketRespawn(Dimension dimensionIn, int type, boolean editor) { - this.dimension = dimensionIn.toNbt(false); + this.dimension = dimensionIn.toTags(false); this.type = type; this.editor = editor; } @@ -46,7 +46,7 @@ public class SPacketRespawn implements Packet public Dimension getDimension() { - return Dimension.getByNbt(this.dimension, false); + return Dimension.getByTag(this.dimension, false); } public int getEntityType() diff --git a/common/src/main/java/common/packet/SPacketUpdateEntityTags.java b/common/src/main/java/common/packet/SPacketUpdateEntityTags.java index ca6e025..0a3f15a 100755 --- a/common/src/main/java/common/packet/SPacketUpdateEntityTags.java +++ b/common/src/main/java/common/packet/SPacketUpdateEntityTags.java @@ -47,7 +47,7 @@ public class SPacketUpdateEntityTags implements Packet */ public void processPacket(IClientPlayer handler) { - handler.handleEntityNBT(this); + handler.handleEntityTags(this); } public TagObject getTagCompound() diff --git a/common/src/main/java/common/packet/SPacketUpdateTileEntity.java b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java index 154bb17..f1420cf 100755 --- a/common/src/main/java/common/packet/SPacketUpdateTileEntity.java +++ b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java @@ -14,7 +14,7 @@ public class SPacketUpdateTileEntity implements Packet { private BlockPos blockPos; private int type; - private TagObject nbt; + private TagObject tag; public SPacketUpdateTileEntity() { @@ -24,7 +24,7 @@ public class SPacketUpdateTileEntity implements Packet { this.blockPos = tile.getPos(); this.type = TileRegistry.CLASS_TO_ID.get(tile.getClass()); - tile.writeTags(this.nbt = new TagObject()); + tile.writeTags(this.tag = new TagObject()); } /** @@ -34,7 +34,7 @@ public class SPacketUpdateTileEntity implements Packet { this.blockPos = buf.readBlockPos(); this.type = buf.readUnsignedByte(); - this.nbt = buf.readTag(); + this.tag = buf.readTag(); } /** @@ -44,7 +44,7 @@ public class SPacketUpdateTileEntity implements Packet { buf.writeBlockPos(this.blockPos); buf.writeByte((byte)this.type); - buf.writeTag(this.nbt); + buf.writeTag(this.tag); } /** @@ -65,8 +65,8 @@ public class SPacketUpdateTileEntity implements Packet return this.type == TileRegistry.CLASS_TO_ID.get(tile.getClass()); } - public TagObject getNbtCompound() + public TagObject getTags() { - return this.nbt; + return this.tag; } } diff --git a/common/src/main/java/common/potion/PotionEffect.java b/common/src/main/java/common/potion/PotionEffect.java index 4cf0f76..8e55822 100755 --- a/common/src/main/java/common/potion/PotionEffect.java +++ b/common/src/main/java/common/potion/PotionEffect.java @@ -135,20 +135,20 @@ public class PotionEffect { && this.thrown == other.thrown && this.remaining == other.remaining && this.ambient == other.ambient; } - public TagObject toNbt() { - TagObject nbt = new TagObject(); - nbt.setString("Type", this.potion.getName()); - nbt.setByte("Amplifier", (byte)this.amplifier); - nbt.setInt("Duration", this.duration); - nbt.setInt("Remaining", this.remaining); - nbt.setBool("Ambient", this.ambient); - nbt.setBool("Particles", this.particles); - return nbt; + public TagObject toTags() { + TagObject tag = new TagObject(); + tag.setString("Type", this.potion.getName()); + tag.setByte("Amplifier", (byte)this.amplifier); + tag.setInt("Duration", this.duration); + tag.setInt("Remaining", this.remaining); + tag.setBool("Ambient", this.ambient); + tag.setBool("Particles", this.particles); + return tag; } - public static PotionEffect fromNbt(TagObject nbt) { - Potion potion = Potion.getByName(nbt.getString("Type")); - return potion == null ? null : new PotionEffect(potion, nbt.getInt("Duration"), (int)(nbt.getByte("Amplifier") & 255), nbt.getBool("Ambient"), nbt.getBool("Particles")) - .setRemaining(nbt.getInt("Remaining")); + public static PotionEffect fromTags(TagObject tag) { + Potion potion = Potion.getByName(tag.getString("Type")); + return potion == null ? null : new PotionEffect(potion, tag.getInt("Duration"), (int)(tag.getByte("Amplifier") & 255), tag.getBool("Ambient"), tag.getBool("Particles")) + .setRemaining(tag.getInt("Remaining")); } } diff --git a/common/src/main/java/common/tags/TagByte.java b/common/src/main/java/common/tags/TagByte.java index 500d7af..96b471e 100755 --- a/common/src/main/java/common/tags/TagByte.java +++ b/common/src/main/java/common/tags/TagByte.java @@ -47,8 +47,8 @@ class TagByte extends Tag { if (super.equals(other)) { - TagByte nbttagbyte = (TagByte)other; - return this.data == nbttagbyte.data; + TagByte tag = (TagByte)other; + return this.data == tag.data; } else { diff --git a/common/src/main/java/common/tags/TagDouble.java b/common/src/main/java/common/tags/TagDouble.java index 686811a..4c9152b 100755 --- a/common/src/main/java/common/tags/TagDouble.java +++ b/common/src/main/java/common/tags/TagDouble.java @@ -47,8 +47,8 @@ class TagDouble extends Tag { if (super.equals(other)) { - TagDouble nbttagdouble = (TagDouble)other; - return this.data == nbttagdouble.data; + TagDouble tag = (TagDouble)other; + return this.data == tag.data; } else { diff --git a/common/src/main/java/common/tags/TagFloat.java b/common/src/main/java/common/tags/TagFloat.java index 24a2cf0..97265f0 100755 --- a/common/src/main/java/common/tags/TagFloat.java +++ b/common/src/main/java/common/tags/TagFloat.java @@ -47,8 +47,8 @@ class TagFloat extends Tag { if (super.equals(other)) { - TagFloat nbttagfloat = (TagFloat)other; - return this.data == nbttagfloat.data; + TagFloat tag = (TagFloat)other; + return this.data == tag.data; } else { diff --git a/common/src/main/java/common/tags/TagInt.java b/common/src/main/java/common/tags/TagInt.java index b54cea8..c795914 100755 --- a/common/src/main/java/common/tags/TagInt.java +++ b/common/src/main/java/common/tags/TagInt.java @@ -47,8 +47,8 @@ class TagInt extends Tag { if (super.equals(other)) { - TagInt nbttagint = (TagInt)other; - return this.data == nbttagint.data; + TagInt tag = (TagInt)other; + return this.data == tag.data; } else { diff --git a/common/src/main/java/common/tags/TagInterpreter.java b/common/src/main/java/common/tags/TagInterpreter.java index e500243..d401d36 100755 --- a/common/src/main/java/common/tags/TagInterpreter.java +++ b/common/src/main/java/common/tags/TagInterpreter.java @@ -96,11 +96,6 @@ public class TagInterpreter } } -// static JsonToNBT.Any func_179272_a(String s1, String s2) throws NBTException -// { -// return func_150316_a(s1, s2); -// } - static TagInterpreter.Any func_150316_a(String p_150316_0_, String p_150316_1_) throws TagException { p_150316_1_ = p_150316_1_.trim(); @@ -108,17 +103,17 @@ public class TagInterpreter if (p_150316_1_.startsWith("{")) { p_150316_1_ = p_150316_1_.substring(1, p_150316_1_.length() - 1); - TagInterpreter.Compound jsontonbt$compound; + TagInterpreter.Compound tag; String s1; - for (jsontonbt$compound = new TagInterpreter.Compound(p_150316_0_); p_150316_1_.length() > 0; p_150316_1_ = p_150316_1_.substring(s1.length() + 1)) + for (tag = new TagInterpreter.Compound(p_150316_0_); p_150316_1_.length() > 0; p_150316_1_ = p_150316_1_.substring(s1.length() + 1)) { s1 = func_150314_a(p_150316_1_, true); if (s1.length() > 0) { boolean flag1 = false; - jsontonbt$compound.field_150491_b.add(func_179270_a(s1, flag1)); + tag.field_150491_b.add(func_179270_a(s1, flag1)); } if (p_150316_1_.length() < s1.length() + 1) @@ -134,22 +129,22 @@ public class TagInterpreter } } - return jsontonbt$compound; + return tag; } else if (p_150316_1_.startsWith("[") && !PATTERN.matcher(p_150316_1_).matches()) { p_150316_1_ = p_150316_1_.substring(1, p_150316_1_.length() - 1); - TagInterpreter.List jsontonbt$list; + TagInterpreter.List list; String s; - for (jsontonbt$list = new TagInterpreter.List(p_150316_0_); p_150316_1_.length() > 0; p_150316_1_ = p_150316_1_.substring(s.length() + 1)) + for (list = new TagInterpreter.List(p_150316_0_); p_150316_1_.length() > 0; p_150316_1_ = p_150316_1_.substring(s.length() + 1)) { s = func_150314_a(p_150316_1_, false); if (s.length() > 0) { boolean flag = true; - jsontonbt$list.field_150492_b.add(func_179270_a(s, flag)); + list.field_150492_b.add(func_179270_a(s, flag)); } if (p_150316_1_.length() < s.length() + 1) @@ -165,7 +160,7 @@ public class TagInterpreter } } - return jsontonbt$list; + return list; } else { @@ -397,14 +392,14 @@ public class TagInterpreter public Tag parse() throws TagException { - TagObject nbttagcompound = new TagObject(); + TagObject tag = new TagObject(); - for (TagInterpreter.Any jsontonbt$any : this.field_150491_b) + for (TagInterpreter.Any any : this.field_150491_b) { - nbttagcompound.set(jsontonbt$any.json, jsontonbt$any.parse()); + tag.set(any.json, any.parse()); } - return nbttagcompound; + return tag; } } @@ -419,31 +414,31 @@ public class TagInterpreter public Tag parse() throws TagException { - TagList nbttaglist = null; + TagList list = null; - for (TagInterpreter.Any jsontonbt$any : this.field_150492_b) + for (TagInterpreter.Any any : this.field_150492_b) { - Tag tag = jsontonbt$any.parse(); - if(nbttaglist == null) { + Tag tag = any.parse(); + if(list == null) { switch(tag.getId()) { case 8: - nbttaglist = new TagStringList(); + list = new TagStringList(); case 10: - nbttaglist = new TagObjectList(); + list = new TagObjectList(); case 5: - nbttaglist = new TagFloatList(); + list = new TagFloatList(); case 6: - nbttaglist = new TagDoubleList(); + list = new TagDoubleList(); case 11: - nbttaglist = new TagIntArrayList(); + list = new TagIntArrayList(); default: - throw new TagException("Type cannot be put in a list: " + jsontonbt$any.json); + throw new TagException("Type cannot be put in a list: " + any.json); } } - nbttaglist.addElem(tag); + list.addElem(tag); } - return nbttaglist; + return list; } } diff --git a/common/src/main/java/common/tags/TagLoader.java b/common/src/main/java/common/tags/TagLoader.java index d1ffdce..77b2a34 100755 --- a/common/src/main/java/common/tags/TagLoader.java +++ b/common/src/main/java/common/tags/TagLoader.java @@ -13,6 +13,10 @@ import java.io.IOException; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +/** + * compressed data tree / CDT loader + * (ids 0..15) + */ public class TagLoader { public static TagObject readGZip(File file) throws IOException { DataInputStream in = new DataInputStream(new BufferedInputStream(new GZIPInputStream(new FileInputStream(file)))); diff --git a/common/src/main/java/common/tags/TagLong.java b/common/src/main/java/common/tags/TagLong.java index 7713faa..c3979da 100755 --- a/common/src/main/java/common/tags/TagLong.java +++ b/common/src/main/java/common/tags/TagLong.java @@ -47,8 +47,8 @@ class TagLong extends Tag { if (super.equals(other)) { - TagLong nbttaglong = (TagLong)other; - return this.data == nbttaglong.data; + TagLong tag = (TagLong)other; + return this.data == tag.data; } else { diff --git a/common/src/main/java/common/tags/TagObject.java b/common/src/main/java/common/tags/TagObject.java index b5d4ca8..129f9c7 100755 --- a/common/src/main/java/common/tags/TagObject.java +++ b/common/src/main/java/common/tags/TagObject.java @@ -289,7 +289,7 @@ public class TagObject extends Tag { } /** - * Merges this NBTTagCompound with the given compound. Any sub-compounds are + * Merges this tag with the given compound. Any sub-compounds are * merged using the same methods, other types of tags are overwritten from the * given compound. */ diff --git a/common/src/main/java/common/tags/TagShort.java b/common/src/main/java/common/tags/TagShort.java index 4e14207..26df0df 100755 --- a/common/src/main/java/common/tags/TagShort.java +++ b/common/src/main/java/common/tags/TagShort.java @@ -47,8 +47,8 @@ class TagShort extends Tag { if (super.equals(other)) { - TagShort nbttagshort = (TagShort)other; - return this.data == nbttagshort.data; + TagShort tag = (TagShort)other; + return this.data == tag.data; } else { diff --git a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java index dec25d0..97b3587 100755 --- a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java @@ -129,7 +129,7 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka private boolean canBrew() { - if (this.brewingItemStacks[3] != null && this.brewingItemStacks[3].stackSize > 0) + if (this.brewingItemStacks[3] != null && this.brewingItemStacks[3].size > 0) { ItemStack itemstack = this.brewingItemStacks[3]; @@ -209,9 +209,9 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka } else { - --this.brewingItemStacks[3].stackSize; + --this.brewingItemStacks[3].size; - if (this.brewingItemStacks[3].stackSize <= 0) + if (this.brewingItemStacks[3].size <= 0) { this.brewingItemStacks[3] = null; } @@ -240,7 +240,7 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka if (j >= 0 && j < this.brewingItemStacks.length) { - this.brewingItemStacks[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.brewingItemStacks[j] = ItemStack.readFromTag(nbttagcompound); } } @@ -264,7 +264,7 @@ public class TileEntityBrewingStand extends TileEntityLockable implements ITicka { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.brewingItemStacks[i].writeToNBT(nbttagcompound); + this.brewingItemStacks[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } diff --git a/common/src/main/java/common/tileentity/TileEntityChest.java b/common/src/main/java/common/tileentity/TileEntityChest.java index 6827f00..e999c68 100755 --- a/common/src/main/java/common/tileentity/TileEntityChest.java +++ b/common/src/main/java/common/tileentity/TileEntityChest.java @@ -82,7 +82,7 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II { if (this.chestContents[index] != null) { - if (this.chestContents[index].stackSize <= count) + if (this.chestContents[index].size <= count) { ItemStack itemstack1 = this.chestContents[index]; this.chestContents[index] = null; @@ -93,7 +93,7 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II { ItemStack itemstack = this.chestContents[index].splitStack(count); - if (this.chestContents[index].stackSize == 0) + if (this.chestContents[index].size == 0) { this.chestContents[index] = null; } @@ -132,9 +132,9 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II { this.chestContents[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } this.markDirty(); @@ -179,7 +179,7 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II if (j >= 0 && j < this.chestContents.length) { - this.chestContents[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.chestContents[j] = ItemStack.readFromTag(nbttagcompound); } } } @@ -195,7 +195,7 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.chestContents[i].writeToNBT(nbttagcompound); + this.chestContents[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } diff --git a/common/src/main/java/common/tileentity/TileEntityDispenser.java b/common/src/main/java/common/tileentity/TileEntityDispenser.java index 60ca358..fc13f2f 100755 --- a/common/src/main/java/common/tileentity/TileEntityDispenser.java +++ b/common/src/main/java/common/tileentity/TileEntityDispenser.java @@ -39,7 +39,7 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor { if (this.stacks[index] != null) { - if (this.stacks[index].stackSize <= count) + if (this.stacks[index].size <= count) { ItemStack itemstack1 = this.stacks[index]; this.stacks[index] = null; @@ -50,7 +50,7 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor { ItemStack itemstack = this.stacks[index].splitStack(count); - if (this.stacks[index].stackSize == 0) + if (this.stacks[index].size == 0) { this.stacks[index] = null; } @@ -105,9 +105,9 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor { this.stacks[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } this.markDirty(); @@ -165,7 +165,7 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor if (j >= 0 && j < this.stacks.length) { - this.stacks[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.stacks[j] = ItemStack.readFromTag(nbttagcompound); } } @@ -186,7 +186,7 @@ public class TileEntityDispenser extends TileEntityLockable implements IInventor { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.stacks[i].writeToNBT(nbttagcompound); + this.stacks[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } diff --git a/common/src/main/java/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java index 9812b19..4b39b12 100755 --- a/common/src/main/java/common/tileentity/TileEntityFurnace.java +++ b/common/src/main/java/common/tileentity/TileEntityFurnace.java @@ -73,7 +73,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, { if (this.furnaceItemStacks[index] != null) { - if (this.furnaceItemStacks[index].stackSize <= count) + if (this.furnaceItemStacks[index].size <= count) { ItemStack itemstack1 = this.furnaceItemStacks[index]; this.furnaceItemStacks[index] = null; @@ -83,7 +83,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, { ItemStack itemstack = this.furnaceItemStacks[index].splitStack(count); - if (this.furnaceItemStacks[index].stackSize == 0) + if (this.furnaceItemStacks[index].size == 0) { this.furnaceItemStacks[index] = null; } @@ -122,9 +122,9 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, boolean flag = stack != null && stack.isItemEqual(this.furnaceItemStacks[index]) && ItemStack.areItemStackTagsEqual(stack, this.furnaceItemStacks[index]); this.furnaceItemStacks[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } if (index == 0 && !flag) @@ -169,7 +169,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, if (j >= 0 && j < this.furnaceItemStacks.length) { - this.furnaceItemStacks[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.furnaceItemStacks[j] = ItemStack.readFromTag(nbttagcompound); } } @@ -198,7 +198,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.furnaceItemStacks[i].writeToNBT(nbttagcompound); + this.furnaceItemStacks[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } @@ -259,9 +259,9 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, if (this.furnaceItemStacks[1] != null) { - --this.furnaceItemStacks[1].stackSize; + --this.furnaceItemStacks[1].size; - if (this.furnaceItemStacks[1].stackSize == 0) + if (this.furnaceItemStacks[1].size == 0) { Item item = this.furnaceItemStacks[1].getItem().getContainerItem(); this.furnaceItemStacks[1] = item != null ? new ItemStack(item) : null; @@ -322,7 +322,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, else { ItemStack itemstack = SmeltingRegistry.getResult(this.furnaceItemStacks[0]); - return itemstack == null ? false : (this.furnaceItemStacks[2] == null ? true : (!this.furnaceItemStacks[2].isItemEqual(itemstack) ? false : (this.furnaceItemStacks[2].stackSize < this.getInventoryStackLimit() && this.furnaceItemStacks[2].stackSize < this.furnaceItemStacks[2].getMaxStackSize() ? true : this.furnaceItemStacks[2].stackSize < itemstack.getMaxStackSize()))); + return itemstack == null ? false : (this.furnaceItemStacks[2] == null ? true : (!this.furnaceItemStacks[2].isItemEqual(itemstack) ? false : (this.furnaceItemStacks[2].size < this.getInventoryStackLimit() && this.furnaceItemStacks[2].size < this.furnaceItemStacks[2].getMaxStackSize() ? true : this.furnaceItemStacks[2].size < itemstack.getMaxStackSize()))); } } @@ -341,7 +341,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, } else if (this.furnaceItemStacks[2].getItem() == itemstack.getItem()) { - ++this.furnaceItemStacks[2].stackSize; + ++this.furnaceItemStacks[2].size; } // if (this.furnaceItemStacks[0].getItem() == ItemRegistry.getItemFromBlock(Blocks.sponge) && this.furnaceItemStacks[0].getMetadata() == 1 && this.furnaceItemStacks[1] != null && this.furnaceItemStacks[1].getItem() == Items.bucket) @@ -349,9 +349,9 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, // this.furnaceItemStacks[1] = new ItemStack(Items.water_bucket); // } - --this.furnaceItemStacks[0].stackSize; + --this.furnaceItemStacks[0].size; - if (this.furnaceItemStacks[0].stackSize <= 0) + if (this.furnaceItemStacks[0].size <= 0) { this.furnaceItemStacks[0] = null; } diff --git a/common/src/main/java/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java index a04cc56..7e9a5d3 100755 --- a/common/src/main/java/common/tileentity/TileEntityHopper.java +++ b/common/src/main/java/common/tileentity/TileEntityHopper.java @@ -50,7 +50,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi if (j >= 0 && j < this.inventory.length) { - this.inventory[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.inventory[j] = ItemStack.readFromTag(nbttagcompound); } } } @@ -66,7 +66,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.inventory[i].writeToNBT(nbttagcompound); + this.inventory[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } @@ -112,7 +112,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { if (this.inventory[index] != null) { - if (this.inventory[index].stackSize <= count) + if (this.inventory[index].size <= count) { ItemStack itemstack1 = this.inventory[index]; this.inventory[index] = null; @@ -122,7 +122,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { ItemStack itemstack = this.inventory[index].splitStack(count); - if (this.inventory[index].stackSize == 0) + if (this.inventory[index].size == 0) { this.inventory[index] = null; } @@ -160,9 +160,9 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { this.inventory[index] = stack; - if (stack != null && stack.stackSize > this.getInventoryStackLimit()) + if (stack != null && stack.size > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + stack.size = this.getInventoryStackLimit(); } } @@ -287,7 +287,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { for (ItemStack itemstack : this.inventory) { - if (itemstack == null || itemstack.stackSize != itemstack.getMaxStackSize()) + if (itemstack == null || itemstack.size != itemstack.getMaxStackSize()) { return false; } @@ -321,7 +321,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi ItemStack itemstack = this.getStackInSlot(i).copy(); ItemStack itemstack1 = putStackInInventoryAllSlots(iinventory, this.decrStackSize(i, 1), enumfacing); - if (itemstack1 == null || itemstack1.stackSize == 0) + if (itemstack1 == null || itemstack1.size == 0) { iinventory.markDirty(); return true; @@ -350,7 +350,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { ItemStack itemstack1 = isidedinventory.getStackInSlot(aint[k]); - if (itemstack1 == null || itemstack1.stackSize != itemstack1.getMaxStackSize()) + if (itemstack1 == null || itemstack1.size != itemstack1.getMaxStackSize()) { return false; } @@ -364,7 +364,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { ItemStack itemstack = inventoryIn.getStackInSlot(j); - if (itemstack == null || itemstack.stackSize != itemstack.getMaxStackSize()) + if (itemstack == null || itemstack.size != itemstack.getMaxStackSize()) { return false; } @@ -474,7 +474,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi ItemStack itemstack1 = itemstack.copy(); ItemStack itemstack2 = putStackInInventoryAllSlots(hopper, inventoryIn.decrStackSize(index, 1), (Facing)null); - if (itemstack2 == null || itemstack2.stackSize == 0) + if (itemstack2 == null || itemstack2.size == 0) { inventoryIn.markDirty(); return true; @@ -503,7 +503,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi ItemStack itemstack = itemIn.getEntityItem().copy(); ItemStack itemstack1 = putStackInInventoryAllSlots(p_145898_0_, itemstack, (Facing)null); - if (itemstack1 != null && itemstack1.stackSize != 0) + if (itemstack1 != null && itemstack1.size != 0) { itemIn.setEntityItemStack(itemstack1); } @@ -527,7 +527,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi ISidedInventory isidedinventory = (ISidedInventory)inventoryIn; int[] aint = isidedinventory.getSlotsForFace(side); - for (int k = 0; k < aint.length && stack != null && stack.stackSize > 0; ++k) + for (int k = 0; k < aint.length && stack != null && stack.size > 0; ++k) { stack = insertStack(inventoryIn, stack, aint[k], side); } @@ -536,13 +536,13 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi { int i = inventoryIn.getSizeInventory(); - for (int j = 0; j < i && stack != null && stack.stackSize > 0; ++j) + for (int j = 0; j < i && stack != null && stack.size > 0; ++j) { stack = insertStack(inventoryIn, stack, j, side); } } - if (stack != null && stack.stackSize == 0) + if (stack != null && stack.size == 0) { stack = null; } @@ -585,10 +585,10 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi } else if (canCombine(itemstack, stack)) { - int i = stack.getMaxStackSize() - itemstack.stackSize; - int j = Math.min(stack.stackSize, i); - stack.stackSize -= j; - itemstack.stackSize += j; + int i = stack.getMaxStackSize() - itemstack.size; + int j = Math.min(stack.size, i); + stack.size -= j; + itemstack.size += j; flag = j > 0; } @@ -685,7 +685,7 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi public static boolean canCombine(ItemStack stack1, ItemStack stack2) { - return stack1.getItem() != stack2.getItem() ? false : (stack1.getMetadata() != stack2.getMetadata() ? false : (stack1.stackSize > stack1.getMaxStackSize() ? false : ItemStack.areItemStackTagsEqual(stack1, stack2))); + return stack1.getItem() != stack2.getItem() ? false : (stack1.getMetadata() != stack2.getMetadata() ? false : (stack1.size > stack1.getMaxStackSize() ? false : ItemStack.areItemStackTagsEqual(stack1, stack2))); } /** diff --git a/common/src/main/java/common/tileentity/TileEntityMachine.java b/common/src/main/java/common/tileentity/TileEntityMachine.java index 033ebe8..2f90139 100755 --- a/common/src/main/java/common/tileentity/TileEntityMachine.java +++ b/common/src/main/java/common/tileentity/TileEntityMachine.java @@ -89,7 +89,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH int j = nbttagcompound.getByte("Slot"); if(j >= 0 && j < this.inventory.length) { - this.inventory[j] = ItemStack.loadItemStackFromNBT(nbttagcompound); + this.inventory[j] = ItemStack.readFromTag(nbttagcompound); } } @@ -114,7 +114,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH if(this.inventory[i] != null) { TagObject nbttagcompound = new TagObject(); nbttagcompound.setByte("Slot", (byte)i); - this.inventory[i].writeToNBT(nbttagcompound); + this.inventory[i].writeTags(nbttagcompound); nbttaglist.add(nbttagcompound); } } @@ -148,7 +148,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH public ItemStack decrStackSize(int index, int count) { if(this.inventory[index] != null) { - if(this.inventory[index].stackSize <= count) { + if(this.inventory[index].size <= count) { ItemStack itemstack1 = this.inventory[index]; this.inventory[index] = null; return itemstack1; @@ -156,7 +156,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH else { ItemStack itemstack = this.inventory[index].splitStack(count); - if(this.inventory[index].stackSize == 0) { + if(this.inventory[index].size == 0) { this.inventory[index] = null; } @@ -182,8 +182,8 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH public void setInventorySlotContents(int index, ItemStack stack) { this.inventory[index] = stack; - if(stack != null && stack.stackSize > this.getInventoryStackLimit()) { - stack.stackSize = this.getInventoryStackLimit(); + if(stack != null && stack.size > this.getInventoryStackLimit()) { + stack.size = this.getInventoryStackLimit(); } } @@ -264,7 +264,7 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH return true; } else { - return this.inventory[slot] == null || this.inventory[slot].stackSize <= 0; + return this.inventory[slot] == null || this.inventory[slot].size <= 0; } } @@ -272,19 +272,19 @@ public abstract class TileEntityMachine extends TileEntityLockable implements IH if(slot == -1) { int n = 0; for(ItemStack itemstack : this.inventory) { - if(itemstack != null && itemstack.stackSize >= 1) - n += itemstack.stackSize; + if(itemstack != null && itemstack.size >= 1) + n += itemstack.size; } return n >= amount; } else { - return this.inventory[slot] != null && this.inventory[slot].stackSize >= amount; + return this.inventory[slot] != null && this.inventory[slot].size >= amount; } } public boolean isFull() { for(ItemStack itemstack : this.inventory) { - if(itemstack == null || itemstack.stackSize != itemstack.getMaxStackSize()) { + if(itemstack == null || itemstack.size != itemstack.getMaxStackSize()) { return false; } } diff --git a/common/src/main/java/common/village/MerchantRecipe.java b/common/src/main/java/common/village/MerchantRecipe.java index bbecb1e..f94e631 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.getObject("buy")); - this.selling = ItemStack.loadItemStackFromNBT(tag.getObject("sell")); - this.buySecond = tag.hasObject("buyB") ? ItemStack.loadItemStackFromNBT(tag.getObject("buyB")) : null; + this.buying = ItemStack.readFromTag(tag.getObject("buy")); + this.selling = ItemStack.readFromTag(tag.getObject("sell")); + this.buySecond = tag.hasObject("buyB") ? ItemStack.readFromTag(tag.getObject("buyB")) : null; } public MerchantRecipe(ItemStack buy1, ItemStack buy2, ItemStack sell) { @@ -45,12 +45,12 @@ public class MerchantRecipe { return this.selling; } - public TagObject toNbt() { + public TagObject toTags() { TagObject tag = new TagObject(); - tag.setObject("buy", this.buying.writeToNBT(new TagObject())); - tag.setObject("sell", this.selling.writeToNBT(new TagObject())); + tag.setObject("buy", this.buying.writeTags(new TagObject())); + tag.setObject("sell", this.selling.writeTags(new TagObject())); if(this.buySecond != null) - tag.setObject("buyB", this.buySecond.writeToNBT(new TagObject())); + tag.setObject("buyB", this.buySecond.writeTags(new TagObject())); return tag; } } diff --git a/common/src/main/java/common/village/MerchantRecipeList.java b/common/src/main/java/common/village/MerchantRecipeList.java index c1c0971..bb1958a 100755 --- a/common/src/main/java/common/village/MerchantRecipeList.java +++ b/common/src/main/java/common/village/MerchantRecipeList.java @@ -14,16 +14,16 @@ public class MerchantRecipeList extends ArrayList { return !areItemsSimilar(stack1, recipe.getBuying()) || (stack2 != null || recipe.hasSecondBuy()) && (!recipe.hasSecondBuy() || !areItemsSimilar(stack2, recipe.getSecondBuy())) - || stack1.stackSize < recipe.getBuying().stackSize - || recipe.hasSecondBuy() && stack2.stackSize < recipe.getSecondBuy().stackSize ? null : recipe; + || stack1.size < recipe.getBuying().size + || recipe.hasSecondBuy() && stack2.size < recipe.getSecondBuy().size ? null : recipe; } else { for(int z = 0; z < this.size(); z++) { MerchantRecipe recipe = this.get(z); - if(areItemsSimilar(stack1, recipe.getBuying()) && stack1.stackSize >= recipe.getBuying().stackSize + if(areItemsSimilar(stack1, recipe.getBuying()) && stack1.size >= recipe.getBuying().size && (!recipe.hasSecondBuy() && stack2 == null || recipe.hasSecondBuy() && areItemsSimilar(stack2, recipe.getSecondBuy()) - && stack2.stackSize >= recipe.getSecondBuy().stackSize)) { + && stack2.size >= recipe.getSecondBuy().size)) { return recipe; } } @@ -54,17 +54,17 @@ public class MerchantRecipeList extends ArrayList { return tag1.equals(tag2); } - public void fromNbt(TagObjectList list) { + public void fromTags(TagObjectList list) { this.clear(); for(int z = 0; z < list.size(); z++) { this.add(new MerchantRecipe(list.get(z))); } } - public TagObjectList toNbt() { + public TagObjectList toTags() { TagObjectList list = new TagObjectList(); for(int z = 0; z < this.size(); z++) { - list.add(this.get(z).toNbt()); + list.add(this.get(z).toTags()); } return list; } diff --git a/common/src/main/java/common/village/Village.java b/common/src/main/java/common/village/Village.java index 4060def..bf9dee7 100755 --- a/common/src/main/java/common/village/Village.java +++ b/common/src/main/java/common/village/Village.java @@ -209,52 +209,44 @@ public class Village } } - public void readVillageDataFromNBT(TagObject compound) + public void readTags(TagObject tag) { -// this.numVillagers = compound.getInteger("PopSize"); - this.radius = compound.getInt("Radius"); -// this.lastDoor = compound.getInteger("Stable"); -// this.tickCounter = compound.getInteger("Tick"); -// 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.getObjectList("Doors"); + this.radius = tag.getInt("Radius"); + this.center = new BlockPos(tag.getInt("CX"), tag.getInt("CY"), tag.getInt("CZ")); + this.doorRange = new BlockPos(tag.getInt("ACX"), tag.getInt("ACY"), tag.getInt("ACZ")); + TagObjectList doors = tag.getObjectList("Doors"); - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < doors.size(); ++i) { - TagObject 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); + TagObject door = doors.get(i); + VillageDoorInfo info = new VillageDoorInfo(new BlockPos(door.getInt("X"), door.getInt("Y"), door.getInt("Z")), door.getInt("IDX"), door.getInt("IDZ"), door.getInt("TS")); + this.doors.add(info); } } - public void writeVillageDataToNBT(TagObject compound) + public void writeTags(TagObject tag) { -// compound.setInteger("PopSize", this.numVillagers); - compound.setInt("Radius", this.radius); -// compound.setInteger("Stable", this.lastDoor); -// compound.setInteger("Tick", this.tickCounter); -// compound.setInteger("MTick", this.noBreedTicks); - compound.setInt("CX", this.center.getX()); - compound.setInt("CY", this.center.getY()); - compound.setInt("CZ", this.center.getZ()); - compound.setInt("ACX", this.doorRange.getX()); - compound.setInt("ACY", this.doorRange.getY()); - compound.setInt("ACZ", this.doorRange.getZ()); - TagObjectList nbttaglist = new TagObjectList(); + tag.setInt("Radius", this.radius); + tag.setInt("CX", this.center.getX()); + tag.setInt("CY", this.center.getY()); + tag.setInt("CZ", this.center.getZ()); + tag.setInt("ACX", this.doorRange.getX()); + tag.setInt("ACY", this.doorRange.getY()); + tag.setInt("ACZ", this.doorRange.getZ()); + TagObjectList doors = new TagObjectList(); - for (VillageDoorInfo villagedoorinfo : this.doors) + for (VillageDoorInfo info : this.doors) { - TagObject nbttagcompound = new TagObject(); - nbttagcompound.setInt("X", villagedoorinfo.getDoorBlockPos().getX()); - nbttagcompound.setInt("Y", villagedoorinfo.getDoorBlockPos().getY()); - nbttagcompound.setInt("Z", villagedoorinfo.getDoorBlockPos().getZ()); - nbttagcompound.setInt("IDX", villagedoorinfo.getInsideOffsetX()); - nbttagcompound.setInt("IDZ", villagedoorinfo.getInsideOffsetZ()); - nbttagcompound.setInt("TS", villagedoorinfo.getInsidePosY()); - nbttaglist.add(nbttagcompound); + TagObject door = new TagObject(); + door.setInt("X", info.getDoorBlockPos().getX()); + door.setInt("Y", info.getDoorBlockPos().getY()); + door.setInt("Z", info.getDoorBlockPos().getZ()); + door.setInt("IDX", info.getInsideOffsetX()); + door.setInt("IDZ", info.getInsideOffsetZ()); + door.setInt("TS", info.getInsidePosY()); + doors.add(door); } - compound.setObjectList("Doors", nbttaglist); + tag.setObjectList("Doors", doors); } } diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java index 873c0b7..b28b429 100755 --- a/server/src/main/java/server/Server.java +++ b/server/src/main/java/server/Server.java @@ -184,9 +184,9 @@ public final class Server implements IThreadListener { cfg.setString(cvar, value.getValue()); } data.setObject("Config", cfg); - data.setObject("Universe", UniverseRegistry.saveNbt()); - File nfile = new File("server.nbt.tmp"); - File lfile = new File("server.nbt"); + data.setObject("Universe", UniverseRegistry.toTags()); + File nfile = new File("server.cdt.tmp"); + File lfile = new File("server.cdt"); try { TagLoader.writeGZip(data, nfile); if(lfile.exists()) @@ -201,9 +201,9 @@ public final class Server implements IThreadListener { public static long loadServerConfig() { Config.clear(); UniverseRegistry.clear(); - File file = new File("server.nbt"); + File file = new File("server.cdt"); if(!file.exists()) - file = new File("server.nbt.tmp"); + file = new File("server.cdt.tmp"); if(file.exists()) { try { TagObject tag = TagLoader.readGZip(file); @@ -211,7 +211,7 @@ public final class Server implements IThreadListener { for(String key : cfg.getKeySet()) { Config.set(key, cfg.getString(key), false); } - UniverseRegistry.loadNbt(tag.getObject("Universe")); + UniverseRegistry.fromTags(tag.getObject("Universe")); long lastPlayed = tag.getLong("LastAccess"); String version = tag.hasString("Version") ? tag.getString("Version") : null; version = version != null && version.isEmpty() ? "" : version; @@ -274,7 +274,7 @@ public final class Server implements IThreadListener { list = new String[0]; } for(int i = 0; i < list.length; ++i) { - if(list[i].endsWith(".nbt")) { + if(list[i].endsWith(".cdt")) { list[i] = list[i].substring(0, list[i].length() - 4); // Player player = this.getPlayer(list[i]); // if(player != null) @@ -296,7 +296,7 @@ public final class Server implements IThreadListener { return null; TagObject tag = null; try { - File dat = new File(new File("players"), user + ".nbt"); + File dat = new File(new File("players"), user + ".cdt"); if(dat.exists() && dat.isFile()) { tag = TagLoader.readGZip(dat); @@ -312,8 +312,8 @@ public final class Server implements IThreadListener { if(this.debug || !IPlayer.isValidUser(user)) return; try { - File tmp = new File(new File("players"), user + ".nbt.tmp"); - File dat = new File(new File("players"), user + ".nbt"); + File tmp = new File(new File("players"), user + ".cdt.tmp"); + File dat = new File(new File("players"), user + ".cdt"); TagLoader.writeGZip(tag, tmp); if(dat.exists()) { dat.delete(); @@ -840,7 +840,7 @@ public final class Server implements IThreadListener { TagObject tag = this.readPlayer(loginUser); Player conn = new Player(this, connection, loginUser); if(tag != null) - conn.readFromNBT(tag); + conn.readTags(tag); if(Config.playerLimit > 0 && this.players.size() >= Config.playerLimit && !conn.isAdmin()) return String.format("Der Server ist voll (%d/%d)!", this.players.size(), Config.playerLimit); if(conn.getPassword() == null) { @@ -876,7 +876,7 @@ public final class Server implements IThreadListener { world = world == null ? this.space : world; EntityNPC player = conn.createPlayer(world, tag == null ? EntityRegistry.getEntityString(EntityHuman.class) : tag.getString("id")); if(tag != null) - player.readFromNBT(tag); + player.readTags(tag); else player.onInitialSpawn(null); // player.setWorld(world); @@ -939,7 +939,7 @@ public final class Server implements IThreadListener { return null; TagObject tag = null; try { - File dat = new File(new File("players"), user + ".nbt"); + File dat = new File(new File("players"), user + ".cdt"); if(dat.exists() && dat.isFile()) { tag = TagLoader.readGZip(dat); @@ -959,16 +959,14 @@ public final class Server implements IThreadListener { EntityNPC entity = conn.getPresentEntity(); if(entity != null) { TagObject etag = new TagObject(); - entity.writeToNBT(etag); + entity.writeTags(etag); etag.setInt("Dimension", entity.worldObj.dimension.getDimensionId()); etag.setString("id", EntityRegistry.getEntityString(entity)); conn.writeCharacter(etag); } -// else -// etag = new NBTTagCompound(); - conn.writeToNBT(tag); - File tmp = new File(new File("players"), conn.getUser() + ".nbt.tmp"); - File dat = new File(new File("players"), conn.getUser() + ".nbt"); + conn.writeTags(tag); + File tmp = new File(new File("players"), conn.getUser() + ".cdt.tmp"); + File dat = new File(new File("players"), conn.getUser() + ".cdt"); TagLoader.writeGZip(tag, tmp); if(dat.exists()) { dat.delete(); @@ -1049,7 +1047,7 @@ public final class Server implements IThreadListener { EntityNPC old = conn.getEntity(); old.unmount(); TagObject oldTag = new TagObject(); - old.writeToNBT(oldTag); + old.writeTags(oldTag); oldTag.setInt("Dimension", old.worldObj.dimension.getDimensionId()); oldTag.setString("id", EntityRegistry.getEntityString(old)); @@ -1065,7 +1063,7 @@ public final class Server implements IThreadListener { EntityNPC nplayer = conn.createPlayer(world, tag == null ? EntityRegistry.getEntityString(clazz) : tag.getString("id")); // conn.sendPacket(new SPacketRespawn(world.dimension, EntityRegistry.getEntityID(nplayer))); if(tag != null) - nplayer.readFromNBT(tag); + nplayer.readTags(tag); else nplayer.onInitialSpawn(null); // nplayer.clonePlayer(old); diff --git a/server/src/main/java/server/clipboard/ClipboardBlock.java b/server/src/main/java/server/clipboard/ClipboardBlock.java index b2b8fcf..aa73d4d 100755 --- a/server/src/main/java/server/clipboard/ClipboardBlock.java +++ b/server/src/main/java/server/clipboard/ClipboardBlock.java @@ -6,7 +6,7 @@ import common.world.State; public class ClipboardBlock { private State state; - private TagObject nbt; + private TagObject data; public ClipboardBlock(State state) { this.state = state; @@ -16,7 +16,7 @@ public class ClipboardBlock { this(data); TagObject tag = new TagObject(); tile.writeTags(tag); - this.nbt = tag; + this.data = tag; } public State getState() { @@ -27,7 +27,7 @@ public class ClipboardBlock { this.state = state; } - public TagObject getNbtData() { - return this.nbt; + public TagObject getData() { + return this.data; } } diff --git a/server/src/main/java/server/command/ArgumentSplitter.java b/server/src/main/java/server/command/ArgumentSplitter.java index 58ba45a..9d12adc 100644 --- a/server/src/main/java/server/command/ArgumentSplitter.java +++ b/server/src/main/java/server/command/ArgumentSplitter.java @@ -243,169 +243,4 @@ public class ArgumentSplitter { Object value = arg.getValues().get(par); return value == null ? null : (T)value; } - -// public T getUnchecked(String name) { -// return this.getDefault(name, null); -// } -// -// public boolean getBool(String name, boolean def) { -// return this.getDefault(name, def); -// } -// -// public boolean getBool(String name) { -// return this.getUnchecked(name); -// } -// -// public > T getEnum(String name, T def) { -// return this.getDefault(name, def); -// } -// -// public > T getEnum(String name) { -// return this.getUnchecked(name); -// } -// -// public int getInt(String name, int def) { -// return this.getDefault(name, def); -// } -// -// public int getInt(String name) { -// return this.getUnchecked(name); -// } -// -// public long getLong(String name, long def) { -// return this.getDefault(name, def); -// } -// -// public long getLong(String name) { -// return this.getUnchecked(name); -// } -// -// public double getDouble(String name, double def) { -// return this.getDefault(name, def); -// } -// -// public double getDouble(String name) { -// return this.getUnchecked(name); -// } -// -// public String getString(String name, String def) { -// return this.getDefault(name, def); -// } -// -// public String getString(String name) { -// return this.getUnchecked(name); -// } -// -// public String[] getStrings(String name, String[] def) { -// return this.getDefault(name, def); -// } -// -// public String[] getStrings(String name) { -// return this.getUnchecked(name); -// } -// -// public Entity getEntity(String name, Entity def) { -// return this.getDefault(name, def); -// } -// -// public Entity getEntity(String name) { -// return this.getUnchecked(name); -// } -// -// public EntityLiving getLiving(String name, EntityLiving def) { -// return this.getDefault(name, def); -// } -// -// public EntityLiving getLiving(String name) { -// return this.getUnchecked(name); -// } -// -// public EntityNPC getNpc(String name, EntityNPC def) { -// return this.getDefault(name, def); -// } -// -// public EntityNPC getNpc(String name) { -// return this.getUnchecked(name); -// } -// -// public Block getBlock(String name, Block def) { -// return this.getDefault(name, def); -// } -// -// public Block getBlock(String name) { -// return this.getUnchecked(name); -// } -// -// public State getState(String name, State def) { -// return this.getDefault(name, def); -// } -// -// public State getState(String name) { -// return this.getUnchecked(name); -// } -// -// public Item getItem(String name, Item def) { -// return this.getDefault(name, def); -// } -// -// public Item getItem(String name) { -// return this.getUnchecked(name); -// } -// -// public ItemStack getStack(String name, ItemStack def) { -// return this.getDefault(name, def); -// } -// -// public ItemStack getStack(String name) { -// return this.getUnchecked(name); -// } -// -// public BlockPos getColumnPos(String name, BlockPos def) { -// return this.hasArg(name) ? this.getColumnPos(name) : def; -// } -// -// public BlockPos getColumnPos(String name) { -// return new BlockPos(this.getUnchecked(name, "x"), 0, this.getUnchecked(name, "z")); -// } -// -// public BlockPos getBlockPos(String name, BlockPos def) { -// return this.hasArg(name) ? this.getBlockPos(name) : def; -// } -// -// public BlockPos getBlockPos(String name) { -// return new BlockPos(this.getUnchecked(name, "x"), this.getUnchecked(name, "y"), this.getUnchecked(name, "z")); -// } -// -// public WorldPos getWorldPos(String name, WorldPos def) { -// return this.hasArg(name) ? this.getWorldPos(name) : def; -// } -// -// public WorldPos getWorldPos(String name) { -// return new WorldPos(this.getUnchecked(name, "x"), this.getUnchecked(name, "y"), this.getUnchecked(name, "z"), -// this.getUnchecked(name, "dim")); -// } -// -// public Vec3 getVector2D(String name, Vec3 def) { -// return this.hasArg(name) ? this.getVector2D(name) : def; -// } -// -// public Vec3 getVector2D(String name) { -// return new Vec3(this.getUnchecked(name, "x"), 0.0, this.getUnchecked(name, "z")); -// } -// -// public Vec3 getVector(String name, Vec3 def) { -// return this.hasArg(name) ? this.getVector(name) : def; -// } -// -// public Vec3 getVector(String name) { -// return new Vec3(this.getUnchecked(name, "x"), this.getUnchecked(name, "y"), this.getUnchecked(name, "z")); -// } -// -// public WorldServer getWorld(String name) { -// return this.getUnchecked(name); -// } -// -// public NBTTagCompound getTag(String name) { -// return this.getUnchecked(name); -// } } diff --git a/server/src/main/java/server/command/TagParser.java b/server/src/main/java/server/command/TagParser.java index 5955e70..cbfa795 100644 --- a/server/src/main/java/server/command/TagParser.java +++ b/server/src/main/java/server/command/TagParser.java @@ -15,7 +15,7 @@ public class TagParser extends DefaultingParser { value = TagInterpreter.parseTag(input); } catch(TagException e) { - throw new RunException(e, "Ungültiger NBT-Tag '%s'", input); + throw new RunException(e, "Ungültiger Tag '%s'", input); } return value; } diff --git a/server/src/main/java/server/command/commands/CommandSpawn.java b/server/src/main/java/server/command/commands/CommandSpawn.java index b95a7d5..7871011 100644 --- a/server/src/main/java/server/command/commands/CommandSpawn.java +++ b/server/src/main/java/server/command/commands/CommandSpawn.java @@ -67,18 +67,18 @@ public class CommandSpawn extends Command { entity.setLocationAndAngles(pos.xCoord, pos.yCoord, pos.zCoord, world.rand.floatv() * 360.0f, 0.0f); if(tag != null) { TagObject ent = new TagObject(); - entity.writeToNBT(ent); + entity.writeTags(ent); ent.merge(tag); - entity.readFromNBT(ent); + entity.readTags(ent); } if(!noinit && (entity instanceof EntityLiving)) ((EntityLiving)entity).onInitialSpawn(null); world.spawnEntityInWorld(entity); if(postTag != null) { TagObject ent = new TagObject(); - entity.writeToNBT(ent); + entity.writeTags(ent); ent.merge(postTag); - entity.readFromNBT(ent); + entity.readTags(ent); } spawned.add("#" + entity.getId()); } diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 36db980..e1caeac 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -608,16 +608,16 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer } public void sendThrowMessage(ItemStack stack) { - if(stack.stackSize == 1) + if(stack.size == 1) this.addFeed(TextColor.DRED + "* %s weg geworfen", stack.getColoredName(TextColor.DRED)); else - this.addFeed(TextColor.DRED + "* %d %s weg geworfen", stack.stackSize, + this.addFeed(TextColor.DRED + "* %d %s weg geworfen", stack.size, stack.getColoredName(TextColor.DRED)); } - public void readFromNBT(TagObject tag) { + public void readTags(TagObject tag) { this.admin = tag.getBool("admin"); if(tag.hasString("password")) this.password = tag.getString("password"); @@ -628,21 +628,9 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer } this.selected = Math.min(this.selected, this.characters.size() - 1); this.charEditor = this.selected < 0; -// this.stats.clear(); -// if(tag.hasTag("Stats")) { -// NBTTagCompound stats = tag.getCompoundTag("Stats"); -// for(String key : stats.getKeySet()) { -// StatBase stat = StatRegistry.getStat(key); -// if(stat == null) { -// Log.warn("Ungültige Statistik: Statistik '" + key + "' ist unbekannt"); -// continue; -// } -// this.stats.put(stat, stats.getInteger(key)); -// } -// } } - public void writeToNBT(TagObject tag) { + public void writeTags(TagObject tag) { if(this.admin) tag.setBool("admin", this.admin); if(this.password != null) @@ -655,11 +643,6 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer } tag.setObjectList("characters", list); } -// NBTTagCompound stats = new NBTTagCompound(); -// for(Entry entry : this.stats.entrySet()) { -// stats.setInteger(entry.getKey().statId, entry.getValue()); -// } -// tag.setTag("Stats", stats); } @@ -1272,7 +1255,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer { itemstack1.onBlockDestroyed(this.entity.worldObj, iblockstate.getBlock(), pos, this.entity); - if (itemstack1.stackSize == 0) + if (itemstack1.size == 0) { this.entity.destroyCurrentEquippedItem(); } @@ -1293,11 +1276,11 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer // if(this.onPlayerInteract(false, null)) { // return true; // } - int i = stack.stackSize; + int i = stack.size; int j = stack.getMetadata(); ItemStack itemstack = stack.useItemRightClick(this.entity.worldObj, this.entity); - if (itemstack != stack || itemstack != null && (itemstack.stackSize != i || itemstack.getMaxItemUseDuration() > 0 || itemstack.getMetadata() != j)) + if (itemstack != stack || itemstack != null && (itemstack.size != i || itemstack.getMaxItemUseDuration() > 0 || itemstack.getMetadata() != j)) { this.entity.inventory.mainInventory[this.entity.inventory.currentItem] = itemstack; @@ -1311,7 +1294,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer // } // } - if (itemstack.stackSize == 0) + if (itemstack.size == 0) { this.entity.inventory.mainInventory[this.entity.inventory.currentItem] = null; } @@ -2463,7 +2446,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer itemstack = this.entity.inventory.getCurrentItem(); - if (itemstack != null && itemstack.stackSize == 0) + if (itemstack != null && itemstack.size == 0) { this.entity.inventory.mainInventory[this.entity.inventory.currentItem] = null; itemstack = null; @@ -2814,8 +2797,8 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer case REPAIR: if(this.isAdmin() && this.entity.getCurrentEquippedItem() != null) { ItemStack itemstack = this.entity.getCurrentEquippedItem(); - int diff = itemstack.getMaxStackSize() - itemstack.stackSize; - itemstack.stackSize = itemstack.getMaxStackSize(); + int diff = itemstack.getMaxStackSize() - itemstack.size; + itemstack.size = itemstack.getMaxStackSize(); itemstack.setRepairCost(0); if(itemstack.getItem().getMaxDamage() > 0) itemstack.setItemDamage(0); @@ -2966,9 +2949,9 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer } } - public void processCheat(CPacketCheat packetIn) + public void processCheat(CPacketCheat packet) { - NetHandler.checkThread(packetIn, this, this.server); + NetHandler.checkThread(packet, this, this.server); if(this.charEditor) return; @@ -2979,7 +2962,7 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer // { // boolean drop = packetIn.getSlotId() < 0; // boolean changed = false; - ItemStack itemstack = packetIn.getStack(); + ItemStack itemstack = packet.getStack(); // if(itemstack != null && itemstack.getItem() == Items.barrier && !this.playerEntity.canUse(Permissions.BARRIER)) { // changed = true; // itemstack = null; @@ -2995,21 +2978,21 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer // itemstack.setTagCompound(null); // } // else { - TagObject nbttagcompound = itemstack.getTagCompound().getObject("BlockEntityTag"); + TagObject tag = itemstack.getTagCompound().getObject("BlockEntityTag"); - if (nbttagcompound.hasInt("x") && nbttagcompound.hasInt("y") && nbttagcompound.hasInt("z")) + if (tag.hasInt("x") && tag.hasInt("y") && tag.hasInt("z")) { - BlockPos blockpos = new BlockPos(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z")); - TileEntity tileentity = this.entity.worldObj.getTileEntity(blockpos); + BlockPos pos = new BlockPos(tag.getInt("x"), tag.getInt("y"), tag.getInt("z")); + TileEntity te = this.entity.worldObj.getTileEntity(pos); - if (tileentity != null) + if (te != null) { - TagObject nbttagcompound1 = new TagObject(); - tileentity.writeTags(nbttagcompound1); - nbttagcompound1.remove("x"); - nbttagcompound1.remove("y"); - nbttagcompound1.remove("z"); - itemstack.setTagInfo("BlockEntityTag", nbttagcompound1); + TagObject tile = new TagObject(); + te.writeTags(tile); + tile.remove("x"); + tile.remove("y"); + tile.remove("z"); + itemstack.setTagInfo("BlockEntityTag", tile); } } // } @@ -3017,30 +3000,30 @@ public class Player extends NetHandler implements ICrafting, Executor, IPlayer // boolean validSlot = packetIn.getSlotId() >= 1 && packetIn.getSlotId() < 36 + InventoryPlayer.getHotbarSize(); boolean validItem = itemstack.getItem() != null; - boolean validData = itemstack.getMetadata() >= 0 && itemstack.stackSize <= itemstack.getMaxStackSize() && itemstack.stackSize > 0; // TODO: max + boolean validData = itemstack.getMetadata() >= 0 && itemstack.size <= itemstack.getMaxStackSize() && itemstack.size > 0; // TODO: max if (validItem && validData) { - int amount = itemstack.stackSize; - if(packetIn.getSlot() == -1) { + int amount = itemstack.size; + if(packet.getSlot() == -1) { this.entity.inventory.addItemStackToInventory(itemstack); - amount -= itemstack.stackSize; + amount -= itemstack.size; } - else if(packetIn.getSlot() >= 0 && packetIn.getSlot() < this.entity.inventory.getSizeInventory() && (packetIn.getSlot() < this.entity.inventory.mainInventory.length || (itemstack.getItem() instanceof ItemArmor && ((ItemArmor)itemstack.getItem()).armorType == packetIn.getSlot() - this.entity.inventory.mainInventory.length))) { - ItemStack old = this.entity.inventory.getStackInSlot(packetIn.getSlot()); + else if(packet.getSlot() >= 0 && packet.getSlot() < this.entity.inventory.getSizeInventory() && (packet.getSlot() < this.entity.inventory.mainInventory.length || (itemstack.getItem() instanceof ItemArmor && ((ItemArmor)itemstack.getItem()).armorType == packet.getSlot() - this.entity.inventory.mainInventory.length))) { + ItemStack old = this.entity.inventory.getStackInSlot(packet.getSlot()); if(old != null) { if(ItemStack.areItemsEqual(itemstack, old) && ItemStack.areItemStackTagsEqual(itemstack, old)) { - itemstack.stackSize = Math.min(itemstack.getMaxStackSize(), old.stackSize + itemstack.stackSize); - amount = itemstack.stackSize - old.stackSize; + itemstack.size = Math.min(itemstack.getMaxStackSize(), old.size + itemstack.size); + amount = itemstack.size - old.size; } - else if(old.stackSize == 1) + else if(old.size == 1) this.addFeed(TextColor.DRED + "* %s zerstört", old.getColoredName(TextColor.DRED)); else - this.addFeed(TextColor.DRED + "* %d %s zerstört", old.stackSize, + this.addFeed(TextColor.DRED + "* %d %s zerstört", old.size, old.getColoredName(TextColor.DRED)); } - this.entity.inventory.setInventorySlotContents(packetIn.getSlot(), itemstack); + this.entity.inventory.setInventorySlotContents(packet.getSlot(), itemstack); } else { return; diff --git a/server/src/main/java/server/village/VillageCollection.java b/server/src/main/java/server/village/VillageCollection.java index cff672b..0111722 100755 --- a/server/src/main/java/server/village/VillageCollection.java +++ b/server/src/main/java/server/village/VillageCollection.java @@ -23,16 +23,16 @@ public class VillageCollection private int tickCounter; private boolean dirty; - public VillageCollection(TagObject nbt) { - if(nbt != null) { - this.tickCounter = nbt.getInt("Tick"); - TagObjectList nbttaglist = nbt.getObjectList("Villages"); + public VillageCollection(TagObject tag) { + if(tag != null) { + this.tickCounter = tag.getInt("Tick"); + TagObjectList list = tag.getObjectList("Villages"); - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < list.size(); ++i) { - TagObject nbttagcompound = nbttaglist.get(i); + TagObject obj = list.get(i); Village village = new Village(); - village.readVillageDataFromNBT(nbttagcompound); + village.readTags(obj); this.villageList.add(village); } } @@ -248,22 +248,22 @@ public class VillageCollection return block instanceof BlockDoor ? block.getMaterial() == Material.WOOD : false; } - public TagObject writeToNBT() + public TagObject toTags() { - TagObject nbt = new TagObject(); - nbt.setInt("Tick", this.tickCounter); - TagObjectList nbttaglist = new TagObjectList(); + TagObject tag = new TagObject(); + tag.setInt("Tick", this.tickCounter); + TagObjectList list = new TagObjectList(); for (Village village : this.villageList) { - TagObject nbttagcompound = new TagObject(); - village.writeVillageDataToNBT(nbttagcompound); - nbttaglist.add(nbttagcompound); + TagObject obj = new TagObject(); + village.writeTags(obj); + list.add(obj); } - nbt.setObjectList("Villages", nbttaglist); + tag.setObjectList("Villages", list); this.dirty = false; - return nbt; + return tag; } public boolean isDirty() diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index e8f20f1..4fc55ba 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -96,7 +96,7 @@ import common.world.World; import server.Server; public abstract class Converter { - private static class OldNbtTag { + private static class NbtTag { private final Map map = Maps.newHashMap(); private boolean has(String key, Class type) { @@ -132,8 +132,8 @@ public abstract class Converter { return !this.has(key, int[].class) ? new int[0] : (int[])this.map.get(key); } - public OldNbtTag getTag(String key) { - return !this.has(key, OldNbtTag.class) ? new OldNbtTag() : (OldNbtTag)this.map.get(key); + public NbtTag getTag(String key) { + return !this.has(key, NbtTag.class) ? new NbtTag() : (NbtTag)this.map.get(key); } public float[] getFloatList(String key) { @@ -154,11 +154,11 @@ public abstract class Converter { return values; } - public OldNbtTag[] getTagList(String key) { - List list = this.getList(key, OldNbtTag.class); - OldNbtTag[] values = new OldNbtTag[list.size()]; + public NbtTag[] getTagList(String key) { + List list = this.getList(key, NbtTag.class); + NbtTag[] values = new NbtTag[list.size()]; for(int z = 0; z < values.length; z++) { - values[z] = (OldNbtTag)list.get(z); + values[z] = (NbtTag)list.get(z); } return values; } @@ -910,7 +910,7 @@ public abstract class Converter { return list; } case 10: { - OldNbtTag tag = new OldNbtTag(); + NbtTag tag = new NbtTag(); byte type; while((type = input.readByte()) != 0) { String key = input.readUTF(); @@ -931,14 +931,14 @@ public abstract class Converter { } } - private static OldNbtTag readTag(DataInputStream in) throws IOException { + private static NbtTag readTag(DataInputStream in) throws IOException { if(in.readByte() != 10) throw new IOException("Tag hat den falschen Typ"); in.readUTF(); - return (OldNbtTag)read(in, (byte)10); + return (NbtTag)read(in, (byte)10); } - private static TagObject convertTile(OldNbtTag ent, String id) { + private static TagObject convertTile(NbtTag ent, String id) { TagObject nent = new TagObject(); if("Sign".equals(id)) { String[] signText = new String[4]; @@ -1013,7 +1013,7 @@ public abstract class Converter { return nlist; } - private static TagObject convertChunkData(OldNbtTag tag, boolean legacy) { + private static TagObject convertChunkData(NbtTag tag, boolean legacy) { TagObject ntag = new TagObject(); tag = tag.getTag("Level"); if(legacy) { @@ -1080,9 +1080,9 @@ public abstract class Converter { ntag.setBool("TerrainPopulated", true); ntag.setBool("LightPopulated", tag.getByte("LightPopulated") != 0); - OldNbtTag[] ents = tag.getTagList("Entities"); + NbtTag[] ents = tag.getTagList("Entities"); TagObjectList entities = new TagObjectList(); - for(OldNbtTag ent : ents) { + for(NbtTag ent : ents) { TagObject nent = new TagObject(); String mapped = ENTITY_MAP.get(trimColon(ent.getString("id"))); if(mapped != null) { @@ -1105,7 +1105,7 @@ public abstract class Converter { ents = tag.getTagList("TileEntities"); entities = new TagObjectList(); - for(OldNbtTag ent : ents) { + for(NbtTag ent : ents) { TagObject nent = new TagObject(); String mapped = TILE_MAP.get(trimColon(ent.getString("id"))); if(mapped != null) { @@ -1119,9 +1119,9 @@ public abstract class Converter { } ntag.setObjectList("TileEntities", entities); - OldNbtTag[] sects = tag.getTagList("Sections"); + NbtTag[] sects = tag.getTagList("Sections"); entities = new TagObjectList(); - for(OldNbtTag sect : sects) { + for(NbtTag sect : sects) { TagObject nsect = new TagObject(); byte[] blocks = sect.getByteArray("Blocks"); NibbleArray data = new NibbleArray(sect.getByteArray("Data")); @@ -1210,7 +1210,7 @@ public abstract class Converter { Log.IO.warn("Konnte " + file.getPath() + "@" + x + "," + z + " nicht lesen"); continue; } - OldNbtTag tag = readTag(in); + NbtTag tag = readTag(in); in.close(); TagObject ntag = convertChunkData(tag, legacy); // DataOutputStream out = newreg.getOutputStream(nx, nz); @@ -1240,7 +1240,7 @@ public abstract class Converter { public static boolean convert() { long cur = System.currentTimeMillis(); - if(new File("server.nbt").exists()) + if(new File("server.cdt").exists()) return false; File ldat = new File("level.dat"); if(!ldat.exists()) @@ -1248,11 +1248,11 @@ public abstract class Converter { if(!ldat.exists()) return false; Log.IO.info("Welt wird konvertiert"); - OldNbtTag nbt; + NbtTag tag; DataInputStream in = null; try { in = new DataInputStream(new BufferedInputStream(new GZIPInputStream(new FileInputStream(ldat)))); - nbt = readTag(in); + tag = readTag(in); } catch(Exception e) { Log.IO.error(e, "Fehler beim Lesen von level.dat"); @@ -1266,10 +1266,9 @@ public abstract class Converter { catch(IOException e) { } } - nbt = nbt.getTag("Data"); - int version = nbt.getInt("version"); - int data = nbt.getInt("DataVersion"); -// nbt.setBoolean("incompatible", data >= 1400); + tag = tag.getTag("Data"); + int version = tag.getInt("version"); + int data = tag.getInt("DataVersion"); SaveVersion ver = data >= 1400 ? SaveVersion.RELEASE_1_13 : (data >= 100 ? SaveVersion.RELEASE_1_9 : (version == 19132 || version == 19133 ? SaveVersion.BETA_1_3 : (version == 0 ? SaveVersion.ALPHA_1_0 : null))); if(ver == null) { Log.IO.error("Version %d ist unbekannt", version); @@ -1317,19 +1316,19 @@ public abstract class Converter { Log.IO.info("Konvertiere Daten von level.dat"); Config.clear(); UniverseRegistry.clear(); - OldNbtTag rules = nbt.getTag("GameRules"); + NbtTag rules = tag.getTag("GameRules"); for(Entry rule : OLD_GAMERULES.entrySet()) { if(!rules.getString(rule.getKey()).isEmpty()) Config.set(rule.getValue(), rules.getString(rule.getKey()), false); } - Log.IO.info("Speichere neue server.nbt ..."); + Log.IO.info("Speichere neue server.cdt ..."); Server.saveServerConfig(World.START_TIME); - Weather weather = nbt.getByte("thundering") != 0 ? Weather.THUNDER : (nbt.getByte("raining") != 0 ? Weather.RAIN : Weather.CLEAR); + Weather weather = tag.getByte("thundering") != 0 ? Weather.THUNDER : (tag.getByte("raining") != 0 ? Weather.RAIN : Weather.CLEAR); if(weather != Weather.CLEAR) { TagObject dataTag = new TagObject(); dataTag.setString("Weather", weather.getName()); - Log.IO.info("Speichere neue data.nbt ..."); - File dataFile = new File(new File(new File("chunk"), "terra"), "data.nbt"); + Log.IO.info("Speichere neue data.cdt ..."); + File dataFile = new File(new File(new File("chunk"), "terra"), "data.cdt"); try { TagLoader.writeGZip(dataTag, dataFile); } diff --git a/server/src/main/java/server/world/Region.java b/server/src/main/java/server/world/Region.java index f9e1de8..8bbf9c1 100755 --- a/server/src/main/java/server/world/Region.java +++ b/server/src/main/java/server/world/Region.java @@ -360,7 +360,7 @@ public class Region { // getRegionFile(dir, x >> 3, z >> 3).writeTag(x & 7, z & 7, tag); } - public static ChunkServer readNbt(WorldServer world, int x, int z, TagObject tag) { + public static ChunkServer readChunk(WorldServer world, int x, int z, TagObject tag) { // if(!tag.hasTag("Level")) { // Log.error("Chunk-Datei bei " + x + "," + z + " hat keine Level-Daten, überspringe"); // return null; @@ -418,7 +418,7 @@ public class Region { if(entities != null) { for(int n = 0; n < entities.size(); ++n) { TagObject ent = entities.get(n); - Entity entity = EntityRegistry.createEntityFromNBT(ent, world); + Entity entity = EntityRegistry.createFromTags(ent, world); chunk.setHasEntities(true); if(entity != null) { @@ -426,7 +426,7 @@ public class Region { Entity rider = entity; for(TagObject ride = ent; ride.hasObject("Riding"); ride = ride.getObject("Riding")) { - Entity pass = EntityRegistry.createEntityFromNBT(ride.getObject("Riding"), world); + Entity pass = EntityRegistry.createFromTags(ride.getObject("Riding"), world); if(pass != null) { chunk.addEntity(pass); @@ -486,7 +486,7 @@ public class Region { return chunk; } - public static TagObject writeNbt(WorldServer world, ChunkServer chunk) { + public static TagObject writeChunk(WorldServer world, ChunkServer chunk) { TagObject tag = new TagObject(); // tag.setShort("V", (short)Config.PROTOCOL); tag.setLong("LastUpdate", world.getTime()); @@ -553,7 +553,7 @@ public class Region { for(Entity entity : chunk.getEntities()[n]) { TagObject ent = new TagObject(); - if(entity.writeToNBTOptional(ent)) { + if(entity.writeOptional(ent)) { chunk.setHasEntities(true); entities.add(ent); } diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 294c9f2..7f6860f 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -299,7 +299,7 @@ public final class WorldServer extends AWorldServer { this.dimension.setSeed(this.seed); TagObject tag = null; try { - File dat = new File(this.chunkDir, "data.nbt"); + File dat = new File(this.chunkDir, "data.cdt"); if(dat.exists() && dat.isFile()) tag = TagLoader.readGZip(dat); } @@ -310,7 +310,7 @@ public final class WorldServer extends AWorldServer { this.exterminated = tag.getBool("Exterminated"); this.time = tag.getLong("Time"); if(tag.hasObject("Generator")) { - this.dimension.fromNbt(tag.getObject("Generator")); + this.dimension.fromTags(tag.getObject("Generator")); if(this.dimension.getType().weather && !this.exterminated) this.weather = this.dimension.getWeather(); this.seed = this.dimension.getSeed(); @@ -441,7 +441,7 @@ public final class WorldServer extends AWorldServer { if(!debug) { TagObject tag = null; try { - File dat = new File(this.chunkDir, "loaders.nbt"); + File dat = new File(this.chunkDir, "loaders.cdt"); if(dat.exists() && dat.isFile()) tag = TagLoader.readGZip(dat); } @@ -456,28 +456,10 @@ public final class WorldServer extends AWorldServer { } this.loadersModified = false; } -// tag = null; -// try { -// File dat = new File(this.chunkDir, "warps.nbt"); -// if(dat.exists() && dat.isFile()) -// tag = NBTLoader.readGZip(dat); -// } -// catch(Exception e) { -// Log.warn("Konnte Warpliste nicht laden", e); -// } -// if(tag != null && tag.hasList("Warps")) { -// NBTTagList list = tag.getTagList("Warps", 10); -// for(int z = 0; z < list.tagCount(); z++) { -// NBTTagCompound pos = list.getCompoundTagAt(z); -// server.getWarps().put(pos.getString("Name"), new Position(pos.getDouble("X"), pos.getDouble("Y"), pos.getDouble("Z"), -// pos.getFloat("Yaw"), pos.getFloat("Pitch"), this.dimension.getDimensionId())); -// } -// this.warpsModified = false; -// } if(this.villageGen != null) { tag = null; try { - File dat = new File(this.chunkDir, "villages.nbt"); + File dat = new File(this.chunkDir, "villages.cdt"); if(dat.exists() && dat.isFile()) tag = TagLoader.readGZip(dat); } @@ -930,7 +912,7 @@ public final class WorldServer extends AWorldServer { public static boolean needsLoading(Dimension dim) { TagObject tag = null; try { - File dat = new File(new File(new File("chunk"), dim.getDimensionName()), "loaders.nbt"); + File dat = new File(new File(new File("chunk"), dim.getDimensionName()), "loaders.cdt"); if(dat.exists() && dat.isFile()) tag = TagLoader.readGZip(dat); } @@ -943,7 +925,7 @@ public final class WorldServer extends AWorldServer { public static void loadWarps(Dimension dim, Map warps) { TagObject tag = null; try { - File dat = new File(new File(new File("chunk"), dim.getDimensionName()), "warps.nbt"); + File dat = new File(new File(new File("chunk"), dim.getDimensionName()), "warps.cdt"); if(dat.exists() && dat.isFile()) tag = TagLoader.readGZip(dat); } @@ -981,7 +963,7 @@ public final class WorldServer extends AWorldServer { } for(Dimension dim : UniverseRegistry.getDimensions()) { TagObjectList list = map.get(dim.getDimensionId()); - File file = new File(new File(new File("chunk"), dim.getDimensionName()), "warps.nbt"); + File file = new File(new File(new File("chunk"), dim.getDimensionName()), "warps.cdt"); if(list == null) { file.delete(); } @@ -1040,7 +1022,7 @@ public final class WorldServer extends AWorldServer { list.add(loader); } loaders.setObjectList("Loaders", list); - File file = new File(this.chunkDir, "loaders.nbt"); + File file = new File(this.chunkDir, "loaders.cdt"); if(list.isEmpty()) { file.delete(); } @@ -1060,12 +1042,12 @@ public final class WorldServer extends AWorldServer { // this.dataModified = false; TagObject data = new TagObject(); // data.setLong("Seed", this.seed); - data.setObject("Generator", this.dimension.toNbt(true)); + data.setObject("Generator", this.dimension.toTags(true)); data.setLong("Time", this.time); data.setBool("Exterminated", this.exterminated); data.setString("Weather", this.weather.getName()); // ... - File file = new File(this.chunkDir, "data.nbt"); + File file = new File(this.chunkDir, "data.cdt"); try { TagLoader.writeGZip(data, file); } @@ -1081,8 +1063,8 @@ public final class WorldServer extends AWorldServer { } } if(this.villageStorage != null && this.villageStorage.isDirty()) { - TagObject tag = this.villageStorage.writeToNBT(); - File dat = new File(this.chunkDir, "villages.nbt"); + TagObject tag = this.villageStorage.toTags(); + File dat = new File(this.chunkDir, "villages.cdt"); try { TagLoader.writeGZip(tag, dat); } @@ -1412,7 +1394,7 @@ public final class WorldServer extends AWorldServer { } // tag = CompressedStreamTools.read(in); } - ChunkServer chunk = Region.readNbt(this, x, z, tag); + ChunkServer chunk = Region.readChunk(this, x, z, tag); if(chunk != null) { chunk.setSaved(this.time); if(this.mineshaftGen != null) { @@ -1440,13 +1422,9 @@ public final class WorldServer extends AWorldServer { } private void saveChunkData(ChunkServer chunk) { -// try { chunk.setSaved(this.time); -// this.lock.check(); try { -// NBTTagCompound ltag = new NBTTagCompound(); -// tag.setTag("Level", ltag); - TagObject tag = Region.writeNbt(this, chunk); + TagObject tag = Region.writeChunk(this, chunk); ChunkPos coord = new ChunkPos(chunk.xPos, chunk.zPos); if(!this.pending.contains(coord)) { this.toRemove.put(coord, tag); @@ -1456,10 +1434,6 @@ public final class WorldServer extends AWorldServer { catch(Exception e) { Log.IO.error(e, "Konnte Chunk nicht speichern"); } -// } -// catch(SaveException e) { -// Log.error("Konnte Chunk nicht speichern; bereits von einer anderen Instanz genutzt?", e); -// } } public boolean writeNextIO() { @@ -2228,9 +2202,9 @@ public final class WorldServer extends AWorldServer { State successState = chunk.setState(pos, newState); boolean successful = successState != null; if(successful) { - if(block.getNbtData() != null) { + if(block.getData() != null) { this.removeTileEntity(pos); - TagObject tag = block.getNbtData(); + TagObject tag = block.getData(); tag.setString("id", tag.getString("id")); tag.setInt("x", pos.getX()); tag.setInt("y", pos.getY()); @@ -2475,7 +2449,7 @@ public final class WorldServer extends AWorldServer { } private File getSaveFile(String id) { - return new File(this.chunkDir, id.toLowerCase() + ".nbt"); + return new File(this.chunkDir, id.toLowerCase() + ".cdt"); } private WorldSavedData loadData(String id) { @@ -2485,16 +2459,7 @@ public final class WorldServer extends AWorldServer { try { File file = this.getSaveFile(id); if(file.exists()) { -// try { data = new WorldSavedData(id, TagLoader.readGZip(file)); -// } -// catch(Exception re) { -// throw new RuntimeException("Konnte " + clazz.toString() + " nicht instanzieren", re); -// } -// FileInputStream in = new FileInputStream(file); -// NBTTagCompound tag = ; -// in.close(); -// data.readFromNBT(tag.getCompoundTag("data")); } } catch(Exception e) { @@ -2518,13 +2483,7 @@ public final class WorldServer extends AWorldServer { private void saveData(WorldSavedData data) { try { File file = this.getSaveFile(data.id); -// NBTTagCompound tag = new NBTTagCompound(); -// data.writeToNBT(tag); -// NBTTagCompound dtag = new NBTTagCompound(); -// dtag.setTag("data", tag); -// FileOutputStream out = new FileOutputStream(file); TagLoader.writeGZip(data.tag, file); -// out.close(); } catch(Exception e) { e.printStackTrace(); diff --git a/server/src/main/java/server/worldgen/structure/MapGenStructure.java b/server/src/main/java/server/worldgen/structure/MapGenStructure.java index cf8fda7..78824d3 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenStructure.java +++ b/server/src/main/java/server/worldgen/structure/MapGenStructure.java @@ -190,16 +190,16 @@ public abstract class MapGenStructure extends MapGenBase // return null; // } - private void initializeStructureData(WorldServer worldIn) + private void initializeStructureData(WorldServer world) { if (this.structureData == null) { - this.structureData = worldIn.loadItemData(this.getStructureName()); + this.structureData = world.loadItemData(this.getStructureName()); if (this.structureData == null) { this.structureData = new WorldSavedData(this.getStructureName(), new TagObject()); - worldIn.setItemData(this.getStructureName(), this.structureData); + world.setItemData(this.getStructureName(), this.structureData); } else { @@ -207,21 +207,21 @@ public abstract class MapGenStructure extends MapGenBase for (String s : tag.getKeySet()) { - Tag nbtbase = tag.get(s); + Tag sub = tag.get(s); - if (nbtbase instanceof TagObject) + if (sub instanceof TagObject) { - TagObject nbttagcompound1 = (TagObject)nbtbase; + TagObject start = (TagObject)sub; - if (nbttagcompound1.hasInt("ChunkX") && nbttagcompound1.hasInt("ChunkZ")) + if (start.hasInt("ChunkX") && start.hasInt("ChunkZ")) { - int i = nbttagcompound1.getInt("ChunkX"); - int j = nbttagcompound1.getInt("ChunkZ"); - StructureStart structurestart = MapGenStructureIO.getStructureStart(nbttagcompound1, worldIn); + int i = start.getInt("ChunkX"); + int j = start.getInt("ChunkZ"); + StructureStart structure = MapGenStructureIO.getStructureStart(start, world); - if (structurestart != null) + if (structure != null) { - this.structureMap.put(Long.valueOf(LongHashMap.packInt(i, j)), structurestart); + this.structureMap.put(Long.valueOf(LongHashMap.packInt(i, j)), structure); } } } @@ -232,7 +232,7 @@ public abstract class MapGenStructure extends MapGenBase private void setStructureStart(int chunkX, int chunkZ, StructureStart start) { - this.structureData.tag.setObject("[" + chunkX + "," + chunkZ + "]", start.writeStructureComponentsToNBT(chunkX, chunkZ)); + this.structureData.tag.setObject("[" + chunkX + "," + chunkZ + "]", start.writeComponents(chunkX, chunkZ)); this.structureData.dirty = true; } diff --git a/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java b/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java index fcd2a3c..0b7b6d0 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java +++ b/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java @@ -57,7 +57,7 @@ public class MapGenStructureIO if (structurestart != null) { - structurestart.readStructureComponentsFromNBT(worldIn, tagCompound); + structurestart.readComponents(worldIn, tagCompound); } else { @@ -88,7 +88,7 @@ public class MapGenStructureIO if (structurecomponent != null) { - structurecomponent.readStructureBaseNBT(worldIn, tagCompound); + structurecomponent.readBase(worldIn, tagCompound); } else { diff --git a/server/src/main/java/server/worldgen/structure/MapGenVillage.java b/server/src/main/java/server/worldgen/structure/MapGenVillage.java index e80571f..fb4a1a6 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenVillage.java +++ b/server/src/main/java/server/worldgen/structure/MapGenVillage.java @@ -140,15 +140,15 @@ public class MapGenVillage extends MapGenStructure return this.hasMoreThanTwoComponents; } - public void writeToNBT(TagObject tagCompound) + public void writeTags(TagObject tagCompound) { - super.writeToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Valid", this.hasMoreThanTwoComponents); } - public void readFromNBT(TagObject tagCompound) + public void readTags(TagObject tagCompound) { - super.readFromNBT(tagCompound); + super.readTags(tagCompound); this.hasMoreThanTwoComponents = tagCompound.getBool("Valid"); } } diff --git a/server/src/main/java/server/worldgen/structure/StructureBridge.java b/server/src/main/java/server/worldgen/structure/StructureBridge.java index 3059307..8af531e 100755 --- a/server/src/main/java/server/worldgen/structure/StructureBridge.java +++ b/server/src/main/java/server/worldgen/structure/StructureBridge.java @@ -115,15 +115,15 @@ public class StructureBridge this.field_111021_b = p_i45615_2_.zrange(3) == 0; } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.field_111021_b = tagCompound.getBool("Chest"); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Chest", this.field_111021_b); } @@ -186,15 +186,15 @@ public class StructureBridge this.field_111020_b = p_i45613_2_.zrange(3) == 0; } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.field_111020_b = tagCompound.getBool("Chest"); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Chest", this.field_111020_b); } @@ -636,15 +636,15 @@ public class StructureBridge return isAboveGround(structureboundingbox) && StructureComponent.findIntersecting(p_175884_0_, structureboundingbox) == null ? new StructureBridge.End(p_175884_6_, p_175884_1_, structureboundingbox, p_175884_5_) : null; } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.fillSeed = tagCompound.getInt("Seed"); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("Seed", this.fillSeed); } @@ -951,11 +951,11 @@ public class StructureBridge super(p_i2054_1_); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { } @@ -1243,14 +1243,14 @@ public class StructureBridge } } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); } } @@ -1325,15 +1325,15 @@ public class StructureBridge this.boundingBox = p_i45611_3_; } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.hasSpawner = tagCompound.getBool("Mob"); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Mob", this.hasSpawner); } diff --git a/server/src/main/java/server/worldgen/structure/StructureComponent.java b/server/src/main/java/server/worldgen/structure/StructureComponent.java index 60fba28..bbc96a9 100755 --- a/server/src/main/java/server/worldgen/structure/StructureComponent.java +++ b/server/src/main/java/server/worldgen/structure/StructureComponent.java @@ -41,47 +41,47 @@ public abstract class StructureComponent /** * Writes structure base data (id, boundingbox, {@link * game.worldgen.structure.StructureComponent#coordBaseMode coordBase} and {@link - * game.worldgen.structure.StructureComponent#componentType componentType}) to new NBTTagCompound and + * game.worldgen.structure.StructureComponent#componentType componentType}) to new tag and * returns it. */ - public TagObject createStructureBaseNBT() + public TagObject writeBase() { - TagObject nbttagcompound = new TagObject(); - nbttagcompound.setString("id", MapGenStructureIO.getStructureComponentName(this)); - nbttagcompound.setIntArray("BB", this.boundingBox.toIntArray()); - nbttagcompound.setInt("O", this.coordBaseMode == null ? -1 : this.coordBaseMode.getHorizontalIndex()); - nbttagcompound.setInt("GD", this.componentType); - this.writeStructureToNBT(nbttagcompound); - return nbttagcompound; + TagObject tag = new TagObject(); + tag.setString("id", MapGenStructureIO.getStructureComponentName(this)); + tag.setIntArray("BB", this.boundingBox.toIntArray()); + tag.setInt("O", this.coordBaseMode == null ? -1 : this.coordBaseMode.getHorizontalIndex()); + tag.setInt("GD", this.componentType); + this.writeTags(tag); + return tag; } /** - * (abstract) Helper method to write subclass data to NBT + * (abstract) Helper method to write subclass data to tag */ - protected abstract void writeStructureToNBT(TagObject tagCompound); + protected abstract void writeTags(TagObject tag); /** * Reads and sets structure base data (boundingbox, {@link * game.worldgen.structure.StructureComponent#coordBaseMode coordBase} and {@link * game.worldgen.structure.StructureComponent#componentType componentType}) */ - public void readStructureBaseNBT(WorldServer worldIn, TagObject tagCompound) + public void readBase(WorldServer world, TagObject tag) { - if (tagCompound.hasIntArray("BB")) + if (tag.hasIntArray("BB")) { - this.boundingBox = new StructureBoundingBox(tagCompound.getIntArray("BB")); + this.boundingBox = new StructureBoundingBox(tag.getIntArray("BB")); } - int i = tagCompound.getInt("O"); + int i = tag.getInt("O"); this.coordBaseMode = i == -1 ? null : Facing.getHorizontal(i); - this.componentType = tagCompound.getInt("GD"); - this.readStructureFromNBT(tagCompound); + this.componentType = tag.getInt("GD"); + this.readTags(tag); } /** - * (abstract) Helper method to read subclass data from NBT + * (abstract) Helper method to read subclass data from tag */ - protected abstract void readStructureFromNBT(TagObject tagCompound); + protected abstract void readTags(TagObject tag); /** * Initiates construction of the Structure Component picked, at the current Location of StructGen diff --git a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java index 2692d4f..c4baaef 100755 --- a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java +++ b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java @@ -100,7 +100,7 @@ public class StructureMineshaft { } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { tagCompound.setBool("hr", this.hasRails); tagCompound.setBool("sc", this.hasSpiders); @@ -108,7 +108,7 @@ public class StructureMineshaft tagCompound.setInt("Num", this.sectionCount); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { this.hasRails = tagCompound.getBool("hr"); this.hasSpiders = tagCompound.getBool("sc"); @@ -425,13 +425,13 @@ public class StructureMineshaft { } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { tagCompound.setBool("tf", this.isMultipleFloors); tagCompound.setInt("D", this.corridorDirection.getHorizontalIndex()); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { this.isMultipleFloors = tagCompound.getBool("tf"); this.corridorDirection = Facing.getHorizontal(tagCompound.getInt("D")); @@ -710,25 +710,25 @@ public class StructureMineshaft } } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tag) { - TagIntArrayList nbttaglist = new TagIntArrayList(); + TagIntArrayList list = new TagIntArrayList(); - for (StructureBoundingBox structureboundingbox : this.roomsLinkedToTheRoom) + for (StructureBoundingBox bb : this.roomsLinkedToTheRoom) { - nbttaglist.add(structureboundingbox.toIntArray()); + list.add(bb.toIntArray()); } - tagCompound.setIntArrayList("Entrances", nbttaglist); + tag.setIntArrayList("Entrances", list); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tag) { - TagIntArrayList nbttaglist = tagCompound.getIntArrayList("Entrances"); + TagIntArrayList list = tag.getIntArrayList("Entrances"); - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < list.size(); ++i) { - this.roomsLinkedToTheRoom.add(new StructureBoundingBox(nbttaglist.get(i))); + this.roomsLinkedToTheRoom.add(new StructureBoundingBox(list.get(i))); } } } @@ -746,11 +746,11 @@ public class StructureMineshaft this.boundingBox = structurebb; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { } diff --git a/server/src/main/java/server/worldgen/structure/StructureScattered.java b/server/src/main/java/server/worldgen/structure/StructureScattered.java index 9ee26eb..2a4b875 100755 --- a/server/src/main/java/server/worldgen/structure/StructureScattered.java +++ b/server/src/main/java/server/worldgen/structure/StructureScattered.java @@ -41,18 +41,18 @@ public class StructureScattered super(p_i2062_1_, p_i2062_2_, 64, p_i2062_3_, 21, 15, 21); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("hasPlacedChest0", this.hasPlacedChest[0]); tagCompound.setBool("hasPlacedChest1", this.hasPlacedChest[1]); tagCompound.setBool("hasPlacedChest2", this.hasPlacedChest[2]); tagCompound.setBool("hasPlacedChest3", this.hasPlacedChest[3]); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.hasPlacedChest[0] = tagCompound.getBool("hasPlacedChest0"); this.hasPlacedChest[1] = tagCompound.getBool("hasPlacedChest1"); this.hasPlacedChest[2] = tagCompound.getBool("hasPlacedChest2"); @@ -293,7 +293,7 @@ public class StructureScattered } } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { tagCompound.setInt("Width", this.scatteredFeatureSizeX); tagCompound.setInt("Height", this.scatteredFeatureSizeY); @@ -301,7 +301,7 @@ public class StructureScattered tagCompound.setInt("HPos", this.field_74936_d); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { this.scatteredFeatureSizeX = tagCompound.getInt("Width"); this.scatteredFeatureSizeY = tagCompound.getInt("Height"); @@ -366,18 +366,18 @@ public class StructureScattered super(p_i2064_1_, p_i2064_2_, 64, p_i2064_3_, 12, 10, 15); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("placedMainChest", this.placedMainChest); tagCompound.setBool("placedHiddenChest", this.placedHiddenChest); tagCompound.setBool("placedTrap1", this.placedTrap1); tagCompound.setBool("placedTrap2", this.placedTrap2); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.placedMainChest = tagCompound.getBool("placedMainChest"); this.placedHiddenChest = tagCompound.getBool("placedHiddenChest"); this.placedTrap1 = tagCompound.getBool("placedTrap1"); @@ -613,15 +613,15 @@ public class StructureScattered super(p_i2066_1_, p_i2066_2_, 64, p_i2066_3_, 7, 7, 9); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Mage", this.hasMage); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.hasMage = tagCompound.getBool("Mage"); } diff --git a/server/src/main/java/server/worldgen/structure/StructureStart.java b/server/src/main/java/server/worldgen/structure/StructureStart.java index 092603b..9bfa360 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStart.java +++ b/server/src/main/java/server/worldgen/structure/StructureStart.java @@ -67,50 +67,50 @@ public abstract class StructureStart } } - public TagObject writeStructureComponentsToNBT(int chunkX, int chunkZ) + public TagObject writeComponents(int chunkX, int chunkZ) { - TagObject nbttagcompound = new TagObject(); - nbttagcompound.setString("id", MapGenStructureIO.getStructureStartName(this)); - nbttagcompound.setInt("ChunkX", chunkX); - nbttagcompound.setInt("ChunkZ", chunkZ); - nbttagcompound.setIntArray("BB", this.boundingBox.toIntArray()); - TagObjectList nbttaglist = new TagObjectList(); + TagObject tag = new TagObject(); + tag.setString("id", MapGenStructureIO.getStructureStartName(this)); + tag.setInt("ChunkX", chunkX); + tag.setInt("ChunkZ", chunkZ); + tag.setIntArray("BB", this.boundingBox.toIntArray()); + TagObjectList list = new TagObjectList(); - for (StructureComponent structurecomponent : this.components) + for (StructureComponent comp : this.components) { - nbttaglist.add(structurecomponent.createStructureBaseNBT()); + list.add(comp.writeBase()); } - nbttagcompound.setObjectList("Children", nbttaglist); - this.writeToNBT(nbttagcompound); - return nbttagcompound; + tag.setObjectList("Children", list); + this.writeTags(tag); + return tag; } - public void writeToNBT(TagObject tagCompound) + public void writeTags(TagObject tag) { } - public void readStructureComponentsFromNBT(WorldServer worldIn, TagObject tagCompound) + public void readComponents(WorldServer world, TagObject tag) { - this.chunkPosX = tagCompound.getInt("ChunkX"); - this.chunkPosZ = tagCompound.getInt("ChunkZ"); + this.chunkPosX = tag.getInt("ChunkX"); + this.chunkPosZ = tag.getInt("ChunkZ"); - if (tagCompound.hasIntArray("BB")) + if (tag.hasIntArray("BB")) { - this.boundingBox = new StructureBoundingBox(tagCompound.getIntArray("BB")); + this.boundingBox = new StructureBoundingBox(tag.getIntArray("BB")); } - TagObjectList nbttaglist = tagCompound.getObjectList("Children"); + TagObjectList list = tag.getObjectList("Children"); - for (int i = 0; i < nbttaglist.size(); ++i) + for (int i = 0; i < list.size(); ++i) { - this.components.add(MapGenStructureIO.getStructureComponent(nbttaglist.get(i), worldIn)); + this.components.add(MapGenStructureIO.getStructureComponent(list.get(i), world)); } - this.readFromNBT(tagCompound); + this.readTags(tag); } - public void readFromNBT(TagObject tagCompound) + public void readTags(TagObject tag) { } diff --git a/server/src/main/java/server/worldgen/structure/StructureStronghold.java b/server/src/main/java/server/worldgen/structure/StructureStronghold.java index 55bcaed..870a53b 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStronghold.java +++ b/server/src/main/java/server/worldgen/structure/StructureStronghold.java @@ -252,15 +252,15 @@ public class StructureStronghold this.boundingBox = p_i45582_3_; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Chest", this.hasMadeChest); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.hasMadeChest = tagCompound.getBool("Chest"); } @@ -324,15 +324,15 @@ public class StructureStronghold this.field_74993_a = p_i45581_4_ != Facing.NORTH && p_i45581_4_ != Facing.SOUTH ? p_i45581_3_.getXSize() : p_i45581_3_.getZSize(); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("Steps", this.field_74993_a); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.field_74993_a = tagCompound.getInt("Steps"); } @@ -425,18 +425,18 @@ public class StructureStronghold this.field_74999_h = p_i45580_2_.zrange(3) > 0; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("leftLow", this.field_74996_b); tagCompound.setBool("leftHigh", this.field_74997_c); tagCompound.setBool("rightLow", this.field_74995_d); tagCompound.setBool("rightHigh", this.field_74999_h); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.field_74996_b = tagCompound.getBool("leftLow"); this.field_74997_c = tagCompound.getBool("leftHigh"); this.field_74995_d = tagCompound.getBool("rightLow"); @@ -608,15 +608,15 @@ public class StructureStronghold this.isLargeRoom = p_i45578_3_.getYSize() > 6; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Tall", this.isLargeRoom); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.isLargeRoom = tagCompound.getBool("Tall"); } @@ -792,15 +792,15 @@ public class StructureStronghold this.boundingBox = p_i45577_3_; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Mob", this.hasSpawner); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.hasSpawner = tagCompound.getBool("Mob"); } @@ -1030,15 +1030,15 @@ public class StructureStronghold this.roomType = p_i45575_2_.zrange(5); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("Type", this.roomType); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.roomType = tagCompound.getInt("Type"); } @@ -1199,15 +1199,15 @@ public class StructureStronghold this.boundingBox = p_i45574_3_; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Source", this.field_75024_a); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.field_75024_a = tagCompound.getBool("Source"); } @@ -1393,16 +1393,16 @@ public class StructureStronghold this.expandsZ = p_i45573_2_.zrange(2) == 0; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Left", this.expandsX); tagCompound.setBool("Right", this.expandsZ); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.expandsX = tagCompound.getBool("Left"); this.expandsZ = tagCompound.getBool("Right"); } @@ -1472,12 +1472,12 @@ public class StructureStronghold super(p_i2087_1_); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { tagCompound.setString("EntryDoor", this.field_143013_d.getName()); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { this.field_143013_d = StructureStronghold.Stronghold.Door.getByName(tagCompound.getString("EntryDoor")); } diff --git a/server/src/main/java/server/worldgen/structure/StructureVillage.java b/server/src/main/java/server/worldgen/structure/StructureVillage.java index e0bd89e..aa65189 100755 --- a/server/src/main/java/server/worldgen/structure/StructureVillage.java +++ b/server/src/main/java/server/worldgen/structure/StructureVillage.java @@ -403,18 +403,18 @@ public class StructureVillage this.cropTypeD = this.func_151559_a(rand); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("CA", BlockRegistry.REGISTRY.getIDForObject(this.cropTypeA)); tagCompound.setInt("CB", BlockRegistry.REGISTRY.getIDForObject(this.cropTypeB)); tagCompound.setInt("CC", BlockRegistry.REGISTRY.getIDForObject(this.cropTypeC)); tagCompound.setInt("CD", BlockRegistry.REGISTRY.getIDForObject(this.cropTypeD)); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.cropTypeA = BlockRegistry.getBlockById(tagCompound.getInt("CA")); this.cropTypeB = BlockRegistry.getBlockById(tagCompound.getInt("CB")); this.cropTypeC = BlockRegistry.getBlockById(tagCompound.getInt("CC")); @@ -512,16 +512,16 @@ public class StructureVillage this.cropTypeB = this.func_151560_a(rand); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("CA", BlockRegistry.REGISTRY.getIDForObject(this.cropTypeA)); tagCompound.setInt("CB", BlockRegistry.REGISTRY.getIDForObject(this.cropTypeB)); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.cropTypeA = BlockRegistry.getBlockById(tagCompound.getInt("CA")); this.cropTypeB = BlockRegistry.getBlockById(tagCompound.getInt("CB")); } @@ -855,15 +855,15 @@ public class StructureVillage return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(p_175855_1_, structureboundingbox) == null ? new StructureVillage.House2(start, p_175855_7_, rand, structureboundingbox, facing) : null; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Chest", this.hasMadeChest); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.hasMadeChest = tagCompound.getBool("Chest"); } @@ -1123,15 +1123,15 @@ public class StructureVillage this.isRoofAccessible = rand.chance(); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("Terrace", this.isRoofAccessible); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.isRoofAccessible = tagCompound.getBool("Terrace"); } @@ -1252,15 +1252,15 @@ public class StructureVillage this.length = Math.max(p_i45562_4_.getXSize(), p_i45562_4_.getZSize()); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("Length", this.length); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.length = tagCompound.getInt("Length"); } @@ -1507,14 +1507,14 @@ public class StructureVillage } } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { tagCompound.setInt("HPos", this.field_143015_k); tagCompound.setInt("VCount", this.villagersSpawned); tagCompound.setBool("Desert", this.isDesertVillage); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { this.field_143015_k = tagCompound.getInt("HPos"); this.villagersSpawned = tagCompound.getInt("VCount"); @@ -1789,16 +1789,16 @@ public class StructureVillage this.tablePosition = rand.zrange(3); } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setInt("T", this.tablePosition); tagCompound.setBool("C", this.isTallHouse); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.tablePosition = tagCompound.getInt("T"); this.isTallHouse = tagCompound.getBool("C"); } @@ -1901,15 +1901,15 @@ public class StructureVillage this.boundingBox = p_i45565_4_; } - protected void writeStructureToNBT(TagObject tagCompound) + protected void writeTags(TagObject tagCompound) { - super.writeStructureToNBT(tagCompound); + super.writeTags(tagCompound); tagCompound.setBool("VSpawn", this.villagerSpawned); } - protected void readStructureFromNBT(TagObject tagCompound) + protected void readTags(TagObject tagCompound) { - super.readStructureFromNBT(tagCompound); + super.readTags(tagCompound); this.villagerSpawned = tagCompound.getBool("VSpawn"); }