diff --git a/client/src/main/java/client/renderer/particle/EntityFX.java b/client/src/main/java/client/renderer/particle/EntityFX.java index 8208122..3ef2b40 100755 --- a/client/src/main/java/client/renderer/particle/EntityFX.java +++ b/client/src/main/java/client/renderer/particle/EntityFX.java @@ -5,7 +5,7 @@ import client.renderer.RenderBuffer; import client.renderer.texture.TextureAtlasSprite; import common.entity.Entity; import common.entity.EntityType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.ExtMath; import common.world.World; diff --git a/client/src/main/java/client/renderer/particle/EntityFirework.java b/client/src/main/java/client/renderer/particle/EntityFirework.java index e912a98..98e4692 100755 --- a/client/src/main/java/client/renderer/particle/EntityFirework.java +++ b/client/src/main/java/client/renderer/particle/EntityFirework.java @@ -6,8 +6,8 @@ import client.world.WorldClient; import common.entity.Entity; import common.init.SoundEvent; import common.item.ItemDye; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BoundingBox; import common.util.ExtMath; import common.world.World; diff --git a/client/src/main/java/client/world/WorldClient.java b/client/src/main/java/client/world/WorldClient.java index 3d61dfe..a704d32 100755 --- a/client/src/main/java/client/world/WorldClient.java +++ b/client/src/main/java/client/world/WorldClient.java @@ -22,10 +22,10 @@ import common.init.SoundEvent; import common.item.ItemDye; import common.log.Log; import common.model.ParticleType; -import common.nbt.TagObject; import common.rng.Random; import common.sound.MovingSoundMinecart; import common.sound.PositionedSound; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.ChunkPos; diff --git a/common/src/main/java/common/attributes/Attributes.java b/common/src/main/java/common/attributes/Attributes.java index afacffe..80995bd 100755 --- a/common/src/main/java/common/attributes/Attributes.java +++ b/common/src/main/java/common/attributes/Attributes.java @@ -3,8 +3,8 @@ package common.attributes; import java.util.Collection; import common.log.Log; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; public class Attributes { diff --git a/common/src/main/java/common/block/tile/BlockBanner.java b/common/src/main/java/common/block/tile/BlockBanner.java index a7d466f..0993acc 100755 --- a/common/src/main/java/common/block/tile/BlockBanner.java +++ b/common/src/main/java/common/block/tile/BlockBanner.java @@ -8,11 +8,11 @@ import common.init.Items; import common.item.Item; import common.item.ItemStack; import common.model.Transforms; -import common.nbt.TagObject; import common.properties.IProperty; import common.properties.PropertyDirection; import common.properties.PropertyInteger; import common.rng.Random; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.tileentity.TileEntityBanner; import common.util.BlockPos; diff --git a/common/src/main/java/common/dimension/Dimension.java b/common/src/main/java/common/dimension/Dimension.java index cedcb4e..1340f87 100755 --- a/common/src/main/java/common/dimension/Dimension.java +++ b/common/src/main/java/common/dimension/Dimension.java @@ -11,9 +11,9 @@ import common.init.BlockRegistry; import common.init.Blocks; import common.init.MetalType; import common.init.UniverseRegistry; -import common.nbt.TagObject; -import common.nbt.TagStringList; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; +import common.tags.TagStringList; import common.util.ExtMath; import common.util.Vec3; import common.world.State; diff --git a/common/src/main/java/common/dimension/Nameable.java b/common/src/main/java/common/dimension/Nameable.java index 5db24c1..3ea6123 100755 --- a/common/src/main/java/common/dimension/Nameable.java +++ b/common/src/main/java/common/dimension/Nameable.java @@ -1,6 +1,6 @@ package common.dimension; -import common.nbt.TagObject; +import common.tags.TagObject; public abstract class Nameable { protected String customName = null; diff --git a/common/src/main/java/common/enchantment/EnchantmentHelper.java b/common/src/main/java/common/enchantment/EnchantmentHelper.java index 6e55af1..7d9554d 100755 --- a/common/src/main/java/common/enchantment/EnchantmentHelper.java +++ b/common/src/main/java/common/enchantment/EnchantmentHelper.java @@ -12,10 +12,10 @@ import common.entity.types.EntityLiving; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.rng.Random; import common.rng.WeightedList; +import common.tags.TagObject; +import common.tags.TagObjectList; public class EnchantmentHelper { diff --git a/common/src/main/java/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java index 8c716bc..c71a5c4 100755 --- a/common/src/main/java/common/entity/Entity.java +++ b/common/src/main/java/common/entity/Entity.java @@ -27,10 +27,10 @@ import common.init.UniverseRegistry; import common.item.Item; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; -import common.nbt.TagDoubleList; -import common.nbt.TagFloatList; import common.rng.Random; +import common.tags.TagDoubleList; +import common.tags.TagFloatList; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/EntityTrackerEntry.java b/common/src/main/java/common/entity/EntityTrackerEntry.java index 08c333e..d55214f 100755 --- a/common/src/main/java/common/entity/EntityTrackerEntry.java +++ b/common/src/main/java/common/entity/EntityTrackerEntry.java @@ -12,7 +12,6 @@ import common.entity.projectile.EntityArrow; import common.entity.types.EntityLiving; import common.item.ItemStack; import common.log.Log; -import common.nbt.TagObject; import common.network.Packet; import common.packet.SPacketEntityRelMove; import common.packet.SPacketEntityLook; @@ -30,6 +29,7 @@ import common.packet.SPacketSpawnMob; import common.packet.SPacketSpawnObject; import common.packet.SPacketSpawnPlayer; import common.potion.PotionEffect; +import common.tags.TagObject; import common.util.ExtMath; public class EntityTrackerEntry { diff --git a/common/src/main/java/common/entity/animal/EntityBat.java b/common/src/main/java/common/entity/animal/EntityBat.java index f5e86f2..f70ec81 100755 --- a/common/src/main/java/common/entity/animal/EntityBat.java +++ b/common/src/main/java/common/entity/animal/EntityBat.java @@ -8,7 +8,7 @@ import common.entity.npc.Alignment; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.SoundEvent; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/animal/EntityChicken.java b/common/src/main/java/common/entity/animal/EntityChicken.java index 2954b0e..1b09f69 100755 --- a/common/src/main/java/common/entity/animal/EntityChicken.java +++ b/common/src/main/java/common/entity/animal/EntityChicken.java @@ -17,7 +17,7 @@ import common.init.Items; import common.init.SoundEvent; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/animal/EntityDragonPart.java b/common/src/main/java/common/entity/animal/EntityDragonPart.java index cb481bb..70b2ab0 100755 --- a/common/src/main/java/common/entity/animal/EntityDragonPart.java +++ b/common/src/main/java/common/entity/animal/EntityDragonPart.java @@ -4,7 +4,7 @@ import common.entity.DamageSource; import common.entity.Entity; import common.entity.EntityType; import common.entity.types.IEntityMultiPart; -import common.nbt.TagObject; +import common.tags.TagObject; public class EntityDragonPart extends Entity { diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index 345bd7f..2849a52 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -31,10 +31,10 @@ import common.item.Item; import common.item.ItemMonsterPlacer; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.pathfinding.PathNavigateGround; import common.potion.Potion; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/animal/EntityOcelot.java b/common/src/main/java/common/entity/animal/EntityOcelot.java index 4de9912..0e0bb78 100755 --- a/common/src/main/java/common/entity/animal/EntityOcelot.java +++ b/common/src/main/java/common/entity/animal/EntityOcelot.java @@ -26,8 +26,8 @@ import common.init.Items; import common.init.SoundEvent; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; import common.pathfinding.PathNavigateGround; +import common.tags.TagObject; import common.world.World; public class EntityOcelot extends EntityTameable diff --git a/common/src/main/java/common/entity/animal/EntityPig.java b/common/src/main/java/common/entity/animal/EntityPig.java index 4edd929..3ad0786 100755 --- a/common/src/main/java/common/entity/animal/EntityPig.java +++ b/common/src/main/java/common/entity/animal/EntityPig.java @@ -17,8 +17,8 @@ import common.init.Items; import common.init.SoundEvent; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; import common.pathfinding.PathNavigateGround; +import common.tags.TagObject; import common.world.World; public class EntityPig extends EntityAnimal diff --git a/common/src/main/java/common/entity/animal/EntityRabbit.java b/common/src/main/java/common/entity/animal/EntityRabbit.java index f95aac9..a9c2abd 100755 --- a/common/src/main/java/common/entity/animal/EntityRabbit.java +++ b/common/src/main/java/common/entity/animal/EntityRabbit.java @@ -33,11 +33,11 @@ import common.init.SoundEvent; import common.item.Item; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; import common.pathfinding.PathEntity; import common.pathfinding.PathNavigateGround; import common.potion.Potion; import common.potion.PotionEffect; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.util.Vec3; diff --git a/common/src/main/java/common/entity/animal/EntitySheep.java b/common/src/main/java/common/entity/animal/EntitySheep.java index a069802..4090fd6 100755 --- a/common/src/main/java/common/entity/animal/EntitySheep.java +++ b/common/src/main/java/common/entity/animal/EntitySheep.java @@ -29,9 +29,9 @@ import common.inventory.InventoryCrafting; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; -import common.nbt.TagObject; import common.pathfinding.PathNavigateGround; import common.rng.Random; +import common.tags.TagObject; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/animal/EntityWolf.java b/common/src/main/java/common/entity/animal/EntityWolf.java index c2e594e..3c09a1a 100755 --- a/common/src/main/java/common/entity/animal/EntityWolf.java +++ b/common/src/main/java/common/entity/animal/EntityWolf.java @@ -31,8 +31,8 @@ import common.item.Item; import common.item.ItemFood; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; import common.pathfinding.PathNavigateGround; +import common.tags.TagObject; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/item/EntityBoat.java b/common/src/main/java/common/entity/item/EntityBoat.java index f1be550..98b26d7 100755 --- a/common/src/main/java/common/entity/item/EntityBoat.java +++ b/common/src/main/java/common/entity/item/EntityBoat.java @@ -15,7 +15,7 @@ import common.init.ItemRegistry; import common.init.Items; import common.item.Item; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/item/EntityCart.java b/common/src/main/java/common/entity/item/EntityCart.java index 7192818..bb65039 100755 --- a/common/src/main/java/common/entity/item/EntityCart.java +++ b/common/src/main/java/common/entity/item/EntityCart.java @@ -13,7 +13,7 @@ import common.init.Config; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; +import common.tags.TagObject; import common.tileentity.IWorldNameable; import common.util.BlockPos; import common.util.BoundingBox; diff --git a/common/src/main/java/common/entity/item/EntityCartContainer.java b/common/src/main/java/common/entity/item/EntityCartContainer.java index a223a33..9500ca4 100755 --- a/common/src/main/java/common/entity/item/EntityCartContainer.java +++ b/common/src/main/java/common/entity/item/EntityCartContainer.java @@ -7,8 +7,8 @@ import common.init.Config; import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.ILockableContainer; import common.tileentity.LockCode; import common.util.BlockPos; diff --git a/common/src/main/java/common/entity/item/EntityCrystal.java b/common/src/main/java/common/entity/item/EntityCrystal.java index e41845f..6c5fbed 100755 --- a/common/src/main/java/common/entity/item/EntityCrystal.java +++ b/common/src/main/java/common/entity/item/EntityCrystal.java @@ -3,7 +3,7 @@ package common.entity.item; import common.entity.DamageSource; import common.entity.Entity; import common.entity.EntityType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public class EntityCrystal extends Entity diff --git a/common/src/main/java/common/entity/item/EntityExplosion.java b/common/src/main/java/common/entity/item/EntityExplosion.java index 0001db4..dbf7725 100755 --- a/common/src/main/java/common/entity/item/EntityExplosion.java +++ b/common/src/main/java/common/entity/item/EntityExplosion.java @@ -2,7 +2,7 @@ package common.entity.item; import common.entity.Entity; import common.entity.EntityType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.Explosion; import common.world.World; diff --git a/common/src/main/java/common/entity/item/EntityFalling.java b/common/src/main/java/common/entity/item/EntityFalling.java index 12181ba..4d5da95 100755 --- a/common/src/main/java/common/entity/item/EntityFalling.java +++ b/common/src/main/java/common/entity/item/EntityFalling.java @@ -15,8 +15,8 @@ import common.init.BlockRegistry; import common.init.Blocks; import common.init.Config; import common.item.ItemStack; -import common.nbt.Tag; -import common.nbt.TagObject; +import common.tags.Tag; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/item/EntityFireworks.java b/common/src/main/java/common/entity/item/EntityFireworks.java index 8313f66..622b94c 100755 --- a/common/src/main/java/common/entity/item/EntityFireworks.java +++ b/common/src/main/java/common/entity/item/EntityFireworks.java @@ -5,7 +5,7 @@ import common.entity.EntityType; import common.init.SoundEvent; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.ExtMath; import common.world.AWorldClient; import common.world.World; diff --git a/common/src/main/java/common/entity/item/EntityHopperCart.java b/common/src/main/java/common/entity/item/EntityHopperCart.java index 7f88bad..9d38ba4 100755 --- a/common/src/main/java/common/entity/item/EntityHopperCart.java +++ b/common/src/main/java/common/entity/item/EntityHopperCart.java @@ -11,7 +11,7 @@ import common.init.ItemRegistry; import common.inventory.Container; import common.inventory.ContainerHopper; import common.inventory.InventoryPlayer; -import common.nbt.TagObject; +import common.tags.TagObject; import common.tileentity.IHopper; import common.tileentity.TileEntityHopper; import common.util.BlockPos; diff --git a/common/src/main/java/common/entity/item/EntityItem.java b/common/src/main/java/common/entity/item/EntityItem.java index 5c74418..09fb10f 100755 --- a/common/src/main/java/common/entity/item/EntityItem.java +++ b/common/src/main/java/common/entity/item/EntityItem.java @@ -14,7 +14,7 @@ import common.init.SoundEvent; import common.item.ItemStack; import common.log.Log; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.util.PortalType; diff --git a/common/src/main/java/common/entity/item/EntityLeashKnot.java b/common/src/main/java/common/entity/item/EntityLeashKnot.java index 49133ac..9686a54 100755 --- a/common/src/main/java/common/entity/item/EntityLeashKnot.java +++ b/common/src/main/java/common/entity/item/EntityLeashKnot.java @@ -9,7 +9,7 @@ import common.entity.types.EntityLiving; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/item/EntityNuke.java b/common/src/main/java/common/entity/item/EntityNuke.java index e03bb67..535a481 100755 --- a/common/src/main/java/common/entity/item/EntityNuke.java +++ b/common/src/main/java/common/entity/item/EntityNuke.java @@ -3,7 +3,7 @@ package common.entity.item; import common.entity.Entity; import common.entity.EntityType; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public class EntityNuke extends Entity diff --git a/common/src/main/java/common/entity/item/EntityTnt.java b/common/src/main/java/common/entity/item/EntityTnt.java index 800f1b8..0868cea 100755 --- a/common/src/main/java/common/entity/item/EntityTnt.java +++ b/common/src/main/java/common/entity/item/EntityTnt.java @@ -5,7 +5,7 @@ import common.entity.EntityType; import common.entity.types.EntityLiving; import common.entity.types.IObjectData; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public class EntityTnt extends Entity implements IObjectData diff --git a/common/src/main/java/common/entity/item/EntityTntCart.java b/common/src/main/java/common/entity/item/EntityTntCart.java index 9c0445b..31f8257 100755 --- a/common/src/main/java/common/entity/item/EntityTntCart.java +++ b/common/src/main/java/common/entity/item/EntityTntCart.java @@ -9,7 +9,7 @@ import common.init.Config; import common.init.SoundEvent; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.world.Explosion; import common.world.State; diff --git a/common/src/main/java/common/entity/item/EntityXp.java b/common/src/main/java/common/entity/item/EntityXp.java index 25b2225..069e6e5 100755 --- a/common/src/main/java/common/entity/item/EntityXp.java +++ b/common/src/main/java/common/entity/item/EntityXp.java @@ -10,7 +10,7 @@ import common.entity.types.IObjectData; import common.init.Config; import common.init.SoundEvent; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.util.PortalType; diff --git a/common/src/main/java/common/entity/npc/EntityGargoyle.java b/common/src/main/java/common/entity/npc/EntityGargoyle.java index b48b6ea..ecb3ccb 100755 --- a/common/src/main/java/common/entity/npc/EntityGargoyle.java +++ b/common/src/main/java/common/entity/npc/EntityGargoyle.java @@ -6,8 +6,8 @@ import common.entity.DamageSource; import common.init.Config; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.world.World; public class EntityGargoyle extends EntityFlyingNPC diff --git a/common/src/main/java/common/entity/npc/EntityHaunter.java b/common/src/main/java/common/entity/npc/EntityHaunter.java index f8fc069..14babae 100755 --- a/common/src/main/java/common/entity/npc/EntityHaunter.java +++ b/common/src/main/java/common/entity/npc/EntityHaunter.java @@ -9,8 +9,8 @@ import common.init.Config; import common.init.Items; import common.init.SoundEvent; import common.item.ItemStack; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.world.World; import common.world.AWorldServer; diff --git a/common/src/main/java/common/entity/npc/EntityMobNPC.java b/common/src/main/java/common/entity/npc/EntityMobNPC.java index d876c50..60b2f74 100755 --- a/common/src/main/java/common/entity/npc/EntityMobNPC.java +++ b/common/src/main/java/common/entity/npc/EntityMobNPC.java @@ -6,7 +6,7 @@ import common.attributes.Attributes; import common.entity.DamageSource; import common.entity.Entity; import common.entity.types.EntityLiving; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public abstract class EntityMobNPC extends EntityNPC diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java index 21afa0f..a050077 100755 --- a/common/src/main/java/common/entity/npc/EntityNPC.java +++ b/common/src/main/java/common/entity/npc/EntityNPC.java @@ -67,8 +67,6 @@ import common.item.ItemStack; import common.item.ItemSword; import common.item.ItemTool; import common.model.ParticleType; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.network.IClientPlayer; import common.network.IPlayer; import common.packet.CPacketPlayerPosition; @@ -85,6 +83,8 @@ import common.potion.Potion; import common.potion.PotionEffect; import common.rng.Random; import common.sound.MovingSoundMinecartRiding; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.IInteractionObject; import common.tileentity.LockCode; import common.tileentity.TileEntitySign; diff --git a/common/src/main/java/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java index 708e3df..d5bffa5 100755 --- a/common/src/main/java/common/entity/npc/EntitySlime.java +++ b/common/src/main/java/common/entity/npc/EntitySlime.java @@ -10,9 +10,9 @@ import common.entity.types.EntityLiving; import common.init.Config; import common.init.SoundEvent; import common.model.ParticleType; -import common.nbt.TagObject; import common.pathfinding.PathNavigateGround; import common.rng.Random; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/projectile/EntityArrow.java b/common/src/main/java/common/entity/projectile/EntityArrow.java index f505c33..ce3be77 100755 --- a/common/src/main/java/common/entity/projectile/EntityArrow.java +++ b/common/src/main/java/common/entity/projectile/EntityArrow.java @@ -18,7 +18,7 @@ import common.init.Items; import common.init.SoundEvent; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/projectile/EntityBullet.java b/common/src/main/java/common/entity/projectile/EntityBullet.java index 3ae858c..8f57c92 100755 --- a/common/src/main/java/common/entity/projectile/EntityBullet.java +++ b/common/src/main/java/common/entity/projectile/EntityBullet.java @@ -11,7 +11,7 @@ import common.entity.types.IObjectData; import common.entity.types.IProjectile; import common.init.Config; import common.init.SoundEvent; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BoundingBox; import common.util.ExtMath; import common.util.HitPosition; diff --git a/common/src/main/java/common/entity/projectile/EntityDie.java b/common/src/main/java/common/entity/projectile/EntityDie.java index 5b910a6..77b8cdd 100755 --- a/common/src/main/java/common/entity/projectile/EntityDie.java +++ b/common/src/main/java/common/entity/projectile/EntityDie.java @@ -9,7 +9,7 @@ import common.init.Items; import common.init.SoundEvent; import common.item.ItemDie; import common.item.ItemStack; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.HitPosition; import common.world.World; diff --git a/common/src/main/java/common/entity/projectile/EntityDynamite.java b/common/src/main/java/common/entity/projectile/EntityDynamite.java index f3b7314..3584248 100755 --- a/common/src/main/java/common/entity/projectile/EntityDynamite.java +++ b/common/src/main/java/common/entity/projectile/EntityDynamite.java @@ -9,7 +9,7 @@ import common.init.Config; import common.init.ItemRegistry; import common.init.Items; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.HitPosition; import common.world.World; diff --git a/common/src/main/java/common/entity/projectile/EntityFireball.java b/common/src/main/java/common/entity/projectile/EntityFireball.java index 3af3edc..6c85f9f 100755 --- a/common/src/main/java/common/entity/projectile/EntityFireball.java +++ b/common/src/main/java/common/entity/projectile/EntityFireball.java @@ -3,7 +3,7 @@ package common.entity.projectile; import common.entity.DamageSource; import common.entity.types.EntityLiving; import common.init.Config; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.HitPosition; import common.world.World; diff --git a/common/src/main/java/common/entity/projectile/EntityHook.java b/common/src/main/java/common/entity/projectile/EntityHook.java index bf6410b..9b1fd22 100755 --- a/common/src/main/java/common/entity/projectile/EntityHook.java +++ b/common/src/main/java/common/entity/projectile/EntityHook.java @@ -18,7 +18,7 @@ import common.init.Items; import common.init.SoundEvent; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/projectile/EntityPotion.java b/common/src/main/java/common/entity/projectile/EntityPotion.java index bde9b6e..5dd7b3f 100755 --- a/common/src/main/java/common/entity/projectile/EntityPotion.java +++ b/common/src/main/java/common/entity/projectile/EntityPotion.java @@ -7,9 +7,9 @@ import common.entity.types.EntityThrowable; import common.entity.types.IObjectData; import common.init.Items; import common.item.ItemStack; -import common.nbt.TagObject; import common.potion.Potion; import common.potion.PotionEffect; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.HitPosition; diff --git a/common/src/main/java/common/entity/projectile/EntityProjectile.java b/common/src/main/java/common/entity/projectile/EntityProjectile.java index d4db08b..3fc52a0 100755 --- a/common/src/main/java/common/entity/projectile/EntityProjectile.java +++ b/common/src/main/java/common/entity/projectile/EntityProjectile.java @@ -9,8 +9,8 @@ import common.entity.EntityType; import common.entity.types.EntityLiving; import common.init.BlockRegistry; import common.model.ParticleType; -import common.nbt.TagObject; -import common.nbt.TagDoubleList; +import common.tags.TagDoubleList; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/types/EntityAnimal.java b/common/src/main/java/common/entity/types/EntityAnimal.java index c10eb29..9328f76 100755 --- a/common/src/main/java/common/entity/types/EntityAnimal.java +++ b/common/src/main/java/common/entity/types/EntityAnimal.java @@ -12,7 +12,7 @@ import common.init.Blocks; import common.init.Items; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index 409ff4b..555efac 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -47,8 +47,6 @@ import common.item.ItemArmor; import common.item.ItemMonsterPlacer; import common.item.ItemStack; import common.model.ParticleType; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.network.IPlayer; import common.packet.SPacketEntityAttach; import common.packet.SPacketAnimation; @@ -59,6 +57,8 @@ import common.potion.Potion; import common.potion.PotionEffect; import common.potion.PotionHelper; import common.rng.Random; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/types/EntityTameable.java b/common/src/main/java/common/entity/types/EntityTameable.java index c35e5c0..2757197 100755 --- a/common/src/main/java/common/entity/types/EntityTameable.java +++ b/common/src/main/java/common/entity/types/EntityTameable.java @@ -2,7 +2,7 @@ package common.entity.types; import common.ai.EntityAISit; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public abstract class EntityTameable extends EntityAnimal implements IEntityOwnable diff --git a/common/src/main/java/common/entity/types/EntityThrowable.java b/common/src/main/java/common/entity/types/EntityThrowable.java index 1c3b509..1eb8853 100755 --- a/common/src/main/java/common/entity/types/EntityThrowable.java +++ b/common/src/main/java/common/entity/types/EntityThrowable.java @@ -9,7 +9,7 @@ import common.entity.EntityType; import common.init.BlockRegistry; import common.init.Blocks; import common.model.ParticleType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/entity/types/EntityWeatherEffect.java b/common/src/main/java/common/entity/types/EntityWeatherEffect.java index a99b297..e8cb01f 100755 --- a/common/src/main/java/common/entity/types/EntityWeatherEffect.java +++ b/common/src/main/java/common/entity/types/EntityWeatherEffect.java @@ -2,7 +2,7 @@ package common.entity.types; import common.entity.Entity; import common.entity.EntityType; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public abstract class EntityWeatherEffect extends Entity { diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index 5820441..a74d86c 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -25,8 +25,8 @@ import common.item.Item; import common.item.ItemArmor; import common.item.ItemDye; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.TileEntityBanner; import common.world.World; diff --git a/common/src/main/java/common/init/EntityRegistry.java b/common/src/main/java/common/init/EntityRegistry.java index 20ff42d..a9ed6a7 100755 --- a/common/src/main/java/common/init/EntityRegistry.java +++ b/common/src/main/java/common/init/EntityRegistry.java @@ -49,7 +49,7 @@ import common.entity.projectile.EntitySnowball; import common.entity.types.EntityLiving; import common.entity.types.IObjectData; import common.log.Log; -import common.nbt.TagObject; +import common.tags.TagObject; import common.world.World; public abstract class EntityRegistry { diff --git a/common/src/main/java/common/init/UniverseRegistry.java b/common/src/main/java/common/init/UniverseRegistry.java index 3f4e5de..94bd1e1 100755 --- a/common/src/main/java/common/init/UniverseRegistry.java +++ b/common/src/main/java/common/init/UniverseRegistry.java @@ -27,11 +27,11 @@ import common.dimension.Star; import common.dimension.Dimension.GeneratorType; import common.dimension.Dimension.ReplacerType; import common.log.Log; -import common.nbt.TagException; -import common.nbt.TagInterpreter; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.rng.Random; +import common.tags.TagException; +import common.tags.TagInterpreter; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.PortalType; import common.world.State; import common.world.Weather; diff --git a/common/src/main/java/common/inventory/InventoryHelper.java b/common/src/main/java/common/inventory/InventoryHelper.java index 487dba2..2f89367 100755 --- a/common/src/main/java/common/inventory/InventoryHelper.java +++ b/common/src/main/java/common/inventory/InventoryHelper.java @@ -3,8 +3,8 @@ package common.inventory; import common.entity.Entity; import common.entity.item.EntityItem; import common.item.ItemStack; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/inventory/InventoryPlayer.java b/common/src/main/java/common/inventory/InventoryPlayer.java index 464638e..d30269c 100755 --- a/common/src/main/java/common/inventory/InventoryPlayer.java +++ b/common/src/main/java/common/inventory/InventoryPlayer.java @@ -5,8 +5,8 @@ import common.entity.npc.EntityNPC; import common.item.Item; import common.item.ItemArmor; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; public class InventoryPlayer implements IInventory { diff --git a/common/src/main/java/common/inventory/InventoryWarpChest.java b/common/src/main/java/common/inventory/InventoryWarpChest.java index 8ee6a11..de188f1 100755 --- a/common/src/main/java/common/inventory/InventoryWarpChest.java +++ b/common/src/main/java/common/inventory/InventoryWarpChest.java @@ -3,8 +3,8 @@ package common.inventory; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; public class InventoryWarpChest extends InventoryBasic diff --git a/common/src/main/java/common/item/Item.java b/common/src/main/java/common/item/Item.java index 3a4b4e7..faccb22 100755 --- a/common/src/main/java/common/item/Item.java +++ b/common/src/main/java/common/item/Item.java @@ -16,8 +16,8 @@ import common.model.ItemMeshDefinition; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemArmor.java b/common/src/main/java/common/item/ItemArmor.java index 16f32a7..459fc17 100755 --- a/common/src/main/java/common/item/ItemArmor.java +++ b/common/src/main/java/common/item/ItemArmor.java @@ -20,7 +20,7 @@ import common.init.ToolMaterial; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.world.World; diff --git a/common/src/main/java/common/item/ItemBanner.java b/common/src/main/java/common/item/ItemBanner.java index 3ac42d4..50a37e0 100755 --- a/common/src/main/java/common/item/ItemBanner.java +++ b/common/src/main/java/common/item/ItemBanner.java @@ -10,8 +10,8 @@ import common.init.Blocks; import common.model.ItemMeshDefinition; import common.model.Model; import common.model.ModelProvider; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.TileEntity; import common.tileentity.TileEntityBanner; import common.util.BlockPos; diff --git a/common/src/main/java/common/item/ItemBlock.java b/common/src/main/java/common/item/ItemBlock.java index 12896e8..b2f4012 100755 --- a/common/src/main/java/common/item/ItemBlock.java +++ b/common/src/main/java/common/item/ItemBlock.java @@ -11,7 +11,7 @@ import common.init.Blocks; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; -import common.nbt.TagObject; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemEnchantedBook.java b/common/src/main/java/common/item/ItemEnchantedBook.java index 205d2e6..4eba8e5 100755 --- a/common/src/main/java/common/item/ItemEnchantedBook.java +++ b/common/src/main/java/common/item/ItemEnchantedBook.java @@ -9,9 +9,9 @@ import common.enchantment.RngEnchantment; import common.entity.npc.EntityNPC; import common.init.Items; import common.model.ItemMeshDefinition; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.rng.Random; +import common.tags.TagObject; +import common.tags.TagObjectList; public class ItemEnchantedBook extends Item { diff --git a/common/src/main/java/common/item/ItemFirework.java b/common/src/main/java/common/item/ItemFirework.java index 60779b4..2c1a2e8 100755 --- a/common/src/main/java/common/item/ItemFirework.java +++ b/common/src/main/java/common/item/ItemFirework.java @@ -5,8 +5,8 @@ import java.util.List; import common.collect.Lists; import common.entity.item.EntityFireworks; import common.entity.npc.EntityNPC; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.Facing; import common.world.World; diff --git a/common/src/main/java/common/item/ItemFireworkCharge.java b/common/src/main/java/common/item/ItemFireworkCharge.java index b392429..968d965 100755 --- a/common/src/main/java/common/item/ItemFireworkCharge.java +++ b/common/src/main/java/common/item/ItemFireworkCharge.java @@ -6,7 +6,7 @@ import common.color.DyeColor; import common.entity.npc.EntityNPC; import common.model.Model; import common.model.ModelProvider; -import common.nbt.TagObject; +import common.tags.TagObject; public class ItemFireworkCharge extends Item { diff --git a/common/src/main/java/common/item/ItemStack.java b/common/src/main/java/common/item/ItemStack.java index 52a0572..b4f6741 100755 --- a/common/src/main/java/common/item/ItemStack.java +++ b/common/src/main/java/common/item/ItemStack.java @@ -19,10 +19,10 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.BlockRegistry; import common.init.ItemRegistry; -import common.nbt.Tag; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.rng.Random; +import common.tags.Tag; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.Facing; import common.world.World; diff --git a/common/src/main/java/common/network/PacketBuffer.java b/common/src/main/java/common/network/PacketBuffer.java index 0e5a14a..78992c5 100755 --- a/common/src/main/java/common/network/PacketBuffer.java +++ b/common/src/main/java/common/network/PacketBuffer.java @@ -5,14 +5,14 @@ import java.nio.charset.Charset; import common.init.ItemRegistry; import common.item.ItemStack; -import common.nbt.TagLoader; -import common.nbt.SizeTracker; -import common.nbt.TagObject; import common.net.buffer.ByteBuf; import common.net.buffer.ByteBufInputStream; import common.net.buffer.ByteBufOutputStream; import common.net.handler.codec.DecoderException; import common.net.handler.codec.EncoderException; +import common.tags.SizeTracker; +import common.tags.TagLoader; +import common.tags.TagObject; import common.util.BlockPos; public class PacketBuffer { diff --git a/common/src/main/java/common/packet/SPacketJoinGame.java b/common/src/main/java/common/packet/SPacketJoinGame.java index 647258a..2c77683 100755 --- a/common/src/main/java/common/packet/SPacketJoinGame.java +++ b/common/src/main/java/common/packet/SPacketJoinGame.java @@ -3,10 +3,10 @@ package common.packet; import java.io.IOException; import common.dimension.Dimension; -import common.nbt.TagObject; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; +import common.tags.TagObject; public class SPacketJoinGame implements Packet { private int entityId; diff --git a/common/src/main/java/common/packet/SPacketRespawn.java b/common/src/main/java/common/packet/SPacketRespawn.java index f599779..08f012a 100755 --- a/common/src/main/java/common/packet/SPacketRespawn.java +++ b/common/src/main/java/common/packet/SPacketRespawn.java @@ -3,10 +3,10 @@ package common.packet; import java.io.IOException; import common.dimension.Dimension; -import common.nbt.TagObject; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; +import common.tags.TagObject; public class SPacketRespawn implements Packet { diff --git a/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java b/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java index 51133fe..d309ebf 100755 --- a/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java +++ b/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java @@ -3,10 +3,10 @@ package common.packet; import java.io.IOException; import common.entity.Entity; -import common.nbt.TagObject; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; +import common.tags.TagObject; import common.world.World; public class SPacketUpdateEntityNBT implements Packet diff --git a/common/src/main/java/common/packet/SPacketUpdateTileEntity.java b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java index 137e6a2..e75585a 100755 --- a/common/src/main/java/common/packet/SPacketUpdateTileEntity.java +++ b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java @@ -3,10 +3,10 @@ package common.packet; import java.io.IOException; import common.init.TileRegistry; -import common.nbt.TagObject; import common.network.IClientPlayer; import common.network.Packet; import common.network.PacketBuffer; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; diff --git a/common/src/main/java/common/potion/PotionEffect.java b/common/src/main/java/common/potion/PotionEffect.java index 31a1cc5..4cf0f76 100755 --- a/common/src/main/java/common/potion/PotionEffect.java +++ b/common/src/main/java/common/potion/PotionEffect.java @@ -2,7 +2,7 @@ package common.potion; import common.entity.types.EntityLiving; import common.log.Log; -import common.nbt.TagObject; +import common.tags.TagObject; public class PotionEffect { private final Potion potion; diff --git a/common/src/main/java/common/nbt/SizeTracker.java b/common/src/main/java/common/tags/SizeTracker.java similarity index 95% rename from common/src/main/java/common/nbt/SizeTracker.java rename to common/src/main/java/common/tags/SizeTracker.java index e583b14..04345e0 100755 --- a/common/src/main/java/common/nbt/SizeTracker.java +++ b/common/src/main/java/common/tags/SizeTracker.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class SizeTracker { public static final SizeTracker INFINITE = new SizeTracker(0) { diff --git a/common/src/main/java/common/nbt/Tag.java b/common/src/main/java/common/tags/Tag.java similarity index 98% rename from common/src/main/java/common/nbt/Tag.java rename to common/src/main/java/common/tags/Tag.java index 0be932b..5d464c7 100755 --- a/common/src/main/java/common/nbt/Tag.java +++ b/common/src/main/java/common/tags/Tag.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagByte.java b/common/src/main/java/common/tags/TagByte.java similarity index 98% rename from common/src/main/java/common/nbt/TagByte.java rename to common/src/main/java/common/tags/TagByte.java index 13b9349..500d7af 100755 --- a/common/src/main/java/common/nbt/TagByte.java +++ b/common/src/main/java/common/tags/TagByte.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagByteArray.java b/common/src/main/java/common/tags/TagByteArray.java similarity index 98% rename from common/src/main/java/common/nbt/TagByteArray.java rename to common/src/main/java/common/tags/TagByteArray.java index 9adaf82..0579c12 100755 --- a/common/src/main/java/common/nbt/TagByteArray.java +++ b/common/src/main/java/common/tags/TagByteArray.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagDouble.java b/common/src/main/java/common/tags/TagDouble.java similarity index 98% rename from common/src/main/java/common/nbt/TagDouble.java rename to common/src/main/java/common/tags/TagDouble.java index 7330b2c..686811a 100755 --- a/common/src/main/java/common/nbt/TagDouble.java +++ b/common/src/main/java/common/tags/TagDouble.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagDoubleList.java b/common/src/main/java/common/tags/TagDoubleList.java similarity index 95% rename from common/src/main/java/common/nbt/TagDoubleList.java rename to common/src/main/java/common/tags/TagDoubleList.java index 620aabf..dad8e01 100644 --- a/common/src/main/java/common/nbt/TagDoubleList.java +++ b/common/src/main/java/common/tags/TagDoubleList.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class TagDoubleList extends TagList { protected byte getId() { diff --git a/common/src/main/java/common/nbt/TagException.java b/common/src/main/java/common/tags/TagException.java similarity index 83% rename from common/src/main/java/common/nbt/TagException.java rename to common/src/main/java/common/tags/TagException.java index 697dd6a..b032641 100755 --- a/common/src/main/java/common/nbt/TagException.java +++ b/common/src/main/java/common/tags/TagException.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class TagException extends Exception { public TagException(String message) { diff --git a/common/src/main/java/common/nbt/TagFloat.java b/common/src/main/java/common/tags/TagFloat.java similarity index 98% rename from common/src/main/java/common/nbt/TagFloat.java rename to common/src/main/java/common/tags/TagFloat.java index 4f0d209..24a2cf0 100755 --- a/common/src/main/java/common/nbt/TagFloat.java +++ b/common/src/main/java/common/tags/TagFloat.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagFloatList.java b/common/src/main/java/common/tags/TagFloatList.java similarity index 95% rename from common/src/main/java/common/nbt/TagFloatList.java rename to common/src/main/java/common/tags/TagFloatList.java index 7393920..1c62d1f 100644 --- a/common/src/main/java/common/nbt/TagFloatList.java +++ b/common/src/main/java/common/tags/TagFloatList.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class TagFloatList extends TagList { protected byte getId() { diff --git a/common/src/main/java/common/nbt/TagInt.java b/common/src/main/java/common/tags/TagInt.java similarity index 98% rename from common/src/main/java/common/nbt/TagInt.java rename to common/src/main/java/common/tags/TagInt.java index 77c3cd5..b54cea8 100755 --- a/common/src/main/java/common/nbt/TagInt.java +++ b/common/src/main/java/common/tags/TagInt.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagIntArray.java b/common/src/main/java/common/tags/TagIntArray.java similarity index 98% rename from common/src/main/java/common/nbt/TagIntArray.java rename to common/src/main/java/common/tags/TagIntArray.java index 3617857..56e0626 100755 --- a/common/src/main/java/common/nbt/TagIntArray.java +++ b/common/src/main/java/common/tags/TagIntArray.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagIntArrayList.java b/common/src/main/java/common/tags/TagIntArrayList.java similarity index 95% rename from common/src/main/java/common/nbt/TagIntArrayList.java rename to common/src/main/java/common/tags/TagIntArrayList.java index e0a9ff3..e051872 100644 --- a/common/src/main/java/common/nbt/TagIntArrayList.java +++ b/common/src/main/java/common/tags/TagIntArrayList.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class TagIntArrayList extends TagList { protected byte getId() { diff --git a/common/src/main/java/common/nbt/TagInterpreter.java b/common/src/main/java/common/tags/TagInterpreter.java similarity index 99% rename from common/src/main/java/common/nbt/TagInterpreter.java rename to common/src/main/java/common/tags/TagInterpreter.java index f99f5cb..e500243 100755 --- a/common/src/main/java/common/nbt/TagInterpreter.java +++ b/common/src/main/java/common/tags/TagInterpreter.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.util.Stack; import java.util.regex.Pattern; diff --git a/common/src/main/java/common/nbt/TagList.java b/common/src/main/java/common/tags/TagList.java similarity index 99% rename from common/src/main/java/common/nbt/TagList.java rename to common/src/main/java/common/tags/TagList.java index 4520362..472a29b 100755 --- a/common/src/main/java/common/nbt/TagList.java +++ b/common/src/main/java/common/tags/TagList.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagLoader.java b/common/src/main/java/common/tags/TagLoader.java similarity index 98% rename from common/src/main/java/common/nbt/TagLoader.java rename to common/src/main/java/common/tags/TagLoader.java index 28304d1..d1ffdce 100755 --- a/common/src/main/java/common/nbt/TagLoader.java +++ b/common/src/main/java/common/tags/TagLoader.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/common/src/main/java/common/nbt/TagLong.java b/common/src/main/java/common/tags/TagLong.java similarity index 98% rename from common/src/main/java/common/nbt/TagLong.java rename to common/src/main/java/common/tags/TagLong.java index 9c275ec..7713faa 100755 --- a/common/src/main/java/common/nbt/TagLong.java +++ b/common/src/main/java/common/tags/TagLong.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagNull.java b/common/src/main/java/common/tags/TagNull.java similarity index 95% rename from common/src/main/java/common/nbt/TagNull.java rename to common/src/main/java/common/tags/TagNull.java index 716b10a..caeab7f 100755 --- a/common/src/main/java/common/nbt/TagNull.java +++ b/common/src/main/java/common/tags/TagNull.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagObject.java b/common/src/main/java/common/tags/TagObject.java similarity index 99% rename from common/src/main/java/common/nbt/TagObject.java rename to common/src/main/java/common/tags/TagObject.java index c40f421..c2c764c 100755 --- a/common/src/main/java/common/nbt/TagObject.java +++ b/common/src/main/java/common/tags/TagObject.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagObjectList.java b/common/src/main/java/common/tags/TagObjectList.java similarity index 95% rename from common/src/main/java/common/nbt/TagObjectList.java rename to common/src/main/java/common/tags/TagObjectList.java index b7fd4a3..fb1a78b 100644 --- a/common/src/main/java/common/nbt/TagObjectList.java +++ b/common/src/main/java/common/tags/TagObjectList.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class TagObjectList extends TagList { protected byte getId() { diff --git a/common/src/main/java/common/nbt/TagShort.java b/common/src/main/java/common/tags/TagShort.java similarity index 98% rename from common/src/main/java/common/nbt/TagShort.java rename to common/src/main/java/common/tags/TagShort.java index db84b71..4e14207 100755 --- a/common/src/main/java/common/nbt/TagShort.java +++ b/common/src/main/java/common/tags/TagShort.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagString.java b/common/src/main/java/common/tags/TagString.java similarity index 98% rename from common/src/main/java/common/nbt/TagString.java rename to common/src/main/java/common/tags/TagString.java index 4d9b035..56b8da6 100755 --- a/common/src/main/java/common/nbt/TagString.java +++ b/common/src/main/java/common/tags/TagString.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; import java.io.DataInput; import java.io.DataOutput; diff --git a/common/src/main/java/common/nbt/TagStringList.java b/common/src/main/java/common/tags/TagStringList.java similarity index 95% rename from common/src/main/java/common/nbt/TagStringList.java rename to common/src/main/java/common/tags/TagStringList.java index 6435b63..1f4f89a 100644 --- a/common/src/main/java/common/nbt/TagStringList.java +++ b/common/src/main/java/common/tags/TagStringList.java @@ -1,4 +1,4 @@ -package common.nbt; +package common.tags; public class TagStringList extends TagList { protected byte getId() { diff --git a/common/src/main/java/common/tileentity/LockCode.java b/common/src/main/java/common/tileentity/LockCode.java index bbb70d4..de216f4 100755 --- a/common/src/main/java/common/tileentity/LockCode.java +++ b/common/src/main/java/common/tileentity/LockCode.java @@ -1,6 +1,6 @@ package common.tileentity; -import common.nbt.TagObject; +import common.tags.TagObject; public class LockCode { diff --git a/common/src/main/java/common/tileentity/MachineResource.java b/common/src/main/java/common/tileentity/MachineResource.java index d7e11ac..b56840c 100755 --- a/common/src/main/java/common/tileentity/MachineResource.java +++ b/common/src/main/java/common/tileentity/MachineResource.java @@ -1,6 +1,6 @@ package common.tileentity; -import common.nbt.TagObject; +import common.tags.TagObject; public class MachineResource { public static enum Type { diff --git a/common/src/main/java/common/tileentity/TileEntity.java b/common/src/main/java/common/tileentity/TileEntity.java index 18e3edf..9f7ee5c 100755 --- a/common/src/main/java/common/tileentity/TileEntity.java +++ b/common/src/main/java/common/tileentity/TileEntity.java @@ -4,8 +4,8 @@ import common.block.Block; import common.init.Blocks; import common.init.TileRegistry; import common.log.Log; -import common.nbt.TagObject; import common.network.Packet; +import common.tags.TagObject; import common.util.BlockPos; import common.world.AWorldServer; import common.world.State; diff --git a/common/src/main/java/common/tileentity/TileEntityBanner.java b/common/src/main/java/common/tileentity/TileEntityBanner.java index d4b5a58..d09dff7 100755 --- a/common/src/main/java/common/tileentity/TileEntityBanner.java +++ b/common/src/main/java/common/tileentity/TileEntityBanner.java @@ -8,10 +8,10 @@ import common.color.DyeColor; import common.init.Blocks; import common.init.Items; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.network.Packet; import common.packet.SPacketUpdateTileEntity; +import common.tags.TagObject; +import common.tags.TagObjectList; public class TileEntityBanner extends TileEntity { diff --git a/common/src/main/java/common/tileentity/TileEntityBeacon.java b/common/src/main/java/common/tileentity/TileEntityBeacon.java index 22888c6..7f300b6 100755 --- a/common/src/main/java/common/tileentity/TileEntityBeacon.java +++ b/common/src/main/java/common/tileentity/TileEntityBeacon.java @@ -6,11 +6,11 @@ import common.block.Block; import common.color.DyeColor; import common.entity.types.EntityLiving; import common.init.Blocks; -import common.nbt.TagObject; import common.network.Packet; import common.packet.SPacketUpdateTileEntity; import common.potion.Potion; import common.potion.PotionEffect; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.world.State; diff --git a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java index 159aee5..bd4e701 100755 --- a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java @@ -13,10 +13,10 @@ import common.inventory.InventoryPlayer; import common.item.Item; import common.item.ItemPotion; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.potion.PotionEffect; import common.potion.PotionHelper; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.Facing; import common.world.State; diff --git a/common/src/main/java/common/tileentity/TileEntityChest.java b/common/src/main/java/common/tileentity/TileEntityChest.java index 8ab9cc5..06ca52d 100755 --- a/common/src/main/java/common/tileentity/TileEntityChest.java +++ b/common/src/main/java/common/tileentity/TileEntityChest.java @@ -10,8 +10,8 @@ import common.inventory.IInventory; import common.inventory.InventoryLargeChest; import common.inventory.InventoryPlayer; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.BoundingBox; import common.util.Facing; diff --git a/common/src/main/java/common/tileentity/TileEntityComparator.java b/common/src/main/java/common/tileentity/TileEntityComparator.java index 630c49d..5ce1acc 100755 --- a/common/src/main/java/common/tileentity/TileEntityComparator.java +++ b/common/src/main/java/common/tileentity/TileEntityComparator.java @@ -1,6 +1,6 @@ package common.tileentity; -import common.nbt.TagObject; +import common.tags.TagObject; public class TileEntityComparator extends TileEntity { diff --git a/common/src/main/java/common/tileentity/TileEntityDispenser.java b/common/src/main/java/common/tileentity/TileEntityDispenser.java index 633c52a..46687c6 100755 --- a/common/src/main/java/common/tileentity/TileEntityDispenser.java +++ b/common/src/main/java/common/tileentity/TileEntityDispenser.java @@ -6,9 +6,9 @@ import common.inventory.ContainerDispenser; import common.inventory.IInventory; import common.inventory.InventoryPlayer; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.rng.Random; +import common.tags.TagObject; +import common.tags.TagObjectList; public class TileEntityDispenser extends TileEntityLockable implements IInventory { diff --git a/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java b/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java index 848284e..cca89d9 100755 --- a/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java +++ b/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java @@ -4,8 +4,8 @@ import common.entity.npc.EntityNPC; import common.inventory.Container; import common.inventory.ContainerEnchantment; import common.inventory.InventoryPlayer; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.util.ExtMath; public class TileEntityEnchantmentTable extends TileEntity implements ITickable, IInteractionObject diff --git a/common/src/main/java/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java index 504a803..77284a2 100755 --- a/common/src/main/java/common/tileentity/TileEntityFurnace.java +++ b/common/src/main/java/common/tileentity/TileEntityFurnace.java @@ -23,8 +23,8 @@ import common.item.ItemHoe; import common.item.ItemStack; import common.item.ItemSword; import common.item.ItemTool; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.ExtMath; import common.util.Facing; diff --git a/common/src/main/java/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java index 4cb283c..412bdd3 100755 --- a/common/src/main/java/common/tileentity/TileEntityHopper.java +++ b/common/src/main/java/common/tileentity/TileEntityHopper.java @@ -16,8 +16,8 @@ import common.inventory.IInventory; import common.inventory.ISidedInventory; import common.inventory.InventoryPlayer; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ExtMath; diff --git a/common/src/main/java/common/tileentity/TileEntityLockable.java b/common/src/main/java/common/tileentity/TileEntityLockable.java index 9ac3d65..00575e7 100755 --- a/common/src/main/java/common/tileentity/TileEntityLockable.java +++ b/common/src/main/java/common/tileentity/TileEntityLockable.java @@ -1,6 +1,6 @@ package common.tileentity; -import common.nbt.TagObject; +import common.tags.TagObject; public abstract class TileEntityLockable extends TileEntity implements IInteractionObject, ILockableContainer { diff --git a/common/src/main/java/common/tileentity/TileEntityMachine.java b/common/src/main/java/common/tileentity/TileEntityMachine.java index 5f19596..b2054bc 100755 --- a/common/src/main/java/common/tileentity/TileEntityMachine.java +++ b/common/src/main/java/common/tileentity/TileEntityMachine.java @@ -6,11 +6,11 @@ import common.inventory.Container; import common.inventory.ContainerMachine; import common.inventory.InventoryPlayer; import common.item.ItemStack; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.network.Packet; import common.packet.SPacketUpdateTileEntity; import common.rng.Random; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.ExtMath; public abstract class TileEntityMachine extends TileEntityLockable implements IHopper, ITickable { diff --git a/common/src/main/java/common/tileentity/TileEntityMobSpawner.java b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java index af603fb..71e52a9 100755 --- a/common/src/main/java/common/tileentity/TileEntityMobSpawner.java +++ b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java @@ -6,9 +6,9 @@ import common.init.Blocks; import common.init.Config; import common.init.EntityRegistry; import common.model.ParticleType; -import common.nbt.TagObject; import common.network.Packet; import common.packet.SPacketUpdateTileEntity; +import common.tags.TagObject; import common.util.BlockPos; import common.util.BoundingBox; import common.world.World; diff --git a/common/src/main/java/common/tileentity/TileEntityNote.java b/common/src/main/java/common/tileentity/TileEntityNote.java index 61b2fed..f12ced2 100755 --- a/common/src/main/java/common/tileentity/TileEntityNote.java +++ b/common/src/main/java/common/tileentity/TileEntityNote.java @@ -1,7 +1,7 @@ package common.tileentity; import common.init.Blocks; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ExtMath; import common.world.World; diff --git a/common/src/main/java/common/tileentity/TileEntityPiston.java b/common/src/main/java/common/tileentity/TileEntityPiston.java index 85c2909..9c8328b 100755 --- a/common/src/main/java/common/tileentity/TileEntityPiston.java +++ b/common/src/main/java/common/tileentity/TileEntityPiston.java @@ -6,7 +6,7 @@ import common.collect.Lists; import common.entity.Entity; import common.init.BlockRegistry; import common.init.Blocks; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.BoundingBox; import common.util.Facing; import common.world.State; diff --git a/common/src/main/java/common/tileentity/TileEntitySign.java b/common/src/main/java/common/tileentity/TileEntitySign.java index ed4b8d3..bf4b6ad 100755 --- a/common/src/main/java/common/tileentity/TileEntitySign.java +++ b/common/src/main/java/common/tileentity/TileEntitySign.java @@ -1,9 +1,9 @@ package common.tileentity; import common.entity.npc.EntityNPC; -import common.nbt.TagObject; import common.network.Packet; import common.packet.SPacketUpdateSign; +import common.tags.TagObject; public class TileEntitySign extends TileEntity { public final String[] signText = new String[] {"", "", "", ""}; diff --git a/common/src/main/java/common/tileentity/TileEntitySkull.java b/common/src/main/java/common/tileentity/TileEntitySkull.java index 9d4f759..38c9a43 100755 --- a/common/src/main/java/common/tileentity/TileEntitySkull.java +++ b/common/src/main/java/common/tileentity/TileEntitySkull.java @@ -1,8 +1,8 @@ package common.tileentity; -import common.nbt.TagObject; import common.network.Packet; import common.packet.SPacketUpdateTileEntity; +import common.tags.TagObject; public class TileEntitySkull extends TileEntity { diff --git a/common/src/main/java/common/village/MerchantRecipe.java b/common/src/main/java/common/village/MerchantRecipe.java index 93156ca..d78bc8c 100755 --- a/common/src/main/java/common/village/MerchantRecipe.java +++ b/common/src/main/java/common/village/MerchantRecipe.java @@ -2,7 +2,7 @@ package common.village; import common.item.Item; import common.item.ItemStack; -import common.nbt.TagObject; +import common.tags.TagObject; public class MerchantRecipe { private final ItemStack buying; diff --git a/common/src/main/java/common/village/MerchantRecipeList.java b/common/src/main/java/common/village/MerchantRecipeList.java index 7851013..c1c0971 100755 --- a/common/src/main/java/common/village/MerchantRecipeList.java +++ b/common/src/main/java/common/village/MerchantRecipeList.java @@ -3,9 +3,9 @@ package common.village; import java.util.ArrayList; import common.item.ItemStack; -import common.nbt.Tag; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.Tag; +import common.tags.TagObject; +import common.tags.TagObjectList; public class MerchantRecipeList extends ArrayList { public MerchantRecipe canUse(ItemStack stack1, ItemStack stack2, int index) { diff --git a/common/src/main/java/common/village/Village.java b/common/src/main/java/common/village/Village.java index bd0351b..3997a44 100755 --- a/common/src/main/java/common/village/Village.java +++ b/common/src/main/java/common/village/Village.java @@ -7,8 +7,8 @@ import common.block.Block; import common.block.Material; import common.block.artificial.BlockDoor; import common.collect.Lists; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.world.AWorldServer; diff --git a/common/src/main/java/common/world/AWorldClient.java b/common/src/main/java/common/world/AWorldClient.java index 51a57ae..32a595f 100644 --- a/common/src/main/java/common/world/AWorldClient.java +++ b/common/src/main/java/common/world/AWorldClient.java @@ -2,7 +2,7 @@ package common.world; import common.dimension.Dimension; import common.init.SoundEvent; -import common.nbt.TagObject; +import common.tags.TagObject; public abstract class AWorldClient extends World { protected AWorldClient(Dimension dim, boolean debug) { diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java index 59c29b0..adff5f2 100755 --- a/server/src/main/java/server/Server.java +++ b/server/src/main/java/server/Server.java @@ -43,10 +43,6 @@ import common.init.Registry; import common.init.UniverseRegistry; import common.init.Config.ValueType; import common.log.Log; -import common.nbt.TagLoader; -import common.nbt.TagObject; -import common.nbt.TagDoubleList; -import common.nbt.TagFloatList; import common.net.bootstrap.ServerBootstrap; import common.net.channel.Channel; import common.net.channel.ChannelException; @@ -84,6 +80,10 @@ import common.packet.SPacketSkin; import common.packet.SPacketTimeUpdate; import common.packet.SPacketWorld; import common.potion.PotionEffect; +import common.tags.TagDoubleList; +import common.tags.TagFloatList; +import common.tags.TagLoader; +import common.tags.TagObject; import common.util.BlockPos; import common.util.EncryptUtil; import common.util.ExtMath; diff --git a/server/src/main/java/server/clipboard/ClipboardBlock.java b/server/src/main/java/server/clipboard/ClipboardBlock.java index c536b90..77cdb58 100755 --- a/server/src/main/java/server/clipboard/ClipboardBlock.java +++ b/server/src/main/java/server/clipboard/ClipboardBlock.java @@ -1,6 +1,6 @@ package server.clipboard; -import common.nbt.TagObject; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.world.State; diff --git a/server/src/main/java/server/command/TagParser.java b/server/src/main/java/server/command/TagParser.java index 2672b2b..5955e70 100644 --- a/server/src/main/java/server/command/TagParser.java +++ b/server/src/main/java/server/command/TagParser.java @@ -1,8 +1,8 @@ package server.command; -import common.nbt.TagException; -import common.nbt.TagInterpreter; -import common.nbt.TagObject; +import common.tags.TagException; +import common.tags.TagInterpreter; +import common.tags.TagObject; public class TagParser extends DefaultingParser { public TagParser(String name, TagObject def, Object ... completions) { diff --git a/server/src/main/java/server/command/commands/CommandBlock.java b/server/src/main/java/server/command/commands/CommandBlock.java index 5d2107a..3f4f907 100644 --- a/server/src/main/java/server/command/commands/CommandBlock.java +++ b/server/src/main/java/server/command/commands/CommandBlock.java @@ -2,7 +2,7 @@ package server.command.commands; import java.util.Collection; import common.init.BlockRegistry; -import common.nbt.TagObject; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; import common.world.State; diff --git a/server/src/main/java/server/command/commands/CommandRegister.java b/server/src/main/java/server/command/commands/CommandRegister.java index 4d545e2..8722b67 100644 --- a/server/src/main/java/server/command/commands/CommandRegister.java +++ b/server/src/main/java/server/command/commands/CommandRegister.java @@ -2,8 +2,8 @@ package server.command.commands; import common.color.TextColor; import common.init.Config; -import common.nbt.TagObject; import common.network.IPlayer; +import common.tags.TagObject; import server.command.Command; import server.command.CommandEnvironment; import server.command.Executor; diff --git a/server/src/main/java/server/command/commands/CommandSpawn.java b/server/src/main/java/server/command/commands/CommandSpawn.java index a49ded1..b95a7d5 100644 --- a/server/src/main/java/server/command/commands/CommandSpawn.java +++ b/server/src/main/java/server/command/commands/CommandSpawn.java @@ -8,7 +8,7 @@ import common.collect.Sets; import common.entity.Entity; import common.entity.types.EntityLiving; import common.init.EntityRegistry; -import common.nbt.TagObject; +import common.tags.TagObject; import common.util.Util; import common.util.Vec3; import server.command.Command; diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 8886ae9..79bfa35 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -46,9 +46,6 @@ import common.item.ItemArmor; import common.item.ItemControl; import common.item.ItemStack; import common.log.Log; -import common.nbt.TagObject; -import common.nbt.TagDoubleList; -import common.nbt.TagObjectList; import common.net.util.concurrent.Future; import common.net.util.concurrent.GenericFutureListener; import common.network.IPlayer; @@ -104,6 +101,9 @@ import common.packet.CPacketAction.Action; import common.packet.SPacketMessage.Type; import common.potion.Potion; import common.potion.PotionEffect; +import common.tags.TagDoubleList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.IInteractionObject; import common.tileentity.ILockableContainer; import common.tileentity.TileEntity; diff --git a/server/src/main/java/server/village/VillageCollection.java b/server/src/main/java/server/village/VillageCollection.java index 262465d..d58896c 100755 --- a/server/src/main/java/server/village/VillageCollection.java +++ b/server/src/main/java/server/village/VillageCollection.java @@ -7,8 +7,8 @@ import common.block.Block; import common.block.Material; import common.block.artificial.BlockDoor; import common.collect.Lists; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.BlockPos; import common.util.Facing; import common.village.Village; diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index e1a0ab2..ea12fce 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -67,12 +67,12 @@ import common.init.EntityRegistry; import common.init.TileRegistry; import common.init.UniverseRegistry; import common.log.Log; -import common.nbt.TagLoader; -import common.nbt.TagObject; -import common.nbt.TagDoubleList; -import common.nbt.TagFloatList; -import common.nbt.TagObjectList; import common.rng.Random; +import common.tags.TagDoubleList; +import common.tags.TagFloatList; +import common.tags.TagLoader; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.TileEntity; import common.tileentity.TileEntityBanner; import common.tileentity.TileEntityBeacon; diff --git a/server/src/main/java/server/world/Region.java b/server/src/main/java/server/world/Region.java index 5af05a1..2982357 100755 --- a/server/src/main/java/server/world/Region.java +++ b/server/src/main/java/server/world/Region.java @@ -25,10 +25,10 @@ import common.entity.Entity; import common.init.BlockRegistry; import common.init.EntityRegistry; import common.log.Log; -import common.nbt.TagLoader; -import common.nbt.SizeTracker; -import common.nbt.TagObject; -import common.nbt.TagObjectList; +import common.tags.SizeTracker; +import common.tags.TagLoader; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.NextTickListEntry; diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 9cfeae2..218b0c3 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -40,9 +40,6 @@ import common.init.UniverseRegistry; import common.item.ItemDoor; import common.log.Log; import common.model.ParticleType; -import common.nbt.TagLoader; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.network.IPlayer; import common.network.Packet; import common.packet.SPacketEntityStatus; @@ -59,6 +56,9 @@ import common.packet.SPacketBlockChange; import common.packet.SPacketMultiBlockChange; import common.rng.Random; import common.rng.WeightedList; +import common.tags.TagLoader; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.BoundingBox; diff --git a/server/src/main/java/server/worldgen/structure/MapGenStructure.java b/server/src/main/java/server/worldgen/structure/MapGenStructure.java index b800737..ec35bb3 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenStructure.java +++ b/server/src/main/java/server/worldgen/structure/MapGenStructure.java @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.Map; import common.collect.Maps; -import common.nbt.Tag; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.Tag; +import common.tags.TagObject; import common.util.BlockPos; import common.util.ChunkPos; import common.util.LongHashMap; diff --git a/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java b/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java index f572039..fcd2a3c 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java +++ b/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java @@ -4,7 +4,7 @@ import java.util.Map; import common.collect.Maps; import common.log.Log; -import common.nbt.TagObject; +import common.tags.TagObject; import server.world.WorldServer; public class MapGenStructureIO diff --git a/server/src/main/java/server/worldgen/structure/MapGenVillage.java b/server/src/main/java/server/worldgen/structure/MapGenVillage.java index 64ee560..e80571f 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenVillage.java +++ b/server/src/main/java/server/worldgen/structure/MapGenVillage.java @@ -5,8 +5,8 @@ import java.util.Set; import common.biome.Biome; import common.collect.Sets; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import server.world.WorldServer; public class MapGenVillage extends MapGenStructure diff --git a/server/src/main/java/server/worldgen/structure/StructureBridge.java b/server/src/main/java/server/worldgen/structure/StructureBridge.java index f53e66b..3059307 100755 --- a/server/src/main/java/server/worldgen/structure/StructureBridge.java +++ b/server/src/main/java/server/worldgen/structure/StructureBridge.java @@ -4,8 +4,8 @@ import java.util.List; import common.collect.Lists; import common.init.Blocks; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; import common.util.BlockPos; diff --git a/server/src/main/java/server/worldgen/structure/StructureComponent.java b/server/src/main/java/server/worldgen/structure/StructureComponent.java index c3d7856..60fba28 100755 --- a/server/src/main/java/server/worldgen/structure/StructureComponent.java +++ b/server/src/main/java/server/worldgen/structure/StructureComponent.java @@ -8,9 +8,9 @@ import common.block.artificial.BlockDoor; import common.init.Blocks; import common.item.ItemDoor; import common.item.RngLoot; -import common.nbt.TagObject; import common.rng.Random; import common.rng.WeightedList; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.tileentity.TileEntityChest; import common.tileentity.TileEntityDispenser; diff --git a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java index eca0d3a..2692d4f 100755 --- a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java +++ b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java @@ -7,10 +7,10 @@ import common.entity.item.EntityChestCart; import common.init.Blocks; import common.init.Items; import common.item.RngLoot; -import common.nbt.TagObject; -import common.nbt.TagIntArrayList; import common.rng.Random; import common.rng.WeightedList; +import common.tags.TagIntArrayList; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; import common.util.BlockPos; diff --git a/server/src/main/java/server/worldgen/structure/StructureScattered.java b/server/src/main/java/server/worldgen/structure/StructureScattered.java index 28dc0d1..9ee26eb 100755 --- a/server/src/main/java/server/worldgen/structure/StructureScattered.java +++ b/server/src/main/java/server/worldgen/structure/StructureScattered.java @@ -13,8 +13,8 @@ import common.init.Blocks; import common.init.Config; import common.init.Items; import common.item.RngLoot; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.util.BlockPos; import common.util.Facing; import server.world.WorldServer; diff --git a/server/src/main/java/server/worldgen/structure/StructureStart.java b/server/src/main/java/server/worldgen/structure/StructureStart.java index f2c235b..6919ff3 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStart.java +++ b/server/src/main/java/server/worldgen/structure/StructureStart.java @@ -3,9 +3,9 @@ package server.worldgen.structure; import java.util.Iterator; import java.util.LinkedList; -import common.nbt.TagObject; -import common.nbt.TagObjectList; import common.rng.Random; +import common.tags.TagObject; +import common.tags.TagObjectList; import common.util.ChunkPos; import server.world.WorldServer; diff --git a/server/src/main/java/server/worldgen/structure/StructureStronghold.java b/server/src/main/java/server/worldgen/structure/StructureStronghold.java index 69a91d8..55bcaed 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStronghold.java +++ b/server/src/main/java/server/worldgen/structure/StructureStronghold.java @@ -10,8 +10,8 @@ import common.collect.Maps; import common.init.Blocks; import common.init.Items; import common.item.RngLoot; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.tileentity.TileEntity; import common.tileentity.TileEntityMobSpawner; import common.util.BlockPos; diff --git a/server/src/main/java/server/worldgen/structure/StructureVillage.java b/server/src/main/java/server/worldgen/structure/StructureVillage.java index f20257a..e0bd89e 100755 --- a/server/src/main/java/server/worldgen/structure/StructureVillage.java +++ b/server/src/main/java/server/worldgen/structure/StructureVillage.java @@ -16,8 +16,8 @@ import common.entity.npc.EntityHuman; import common.init.BlockRegistry; import common.init.Blocks; import common.init.Config; -import common.nbt.TagObject; import common.rng.Random; +import common.tags.TagObject; import common.util.BlockPos; import common.util.Facing; import common.world.State;