From 72d46bfe724d160462e05143be49fa15c5a5d2b8 Mon Sep 17 00:00:00 2001 From: Sen Date: Sun, 22 Jun 2025 22:14:22 +0200 Subject: [PATCH] cleanup, rename 2 items --- client/src/main/java/client/Client.java | 2 +- .../client/renderer/entity/RenderPotion.java | 2 +- .../client/renderer/layers/LayerArmor.java | 2 +- .../client/renderer/layers/LayerHeldItem.java | 2 +- .../renderer/particle/EntityFirework.java | 2 +- .../java/client/util/PlayerController.java | 2 +- .../main/java/client/world/WorldClient.java | 4 +- .../{blaze_powder.png => blazing_powder.png} | Bin .../items/{ghast_tear.png => tear.png} | Bin common/src/main/java/common/block/Block.java | 2 +- .../common/block/artificial/BlockBed.java | 2 +- .../common/block/artificial/BlockCake.java | 2 +- .../common/block/artificial/BlockDoor.java | 2 +- .../common/block/artificial/BlockFence.java | 4 +- .../block/artificial/BlockFlowerPot.java | 4 +- .../block/artificial/BlockMetalBlock.java | 2 +- .../common/block/artificial/BlockPane.java | 2 +- .../common/block/artificial/BlockSkull.java | 2 +- .../common/block/artificial/BlockSlab.java | 2 +- .../artificial/BlockStainedGlassPane.java | 2 +- .../common/block/artificial/BlockWall.java | 2 +- .../common/block/foliage/BlockCarrot.java | 2 +- .../java/common/block/foliage/BlockCrops.java | 2 +- .../common/block/foliage/BlockDeadBush.java | 2 +- .../block/foliage/BlockDoublePlant.java | 4 +- .../java/common/block/foliage/BlockGrass.java | 2 +- .../block/foliage/BlockHugeMushroom.java | 2 +- .../common/block/foliage/BlockLeaves.java | 4 +- .../common/block/foliage/BlockLilyPad.java | 2 +- .../common/block/foliage/BlockPotato.java | 2 +- .../java/common/block/foliage/BlockReed.java | 2 +- .../java/common/block/foliage/BlockStem.java | 2 +- .../common/block/foliage/BlockTallGrass.java | 4 +- .../java/common/block/foliage/BlockVine.java | 4 +- .../java/common/block/foliage/BlockWart.java | 2 +- .../common/block/natural/BlockMetalOre.java | 2 +- .../java/common/block/natural/BlockSnow.java | 2 +- .../block/tech/BlockBasePressurePlate.java | 2 +- .../common/block/tech/BlockBrewingStand.java | 2 +- .../java/common/block/tech/BlockButton.java | 2 +- .../java/common/block/tech/BlockCauldron.java | 6 +- .../java/common/block/tech/BlockChest.java | 2 +- .../common/block/tech/BlockDispenser.java | 2 +- .../java/common/block/tech/BlockHopper.java | 2 +- .../java/common/block/tech/BlockLever.java | 2 +- .../java/common/block/tech/BlockNuke.java | 2 +- .../common/block/tech/BlockPistonBase.java | 2 +- .../block/tech/BlockRedstoneComparator.java | 2 +- .../block/tech/BlockRedstoneRepeater.java | 2 +- .../common/block/tech/BlockRedstoneWire.java | 2 +- .../main/java/common/block/tech/BlockTNT.java | 2 +- .../java/common/block/tech/BlockTripWire.java | 4 +- .../common/block/tech/BlockTripWireHook.java | 2 +- .../block/tile/BlockBannerStanding.java | 2 +- .../common/block/tile/BlockStandingSign.java | 2 +- .../java/common/enchantment/Enchantment.java | 6 +- .../common/enchantment/EnchantmentType.java | 10 +- .../common/entity/animal/EntityHorse.java | 2 +- .../common/entity/animal/EntityMooshroom.java | 2 +- .../common/entity/animal/EntityOcelot.java | 2 +- .../common/entity/animal/EntitySheep.java | 4 +- .../java/common/entity/animal/EntityWolf.java | 4 +- .../java/common/entity/npc/EntityMage.java | 2 +- .../common/entity/npc/EntityMetalhead.java | 2 +- .../java/common/entity/npc/EntityNPC.java | 14 +-- .../common/entity/projectile/EntityDie.java | 2 +- .../entity/projectile/EntityPotion.java | 2 +- .../common/entity/types/EntityLiving.java | 4 +- .../java/common/init/CraftingRegistry.java | 16 +-- .../main/java/common/init/ItemRegistry.java | 116 +++++++++--------- common/src/main/java/common/init/Items.java | 79 +++++++++++- .../java/common/init/SmeltingRegistry.java | 2 +- .../common/inventory/ContainerPlayer.java | 2 +- .../common/inventory/InventoryPlayer.java | 2 +- .../src/main/java/common/item/ItemStack.java | 1 + .../common/item/{ => block}/ItemBanner.java | 5 +- .../java/common/item/{ => block}/ItemBed.java | 5 +- .../common/item/{ => block}/ItemBlock.java | 5 +- .../common/item/{ => block}/ItemButton.java | 2 +- .../common/item/{ => block}/ItemChest.java | 2 +- .../common/item/{ => block}/ItemCloth.java | 2 +- .../common/item/{ => block}/ItemColored.java | 3 +- .../common/item/{ => block}/ItemDoor.java | 5 +- .../item/{ => block}/ItemDoublePlant.java | 3 +- .../common/item/{ => block}/ItemFence.java | 2 +- .../common/item/{ => block}/ItemLilyPad.java | 3 +- .../item/{ => block}/ItemMetalBlock.java | 3 +- .../common/item/{ => block}/ItemPiston.java | 2 +- .../item/{ => block}/ItemPressurePlate.java | 2 +- .../common/item/{ => block}/ItemRedstone.java | 5 +- .../common/item/{ => block}/ItemSeedFood.java | 5 +- .../common/item/{ => block}/ItemSeeds.java | 5 +- .../common/item/{ => block}/ItemSign.java | 5 +- .../common/item/{ => block}/ItemSlab.java | 3 +- .../item/{ => block}/ItemSmallBlock.java | 4 +- .../common/item/{ => block}/ItemSnow.java | 3 +- .../java/common/item/{ => block}/ItemTNT.java | 3 +- .../common/item/{ => block}/ItemWall.java | 2 +- .../common/item/{ => material}/ItemBook.java | 5 +- .../common/item/{ => material}/ItemDye.java | 5 +- .../{ => material}/ItemEnchantedBook.java | 6 +- .../common/item/{ => material}/ItemMetal.java | 4 +- .../item/{ => material}/ItemNugget.java | 3 +- .../item/{ => material}/ItemRecord.java | 4 +- .../common/item/{ => spawner}/ItemBoat.java | 5 +- .../item/{ => spawner}/ItemMinecart.java | 5 +- .../item/{ => spawner}/ItemMonsterPlacer.java | 5 +- .../item/{ => spawner}/ItemNpcSpawner.java | 5 +- .../java/common/item/{ => tool}/ItemAmmo.java | 6 +- .../common/item/{ => tool}/ItemAppleGold.java | 3 +- .../common/item/{ => tool}/ItemArmor.java | 5 +- .../common/item/{ => tool}/ItemArrow.java | 4 +- .../java/common/item/{ => tool}/ItemAxe.java | 3 +- .../common/item/{ => tool}/ItemBanHammer.java | 3 +- .../common/item/{ => tool}/ItemBoltgun.java | 2 +- .../java/common/item/{ => tool}/ItemBow.java | 6 +- .../common/item/{ => tool}/ItemBucket.java | 5 +- .../item/{ => tool}/ItemBucketMilk.java | 6 +- .../common/item/{ => tool}/ItemCamera.java | 5 +- .../item/{ => tool}/ItemCarrotOnAStick.java | 5 +- .../item/{ => tool}/ItemChargedOrb.java | 5 +- .../java/common/item/{ => tool}/ItemDie.java | 5 +- .../common/item/{ => tool}/ItemDynamite.java | 5 +- .../common/item/{ => tool}/ItemEditWand.java | 6 +- .../java/common/item/{ => tool}/ItemEgg.java | 5 +- .../common/item/{ => tool}/ItemExpBottle.java | 5 +- .../item/{ => tool}/ItemExterminator.java | 4 +- .../common/item/{ => tool}/ItemFireball.java | 5 +- .../common/item/{ => tool}/ItemFirework.java | 4 +- .../item/{ => tool}/ItemFireworkCharge.java | 5 +- .../common/item/{ => tool}/ItemFishFood.java | 3 +- .../item/{ => tool}/ItemFishingRod.java | 5 +- .../item/{ => tool}/ItemFlintAndSteel.java | 5 +- .../java/common/item/{ => tool}/ItemFood.java | 6 +- .../item/{ => tool}/ItemGlassBottle.java | 5 +- .../common/item/{ => tool}/ItemGunBase.java | 6 +- .../java/common/item/{ => tool}/ItemHoe.java | 5 +- .../item/{ => tool}/ItemHorseArmor.java | 4 +- .../common/item/{ => tool}/ItemInfoWand.java | 3 +- .../java/common/item/{ => tool}/ItemKey.java | 3 +- .../java/common/item/{ => tool}/ItemLead.java | 5 +- .../common/item/{ => tool}/ItemLightning.java | 3 +- .../common/item/{ => tool}/ItemMagnet.java | 5 +- .../common/item/{ => tool}/ItemNameTag.java | 5 +- .../common/item/{ => tool}/ItemPickaxe.java | 3 +- .../common/item/{ => tool}/ItemPotion.java | 6 +- .../common/item/{ => tool}/ItemSaddle.java | 5 +- .../common/item/{ => tool}/ItemShears.java | 5 +- .../common/item/{ => tool}/ItemShovel.java | 3 +- .../common/item/{ => tool}/ItemSnowball.java | 5 +- .../java/common/item/{ => tool}/ItemSoup.java | 3 +- .../item/{ => tool}/ItemSpaceNavigator.java | 4 +- .../common/item/{ => tool}/ItemSword.java | 6 +- .../java/common/item/{ => tool}/ItemTool.java | 5 +- .../java/common/item/{ => tool}/ItemWand.java | 6 +- .../item/{ => tool}/ItemWeatherToken.java | 4 +- .../main/java/common/potion/PotionHelper.java | 4 +- .../tileentity/TileEntityBrewingStand.java | 2 +- .../common/tileentity/TileEntityFurnace.java | 10 +- .../tileentity/TileEntityMobSpawner.java | 4 +- .../server/command/commands/CommandTime.java | 2 +- .../src/main/java/server/network/Player.java | 2 +- .../main/java/server/world/WorldServer.java | 2 +- .../structure/StructureComponent.java | 2 +- 164 files changed, 517 insertions(+), 257 deletions(-) rename client/src/main/resources/textures/items/{blaze_powder.png => blazing_powder.png} (100%) rename client/src/main/resources/textures/items/{ghast_tear.png => tear.png} (100%) rename common/src/main/java/common/item/{ => block}/ItemBanner.java (98%) rename common/src/main/java/common/item/{ => block}/ItemBed.java (96%) rename common/src/main/java/common/item/{ => block}/ItemBlock.java (98%) rename common/src/main/java/common/item/{ => block}/ItemButton.java (95%) rename common/src/main/java/common/item/{ => block}/ItemChest.java (94%) rename common/src/main/java/common/item/{ => block}/ItemCloth.java (96%) rename common/src/main/java/common/item/{ => block}/ItemColored.java (89%) rename common/src/main/java/common/item/{ => block}/ItemDoor.java (96%) rename common/src/main/java/common/item/{ => block}/ItemDoublePlant.java (94%) rename common/src/main/java/common/item/{ => block}/ItemFence.java (98%) rename common/src/main/java/common/item/{ => block}/ItemLilyPad.java (97%) rename common/src/main/java/common/item/{ => block}/ItemMetalBlock.java (96%) rename common/src/main/java/common/item/{ => block}/ItemPiston.java (95%) rename common/src/main/java/common/item/{ => block}/ItemPressurePlate.java (96%) rename common/src/main/java/common/item/{ => block}/ItemRedstone.java (93%) rename common/src/main/java/common/item/{ => block}/ItemSeedFood.java (91%) rename common/src/main/java/common/item/{ => block}/ItemSeeds.java (92%) rename common/src/main/java/common/item/{ => block}/ItemSign.java (96%) rename common/src/main/java/common/item/{ => block}/ItemSlab.java (99%) rename common/src/main/java/common/item/{ => block}/ItemSmallBlock.java (95%) rename common/src/main/java/common/item/{ => block}/ItemSnow.java (97%) rename common/src/main/java/common/item/{ => block}/ItemTNT.java (94%) rename common/src/main/java/common/item/{ => block}/ItemWall.java (97%) rename common/src/main/java/common/item/{ => material}/ItemBook.java (81%) rename common/src/main/java/common/item/{ => material}/ItemDye.java (98%) rename common/src/main/java/common/item/{ => material}/ItemEnchantedBook.java (96%) rename common/src/main/java/common/item/{ => material}/ItemMetal.java (94%) rename common/src/main/java/common/item/{ => material}/ItemNugget.java (73%) rename common/src/main/java/common/item/{ => material}/ItemRecord.java (78%) rename common/src/main/java/common/item/{ => spawner}/ItemBoat.java (97%) rename common/src/main/java/common/item/{ => spawner}/ItemMinecart.java (97%) rename common/src/main/java/common/item/{ => spawner}/ItemMonsterPlacer.java (98%) rename common/src/main/java/common/item/{ => spawner}/ItemNpcSpawner.java (98%) rename common/src/main/java/common/item/{ => tool}/ItemAmmo.java (77%) rename common/src/main/java/common/item/{ => tool}/ItemAppleGold.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemArmor.java (98%) rename common/src/main/java/common/item/{ => tool}/ItemArrow.java (88%) rename common/src/main/java/common/item/{ => tool}/ItemAxe.java (82%) rename common/src/main/java/common/item/{ => tool}/ItemBanHammer.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemBoltgun.java (89%) rename common/src/main/java/common/item/{ => tool}/ItemBow.java (96%) rename common/src/main/java/common/item/{ => tool}/ItemBucket.java (99%) rename common/src/main/java/common/item/{ => tool}/ItemBucketMilk.java (93%) rename common/src/main/java/common/item/{ => tool}/ItemCamera.java (86%) rename common/src/main/java/common/item/{ => tool}/ItemCarrotOnAStick.java (94%) rename common/src/main/java/common/item/{ => tool}/ItemChargedOrb.java (98%) rename common/src/main/java/common/item/{ => tool}/ItemDie.java (96%) rename common/src/main/java/common/item/{ => tool}/ItemDynamite.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemEditWand.java (89%) rename common/src/main/java/common/item/{ => tool}/ItemEgg.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemExpBottle.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemExterminator.java (93%) rename common/src/main/java/common/item/{ => tool}/ItemFireball.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemFirework.java (97%) rename common/src/main/java/common/item/{ => tool}/ItemFireworkCharge.java (98%) rename common/src/main/java/common/item/{ => tool}/ItemFishFood.java (98%) rename common/src/main/java/common/item/{ => tool}/ItemFishingRod.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemFlintAndSteel.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemFood.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemGlassBottle.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemGunBase.java (94%) rename common/src/main/java/common/item/{ => tool}/ItemHoe.java (96%) rename common/src/main/java/common/item/{ => tool}/ItemHorseArmor.java (83%) rename common/src/main/java/common/item/{ => tool}/ItemInfoWand.java (93%) rename common/src/main/java/common/item/{ => tool}/ItemKey.java (71%) rename common/src/main/java/common/item/{ => tool}/ItemLead.java (94%) rename common/src/main/java/common/item/{ => tool}/ItemLightning.java (91%) rename common/src/main/java/common/item/{ => tool}/ItemMagnet.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemNameTag.java (89%) rename common/src/main/java/common/item/{ => tool}/ItemPickaxe.java (88%) rename common/src/main/java/common/item/{ => tool}/ItemPotion.java (98%) rename common/src/main/java/common/item/{ => tool}/ItemSaddle.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemShears.java (94%) rename common/src/main/java/common/item/{ => tool}/ItemShovel.java (88%) rename common/src/main/java/common/item/{ => tool}/ItemSnowball.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemSoup.java (92%) rename common/src/main/java/common/item/{ => tool}/ItemSpaceNavigator.java (96%) rename common/src/main/java/common/item/{ => tool}/ItemSword.java (96%) rename common/src/main/java/common/item/{ => tool}/ItemTool.java (94%) rename common/src/main/java/common/item/{ => tool}/ItemWand.java (95%) rename common/src/main/java/common/item/{ => tool}/ItemWeatherToken.java (93%) diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 77036570..6f910bee 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -130,9 +130,9 @@ import common.init.SoundEvent; import common.init.UniverseRegistry; import common.inventory.InventoryPlayer; import common.item.Item; -import common.item.ItemBlock; import common.item.ItemControl; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.log.Log; import common.log.LogLevel; import common.net.bootstrap.Bootstrap; diff --git a/client/src/main/java/client/renderer/entity/RenderPotion.java b/client/src/main/java/client/renderer/entity/RenderPotion.java index 0fb4fa68..705fe9f6 100755 --- a/client/src/main/java/client/renderer/entity/RenderPotion.java +++ b/client/src/main/java/client/renderer/entity/RenderPotion.java @@ -2,8 +2,8 @@ package client.renderer.entity; import common.entity.projectile.EntityPotion; import common.init.Items; -import common.item.ItemPotion; import common.item.ItemStack; +import common.item.tool.ItemPotion; public class RenderPotion extends RenderItemEntity { diff --git a/client/src/main/java/client/renderer/layers/LayerArmor.java b/client/src/main/java/client/renderer/layers/LayerArmor.java index 35f1280d..8f20f0b3 100755 --- a/client/src/main/java/client/renderer/layers/LayerArmor.java +++ b/client/src/main/java/client/renderer/layers/LayerArmor.java @@ -7,8 +7,8 @@ import client.renderer.entity.RendererLivingEntity; import client.renderer.model.ModelArmor; import client.renderer.model.ModelBiped; import common.entity.types.EntityLiving; -import common.item.ItemArmor; import common.item.ItemStack; +import common.item.tool.ItemArmor; public class LayerArmor implements LayerRenderer { diff --git a/client/src/main/java/client/renderer/layers/LayerHeldItem.java b/client/src/main/java/client/renderer/layers/LayerHeldItem.java index 00927e66..2c6bf9e5 100755 --- a/client/src/main/java/client/renderer/layers/LayerHeldItem.java +++ b/client/src/main/java/client/renderer/layers/LayerHeldItem.java @@ -9,8 +9,8 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Items; import common.item.Item; -import common.item.ItemBlock; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.model.Transforms; public class LayerHeldItem implements LayerRenderer diff --git a/client/src/main/java/client/renderer/particle/EntityFirework.java b/client/src/main/java/client/renderer/particle/EntityFirework.java index a92e7479..ee388586 100755 --- a/client/src/main/java/client/renderer/particle/EntityFirework.java +++ b/client/src/main/java/client/renderer/particle/EntityFirework.java @@ -5,7 +5,7 @@ import client.renderer.RenderBuffer; import client.world.WorldClient; import common.entity.Entity; import common.init.SoundEvent; -import common.item.ItemDye; +import common.item.material.ItemDye; import common.tags.TagObject; import java.util.List; import common.util.BoundingBox; diff --git a/client/src/main/java/client/util/PlayerController.java b/client/src/main/java/client/util/PlayerController.java index 13103a48..d3a36abc 100755 --- a/client/src/main/java/client/util/PlayerController.java +++ b/client/src/main/java/client/util/PlayerController.java @@ -9,9 +9,9 @@ import common.entity.npc.EntityNPC; import common.init.BlockRegistry; import common.init.Blocks; import common.init.EntityRegistry; -import common.item.ItemBlock; import common.item.ItemControl; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.packet.CPacketAction; import common.packet.CPacketBreak; import common.packet.CPacketClick; diff --git a/client/src/main/java/client/world/WorldClient.java b/client/src/main/java/client/world/WorldClient.java index 2ba83a93..5d95a282 100755 --- a/client/src/main/java/client/world/WorldClient.java +++ b/client/src/main/java/client/world/WorldClient.java @@ -19,8 +19,8 @@ import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; import common.init.SoundEvent; -import common.item.ItemDye; -import common.item.ItemPotion; +import common.item.material.ItemDye; +import common.item.tool.ItemPotion; import common.log.Log; import common.model.ParticleType; import common.rng.Random; diff --git a/client/src/main/resources/textures/items/blaze_powder.png b/client/src/main/resources/textures/items/blazing_powder.png similarity index 100% rename from client/src/main/resources/textures/items/blaze_powder.png rename to client/src/main/resources/textures/items/blazing_powder.png diff --git a/client/src/main/resources/textures/items/ghast_tear.png b/client/src/main/resources/textures/items/tear.png similarity index 100% rename from client/src/main/resources/textures/items/ghast_tear.png rename to client/src/main/resources/textures/items/tear.png diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index 785aa3f4..4ad6f122 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -27,8 +27,8 @@ import common.entity.types.EntityLiving; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockBed.java b/common/src/main/java/common/block/artificial/BlockBed.java index e49bf659..c1c5093f 100755 --- a/common/src/main/java/common/block/artificial/BlockBed.java +++ b/common/src/main/java/common/block/artificial/BlockBed.java @@ -8,7 +8,7 @@ import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.ItemRegistry; import common.item.Item; -import common.item.ItemBed; +import common.item.block.ItemBed; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockCake.java b/common/src/main/java/common/block/artificial/BlockCake.java index 595991a0..321e4be9 100755 --- a/common/src/main/java/common/block/artificial/BlockCake.java +++ b/common/src/main/java/common/block/artificial/BlockCake.java @@ -6,7 +6,7 @@ import common.entity.npc.EntityNPC; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSmallBlock; +import common.item.block.ItemSmallBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockDoor.java b/common/src/main/java/common/block/artificial/BlockDoor.java index 57c7aee2..9869553f 100755 --- a/common/src/main/java/common/block/artificial/BlockDoor.java +++ b/common/src/main/java/common/block/artificial/BlockDoor.java @@ -10,7 +10,7 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.ItemDoor; +import common.item.block.ItemDoor; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockFence.java b/common/src/main/java/common/block/artificial/BlockFence.java index d087b5b0..49d20250 100755 --- a/common/src/main/java/common/block/artificial/BlockFence.java +++ b/common/src/main/java/common/block/artificial/BlockFence.java @@ -9,8 +9,8 @@ import common.entity.Entity; import common.entity.npc.EntityNPC; import common.item.CheatTab; import common.item.Item; -import common.item.ItemFence; -import common.item.ItemLead; +import common.item.block.ItemFence; +import common.item.tool.ItemLead; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/artificial/BlockFlowerPot.java b/common/src/main/java/common/block/artificial/BlockFlowerPot.java index 468b4938..d61b19ec 100755 --- a/common/src/main/java/common/block/artificial/BlockFlowerPot.java +++ b/common/src/main/java/common/block/artificial/BlockFlowerPot.java @@ -13,9 +13,9 @@ import common.init.ItemRegistry; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; -import common.item.ItemSmallBlock; import common.item.ItemStack; +import common.item.block.ItemBlock; +import common.item.block.ItemSmallBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockMetalBlock.java b/common/src/main/java/common/block/artificial/BlockMetalBlock.java index f609b967..144c4266 100644 --- a/common/src/main/java/common/block/artificial/BlockMetalBlock.java +++ b/common/src/main/java/common/block/artificial/BlockMetalBlock.java @@ -6,7 +6,7 @@ import common.block.SoundType; import common.init.MetalType; import common.item.CheatTab; import common.item.Item; -import common.item.ItemMetalBlock; +import common.item.block.ItemMetalBlock; public class BlockMetalBlock extends Block { private final MetalType metal; diff --git a/common/src/main/java/common/block/artificial/BlockPane.java b/common/src/main/java/common/block/artificial/BlockPane.java index 897ef456..eb1e458f 100755 --- a/common/src/main/java/common/block/artificial/BlockPane.java +++ b/common/src/main/java/common/block/artificial/BlockPane.java @@ -8,7 +8,7 @@ import common.entity.Entity; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; +import common.item.block.ItemBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockSkull.java b/common/src/main/java/common/block/artificial/BlockSkull.java index 30ffb2ec..95d4aea4 100755 --- a/common/src/main/java/common/block/artificial/BlockSkull.java +++ b/common/src/main/java/common/block/artificial/BlockSkull.java @@ -8,7 +8,7 @@ import common.entity.types.EntityLiving; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSmallBlock; +import common.item.block.ItemSmallBlock; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java index dd766ec4..05465077 100755 --- a/common/src/main/java/common/block/artificial/BlockSlab.java +++ b/common/src/main/java/common/block/artificial/BlockSlab.java @@ -10,8 +10,8 @@ import common.entity.Entity; import common.entity.types.EntityLiving; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSlab; import common.item.ItemStack; +import common.item.block.ItemSlab; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java index 5e61dfd3..085f9d4e 100755 --- a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java +++ b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java @@ -4,7 +4,7 @@ import common.block.Material; import common.color.DyeColor; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; +import common.item.block.ItemBlock; import common.model.BlockLayer; import common.properties.Property; import common.world.State; diff --git a/common/src/main/java/common/block/artificial/BlockWall.java b/common/src/main/java/common/block/artificial/BlockWall.java index 6ba37bc8..b3cae5e2 100755 --- a/common/src/main/java/common/block/artificial/BlockWall.java +++ b/common/src/main/java/common/block/artificial/BlockWall.java @@ -8,7 +8,7 @@ import common.collect.Lists; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.item.ItemWall; +import common.item.block.ItemWall; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/foliage/BlockCarrot.java b/common/src/main/java/common/block/foliage/BlockCarrot.java index 28cbc67c..c48ece21 100755 --- a/common/src/main/java/common/block/foliage/BlockCarrot.java +++ b/common/src/main/java/common/block/foliage/BlockCarrot.java @@ -3,7 +3,7 @@ package common.block.foliage; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.ItemSeedFood; +import common.item.block.ItemSeedFood; import common.model.Model; import common.model.ModelProvider; import common.world.State; diff --git a/common/src/main/java/common/block/foliage/BlockCrops.java b/common/src/main/java/common/block/foliage/BlockCrops.java index e3480d9c..dc13aeda 100755 --- a/common/src/main/java/common/block/foliage/BlockCrops.java +++ b/common/src/main/java/common/block/foliage/BlockCrops.java @@ -6,8 +6,8 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSeeds; import common.item.ItemStack; +import common.item.block.ItemSeeds; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/foliage/BlockDeadBush.java b/common/src/main/java/common/block/foliage/BlockDeadBush.java index 2f7c2470..aef7d84d 100755 --- a/common/src/main/java/common/block/foliage/BlockDeadBush.java +++ b/common/src/main/java/common/block/foliage/BlockDeadBush.java @@ -7,8 +7,8 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.tool.ItemShears; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; diff --git a/common/src/main/java/common/block/foliage/BlockDoublePlant.java b/common/src/main/java/common/block/foliage/BlockDoublePlant.java index ed33368f..c9a68559 100755 --- a/common/src/main/java/common/block/foliage/BlockDoublePlant.java +++ b/common/src/main/java/common/block/foliage/BlockDoublePlant.java @@ -11,9 +11,9 @@ import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; import common.item.Item; -import common.item.ItemDoublePlant; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.block.ItemDoublePlant; +import common.item.tool.ItemShears; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/foliage/BlockGrass.java b/common/src/main/java/common/block/foliage/BlockGrass.java index 4ee4f071..0c5aed3b 100755 --- a/common/src/main/java/common/block/foliage/BlockGrass.java +++ b/common/src/main/java/common/block/foliage/BlockGrass.java @@ -7,7 +7,7 @@ import common.color.Colorizer; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.item.ItemColored; +import common.item.block.ItemColored; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/foliage/BlockHugeMushroom.java b/common/src/main/java/common/block/foliage/BlockHugeMushroom.java index 1d9a8d5f..e7ab5ef9 100755 --- a/common/src/main/java/common/block/foliage/BlockHugeMushroom.java +++ b/common/src/main/java/common/block/foliage/BlockHugeMushroom.java @@ -5,7 +5,7 @@ import common.block.Material; import common.entity.types.EntityLiving; import common.init.ItemRegistry; import common.item.Item; -import common.item.ItemBlock; +import common.item.block.ItemBlock; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/foliage/BlockLeaves.java b/common/src/main/java/common/block/foliage/BlockLeaves.java index 469e811b..13c61154 100755 --- a/common/src/main/java/common/block/foliage/BlockLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockLeaves.java @@ -13,9 +13,9 @@ import common.init.ItemRegistry; import common.init.WoodType; import common.item.CheatTab; import common.item.Item; -import common.item.ItemColored; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.block.ItemColored; +import common.item.tool.ItemShears; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; diff --git a/common/src/main/java/common/block/foliage/BlockLilyPad.java b/common/src/main/java/common/block/foliage/BlockLilyPad.java index 9f4a6178..67d27a1c 100755 --- a/common/src/main/java/common/block/foliage/BlockLilyPad.java +++ b/common/src/main/java/common/block/foliage/BlockLilyPad.java @@ -12,7 +12,7 @@ import common.entity.types.EntityLiving; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.item.ItemLilyPad; +import common.item.block.ItemLilyPad; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/foliage/BlockPotato.java b/common/src/main/java/common/block/foliage/BlockPotato.java index 08c289ce..3cf3d08b 100755 --- a/common/src/main/java/common/block/foliage/BlockPotato.java +++ b/common/src/main/java/common/block/foliage/BlockPotato.java @@ -3,8 +3,8 @@ package common.block.foliage; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.ItemSeedFood; import common.item.ItemStack; +import common.item.block.ItemSeedFood; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; diff --git a/common/src/main/java/common/block/foliage/BlockReed.java b/common/src/main/java/common/block/foliage/BlockReed.java index c5a9eef8..fc5b5bc2 100755 --- a/common/src/main/java/common/block/foliage/BlockReed.java +++ b/common/src/main/java/common/block/foliage/BlockReed.java @@ -6,7 +6,7 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSmallBlock; +import common.item.block.ItemSmallBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/foliage/BlockStem.java b/common/src/main/java/common/block/foliage/BlockStem.java index 5b8afb87..3c78fe29 100755 --- a/common/src/main/java/common/block/foliage/BlockStem.java +++ b/common/src/main/java/common/block/foliage/BlockStem.java @@ -6,8 +6,8 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSeeds; import common.item.ItemStack; +import common.item.block.ItemSeeds; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/foliage/BlockTallGrass.java b/common/src/main/java/common/block/foliage/BlockTallGrass.java index c65800b6..95b24c1d 100755 --- a/common/src/main/java/common/block/foliage/BlockTallGrass.java +++ b/common/src/main/java/common/block/foliage/BlockTallGrass.java @@ -6,9 +6,9 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.ItemColored; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.block.ItemColored; +import common.item.tool.ItemShears; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; diff --git a/common/src/main/java/common/block/foliage/BlockVine.java b/common/src/main/java/common/block/foliage/BlockVine.java index 3abc6f6d..46ea9fb7 100755 --- a/common/src/main/java/common/block/foliage/BlockVine.java +++ b/common/src/main/java/common/block/foliage/BlockVine.java @@ -8,9 +8,9 @@ import common.entity.types.EntityLiving; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.item.ItemColored; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.block.ItemColored; +import common.item.tool.ItemShears; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/foliage/BlockWart.java b/common/src/main/java/common/block/foliage/BlockWart.java index ada2e453..eabc28e2 100755 --- a/common/src/main/java/common/block/foliage/BlockWart.java +++ b/common/src/main/java/common/block/foliage/BlockWart.java @@ -6,8 +6,8 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSeeds; import common.item.ItemStack; +import common.item.block.ItemSeeds; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/natural/BlockMetalOre.java b/common/src/main/java/common/block/natural/BlockMetalOre.java index fef681a9..de1b4fb5 100644 --- a/common/src/main/java/common/block/natural/BlockMetalOre.java +++ b/common/src/main/java/common/block/natural/BlockMetalOre.java @@ -3,7 +3,7 @@ package common.block.natural; import common.block.SoundType; import common.init.MetalType; import common.item.Item; -import common.item.ItemMetalBlock; +import common.item.block.ItemMetalBlock; public class BlockMetalOre extends BlockOre { private final MetalType metal; diff --git a/common/src/main/java/common/block/natural/BlockSnow.java b/common/src/main/java/common/block/natural/BlockSnow.java index b95db971..87df8b48 100755 --- a/common/src/main/java/common/block/natural/BlockSnow.java +++ b/common/src/main/java/common/block/natural/BlockSnow.java @@ -7,8 +7,8 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSnow; import common.item.ItemStack; +import common.item.block.ItemSnow; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; diff --git a/common/src/main/java/common/block/tech/BlockBasePressurePlate.java b/common/src/main/java/common/block/tech/BlockBasePressurePlate.java index 83233686..24ed3265 100755 --- a/common/src/main/java/common/block/tech/BlockBasePressurePlate.java +++ b/common/src/main/java/common/block/tech/BlockBasePressurePlate.java @@ -7,7 +7,7 @@ import common.entity.Entity; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemPressurePlate; +import common.item.block.ItemPressurePlate; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; diff --git a/common/src/main/java/common/block/tech/BlockBrewingStand.java b/common/src/main/java/common/block/tech/BlockBrewingStand.java index c06fcc9b..8927d376 100755 --- a/common/src/main/java/common/block/tech/BlockBrewingStand.java +++ b/common/src/main/java/common/block/tech/BlockBrewingStand.java @@ -12,8 +12,8 @@ import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSmallBlock; import common.item.ItemStack; +import common.item.block.ItemSmallBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/tech/BlockButton.java b/common/src/main/java/common/block/tech/BlockButton.java index 06305d60..da5f31a6 100755 --- a/common/src/main/java/common/block/tech/BlockButton.java +++ b/common/src/main/java/common/block/tech/BlockButton.java @@ -13,7 +13,7 @@ import common.entity.types.EntityLiving; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemButton; +import common.item.block.ItemButton; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/tech/BlockCauldron.java b/common/src/main/java/common/block/tech/BlockCauldron.java index 59afb30a..02fed03e 100755 --- a/common/src/main/java/common/block/tech/BlockCauldron.java +++ b/common/src/main/java/common/block/tech/BlockCauldron.java @@ -10,10 +10,10 @@ import common.entity.npc.EntityNPC; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemArmor; -import common.item.ItemBanner; -import common.item.ItemSmallBlock; import common.item.ItemStack; +import common.item.block.ItemBanner; +import common.item.block.ItemSmallBlock; +import common.item.tool.ItemArmor; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/tech/BlockChest.java b/common/src/main/java/common/block/tech/BlockChest.java index 032c1d87..fbbdbdbd 100755 --- a/common/src/main/java/common/block/tech/BlockChest.java +++ b/common/src/main/java/common/block/tech/BlockChest.java @@ -17,8 +17,8 @@ import common.inventory.InventoryHelper; import common.inventory.InventoryLargeChest; import common.item.CheatTab; import common.item.Item; -import common.item.ItemChest; import common.item.ItemStack; +import common.item.block.ItemChest; import common.packet.SPacketSoundEffect; import common.properties.Property; import common.tileentity.ILockableContainer; diff --git a/common/src/main/java/common/block/tech/BlockDispenser.java b/common/src/main/java/common/block/tech/BlockDispenser.java index e6f2e559..d07d327e 100755 --- a/common/src/main/java/common/block/tech/BlockDispenser.java +++ b/common/src/main/java/common/block/tech/BlockDispenser.java @@ -11,8 +11,8 @@ import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java index 4d92132d..af340f7f 100755 --- a/common/src/main/java/common/block/tech/BlockHopper.java +++ b/common/src/main/java/common/block/tech/BlockHopper.java @@ -12,8 +12,8 @@ import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/tech/BlockLever.java b/common/src/main/java/common/block/tech/BlockLever.java index 0718ac50..c2f4a0fa 100755 --- a/common/src/main/java/common/block/tech/BlockLever.java +++ b/common/src/main/java/common/block/tech/BlockLever.java @@ -7,7 +7,7 @@ import common.entity.types.EntityLiving; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; +import common.item.block.ItemBlock; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/tech/BlockNuke.java b/common/src/main/java/common/block/tech/BlockNuke.java index 8a1ef03c..9cd6e926 100755 --- a/common/src/main/java/common/block/tech/BlockNuke.java +++ b/common/src/main/java/common/block/tech/BlockNuke.java @@ -8,7 +8,7 @@ import common.init.Blocks; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; +import common.item.block.ItemBlock; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; diff --git a/common/src/main/java/common/block/tech/BlockPistonBase.java b/common/src/main/java/common/block/tech/BlockPistonBase.java index a7b5cb98..dee52f5f 100755 --- a/common/src/main/java/common/block/tech/BlockPistonBase.java +++ b/common/src/main/java/common/block/tech/BlockPistonBase.java @@ -14,8 +14,8 @@ import common.init.Blocks; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemPiston; import common.item.ItemStack; +import common.item.block.ItemPiston; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/tech/BlockRedstoneComparator.java b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java index 1c8867d1..e4de65f8 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneComparator.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java @@ -9,7 +9,7 @@ import common.init.Items; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSmallBlock; +import common.item.block.ItemSmallBlock; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java index 78496d01..0cde35bb 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java @@ -6,7 +6,7 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemSmallBlock; +import common.item.block.ItemSmallBlock; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/tech/BlockRedstoneWire.java b/common/src/main/java/common/block/tech/BlockRedstoneWire.java index e4c08a8f..a92cb302 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneWire.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneWire.java @@ -11,7 +11,7 @@ import common.collect.Sets; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.ItemRedstone; +import common.item.block.ItemRedstone; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/tech/BlockTNT.java b/common/src/main/java/common/block/tech/BlockTNT.java index 4941775d..6b7dcf2c 100755 --- a/common/src/main/java/common/block/tech/BlockTNT.java +++ b/common/src/main/java/common/block/tech/BlockTNT.java @@ -11,7 +11,7 @@ import common.init.Items; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemTNT; +import common.item.block.ItemTNT; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/tech/BlockTripWire.java b/common/src/main/java/common/block/tech/BlockTripWire.java index 2a6fe8cb..e207c9c0 100755 --- a/common/src/main/java/common/block/tech/BlockTripWire.java +++ b/common/src/main/java/common/block/tech/BlockTripWire.java @@ -10,8 +10,8 @@ import common.init.Blocks; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.item.ItemShears; -import common.item.ItemSmallBlock; +import common.item.block.ItemSmallBlock; +import common.item.tool.ItemShears; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/tech/BlockTripWireHook.java b/common/src/main/java/common/block/tech/BlockTripWireHook.java index 0eec5d2b..8ece2957 100755 --- a/common/src/main/java/common/block/tech/BlockTripWireHook.java +++ b/common/src/main/java/common/block/tech/BlockTripWireHook.java @@ -8,8 +8,8 @@ import common.init.Blocks; import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; -import common.item.ItemBlock; import common.item.ItemStack; +import common.item.block.ItemBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/tile/BlockBannerStanding.java b/common/src/main/java/common/block/tile/BlockBannerStanding.java index d892b6fc..ee1afd9b 100644 --- a/common/src/main/java/common/block/tile/BlockBannerStanding.java +++ b/common/src/main/java/common/block/tile/BlockBannerStanding.java @@ -2,7 +2,7 @@ package common.block.tile; import common.block.Block; import common.item.Item; -import common.item.ItemBanner; +import common.item.block.ItemBanner; import common.properties.Property; import common.util.BlockPos; import common.world.State; diff --git a/common/src/main/java/common/block/tile/BlockStandingSign.java b/common/src/main/java/common/block/tile/BlockStandingSign.java index 0b8d7b82..ba637510 100755 --- a/common/src/main/java/common/block/tile/BlockStandingSign.java +++ b/common/src/main/java/common/block/tile/BlockStandingSign.java @@ -2,7 +2,7 @@ package common.block.tile; import common.block.Block; import common.item.Item; -import common.item.ItemSign; +import common.item.block.ItemSign; import common.properties.Property; import common.properties.PropertyInteger; import common.util.BlockPos; diff --git a/common/src/main/java/common/enchantment/Enchantment.java b/common/src/main/java/common/enchantment/Enchantment.java index 90d69efc..d9058fe6 100755 --- a/common/src/main/java/common/enchantment/Enchantment.java +++ b/common/src/main/java/common/enchantment/Enchantment.java @@ -5,10 +5,10 @@ import common.collect.Maps; import common.entity.DamageSource; import common.entity.Entity; import common.entity.types.EntityLiving; -import common.item.ItemArmor; -import common.item.ItemAxe; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.tool.ItemArmor; +import common.item.tool.ItemAxe; +import common.item.tool.ItemShears; import common.rng.Random; import common.util.Displayable; import common.util.ExtMath; diff --git a/common/src/main/java/common/enchantment/EnchantmentType.java b/common/src/main/java/common/enchantment/EnchantmentType.java index 22ea489d..10264403 100755 --- a/common/src/main/java/common/enchantment/EnchantmentType.java +++ b/common/src/main/java/common/enchantment/EnchantmentType.java @@ -2,11 +2,11 @@ package common.enchantment; import common.attributes.UsageSlot; import common.item.Item; -import common.item.ItemArmor; -import common.item.ItemBow; -import common.item.ItemFishingRod; -import common.item.ItemSword; -import common.item.ItemTool; +import common.item.tool.ItemArmor; +import common.item.tool.ItemBow; +import common.item.tool.ItemFishingRod; +import common.item.tool.ItemSword; +import common.item.tool.ItemTool; public enum EnchantmentType { diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index e58770da..725a7e62 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -26,8 +26,8 @@ import common.inventory.AnimalChest; import common.inventory.IInvBasic; import common.inventory.InventoryBasic; import common.item.Item; -import common.item.ItemMonsterPlacer; import common.item.ItemStack; +import common.item.spawner.ItemMonsterPlacer; import common.model.ParticleType; import common.pathfinding.PathNavigateGround; import common.potion.Potion; diff --git a/common/src/main/java/common/entity/animal/EntityMooshroom.java b/common/src/main/java/common/entity/animal/EntityMooshroom.java index 76747d4e..a6ec2a91 100755 --- a/common/src/main/java/common/entity/animal/EntityMooshroom.java +++ b/common/src/main/java/common/entity/animal/EntityMooshroom.java @@ -6,8 +6,8 @@ import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.Items; import common.init.SoundEvent; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.tool.ItemShears; import common.model.ParticleType; 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 cffd3289..067bf705 100755 --- a/common/src/main/java/common/entity/animal/EntityOcelot.java +++ b/common/src/main/java/common/entity/animal/EntityOcelot.java @@ -23,8 +23,8 @@ import common.entity.types.EntityTameable; import common.init.Items; import common.init.SoundEvent; import common.item.Item; -import common.item.ItemFishFood; import common.item.ItemStack; +import common.item.tool.ItemFishFood; import common.pathfinding.PathNavigateGround; import common.tags.TagObject; import common.vars.Vars; diff --git a/common/src/main/java/common/entity/animal/EntitySheep.java b/common/src/main/java/common/entity/animal/EntitySheep.java index 44551e3c..fdd1a843 100755 --- a/common/src/main/java/common/entity/animal/EntitySheep.java +++ b/common/src/main/java/common/entity/animal/EntitySheep.java @@ -26,9 +26,9 @@ import common.init.SoundEvent; import common.inventory.Container; import common.inventory.InventoryCrafting; import common.item.Item; -import common.item.ItemDye; -import common.item.ItemShears; import common.item.ItemStack; +import common.item.material.ItemDye; +import common.item.tool.ItemShears; import common.pathfinding.PathNavigateGround; import common.rng.Random; import common.tags.TagObject; diff --git a/common/src/main/java/common/entity/animal/EntityWolf.java b/common/src/main/java/common/entity/animal/EntityWolf.java index 8aa922b4..a923b520 100755 --- a/common/src/main/java/common/entity/animal/EntityWolf.java +++ b/common/src/main/java/common/entity/animal/EntityWolf.java @@ -26,9 +26,9 @@ import common.entity.types.EntityTameable; import common.init.Items; import common.init.SoundEvent; import common.item.Item; -import common.item.ItemDye; -import common.item.ItemFood; import common.item.ItemStack; +import common.item.material.ItemDye; +import common.item.tool.ItemFood; import common.model.ParticleType; import common.pathfinding.PathNavigateGround; import common.tags.TagObject; diff --git a/common/src/main/java/common/entity/npc/EntityMage.java b/common/src/main/java/common/entity/npc/EntityMage.java index fcfd1d0b..744ece6e 100755 --- a/common/src/main/java/common/entity/npc/EntityMage.java +++ b/common/src/main/java/common/entity/npc/EntityMage.java @@ -5,8 +5,8 @@ import java.util.List; import common.entity.effect.EntityLightning; import common.entity.types.EntityLiving; import common.init.Items; -import common.item.ItemPotion; import common.item.ItemStack; +import common.item.tool.ItemPotion; import common.potion.Potion; import common.potion.PotionEffect; import common.rng.Random; diff --git a/common/src/main/java/common/entity/npc/EntityMetalhead.java b/common/src/main/java/common/entity/npc/EntityMetalhead.java index 0de08411..2d8c592c 100755 --- a/common/src/main/java/common/entity/npc/EntityMetalhead.java +++ b/common/src/main/java/common/entity/npc/EntityMetalhead.java @@ -2,8 +2,8 @@ package common.entity.npc; import common.init.ItemRegistry; import common.init.MetalType; -import common.item.ItemMetal; import common.item.ItemStack; +import common.item.material.ItemMetal; import common.rng.Random; import common.world.World; diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java index 39fa2f46..df9cbdf3 100755 --- a/common/src/main/java/common/entity/npc/EntityNPC.java +++ b/common/src/main/java/common/entity/npc/EntityNPC.java @@ -57,14 +57,14 @@ import common.inventory.InventoryPlayer; import common.inventory.InventoryWarpChest; import common.item.Item; import common.item.ItemAction; -import common.item.ItemArmor; -import common.item.ItemBow; -import common.item.ItemGunBase; -import common.item.ItemHoe; -import common.item.ItemShears; import common.item.ItemStack; -import common.item.ItemSword; -import common.item.ItemTool; +import common.item.tool.ItemArmor; +import common.item.tool.ItemBow; +import common.item.tool.ItemGunBase; +import common.item.tool.ItemHoe; +import common.item.tool.ItemShears; +import common.item.tool.ItemSword; +import common.item.tool.ItemTool; import common.model.ParticleType; import common.network.IClientPlayer; import common.network.IPlayer; diff --git a/common/src/main/java/common/entity/projectile/EntityDie.java b/common/src/main/java/common/entity/projectile/EntityDie.java index 1d191251..a0736634 100755 --- a/common/src/main/java/common/entity/projectile/EntityDie.java +++ b/common/src/main/java/common/entity/projectile/EntityDie.java @@ -6,8 +6,8 @@ import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; import common.entity.types.IObjectData; import common.init.SoundEvent; -import common.item.ItemDie; import common.item.ItemStack; +import common.item.tool.ItemDie; import common.tags.TagObject; import common.util.HitPosition; import common.world.World; diff --git a/common/src/main/java/common/entity/projectile/EntityPotion.java b/common/src/main/java/common/entity/projectile/EntityPotion.java index f430b3d1..e1c36ff4 100755 --- a/common/src/main/java/common/entity/projectile/EntityPotion.java +++ b/common/src/main/java/common/entity/projectile/EntityPotion.java @@ -6,8 +6,8 @@ import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; import common.entity.types.IObjectData; import common.init.Items; -import common.item.ItemPotion; import common.item.ItemStack; +import common.item.tool.ItemPotion; import common.potion.Potion; import common.potion.PotionEffect; import common.tags.TagObject; diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index 46a66ca6..587f197a 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -39,9 +39,9 @@ import common.init.ItemRegistry; import common.init.Items; import common.init.SoundEvent; import common.item.Item; -import common.item.ItemArmor; -import common.item.ItemMonsterPlacer; import common.item.ItemStack; +import common.item.spawner.ItemMonsterPlacer; +import common.item.tool.ItemArmor; import common.model.ParticleType; import common.network.IPlayer; import common.packet.SPacketEntityAttach; diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index 5f4089e1..f7a3368a 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -19,10 +19,10 @@ import common.color.DyeColor; import common.entity.animal.EntitySheep; import common.inventory.InventoryCrafting; import common.item.Item; -import common.item.ItemArmor; -import common.item.ItemBanner; -import common.item.ItemDye; import common.item.ItemStack; +import common.item.block.ItemBanner; +import common.item.material.ItemDye; +import common.item.tool.ItemArmor; import common.tags.TagObject; import common.tileentity.TileEntityBanner; import common.world.World; @@ -147,8 +147,8 @@ public abstract class CraftingRegistry add(new ItemStack(Items.pumpkin_stem, 4), "M", 'M', Blocks.pumpkin); addShapeless(new ItemStack(Items.pumpkin_pie), Blocks.pumpkin, Items.sugar, Items.egg); addShapeless(new ItemStack(Items.fermented_spider_eye), Items.spider_eye, Blocks.brown_mushroom, Items.sugar); - addShapeless(new ItemStack(Items.blaze_powder, 2), Items.blaze_rod); - addShapeless(new ItemStack(Items.magma_cream), Items.blaze_powder, Items.slime_ball); + addShapeless(new ItemStack(Items.blazing_powder, 2), Items.blaze_rod); + addShapeless(new ItemStack(Items.magma_cream), Items.blazing_powder, Items.slime_ball); add(new ItemStack(Blocks.trapped_chest), "#-", '#', Blocks.chest, '-', Blocks.tripwire_hook); add(new ItemStack(Blocks.warp_chest), "###", "#E#", "###", '#', Blocks.obsidian, 'E', Items.charged_orb); @@ -335,9 +335,9 @@ public abstract class CraftingRegistry add(new ItemStack(Blocks.sticky_piston, 1), "S", "P", 'S', Items.slime_ball, 'P', Blocks.piston); add(new ItemStack(Blocks.enchanting_table, 1), " B ", "D#D", "###", '#', Blocks.obsidian, 'B', Items.book, 'D', Items.diamond); add(new ItemStack(Blocks.anvil, 1), "III", " i ", "iii", 'I', Blocks.iron_block, 'i', Items.iron_ingot); - addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blaze_powder); - addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blaze_powder, Items.coal); - addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blaze_powder, Items.charcoal); + addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blazing_powder); + addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blazing_powder, Items.coal); + addShapeless(new ItemStack(Items.fire_charge, 3), Items.gunpowder, Items.blazing_powder, Items.charcoal); add(new ItemStack(Blocks.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Blocks.chest); diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java index d590685c..8431da77 100755 --- a/common/src/main/java/common/init/ItemRegistry.java +++ b/common/src/main/java/common/init/ItemRegistry.java @@ -15,70 +15,70 @@ import common.entity.npc.CharacterInfo; import common.entity.npc.SpeciesInfo; import common.item.CheatTab; import common.item.Item; -import common.item.ItemAmmo; -import common.item.ItemAppleGold; -import common.item.ItemArmor; -import common.item.ItemArrow; -import common.item.ItemAxe; -import common.item.ItemBanHammer; -import common.item.ItemBlock; -import common.item.ItemBoat; -import common.item.ItemBoltgun; -import common.item.ItemBook; -import common.item.ItemBow; -import common.item.ItemBucket; -import common.item.ItemBucketMilk; -import common.item.ItemCamera; -import common.item.ItemCarrotOnAStick; -import common.item.ItemChargedOrb; -import common.item.ItemDie; -import common.item.ItemDye; -import common.item.ItemDynamite; -import common.item.ItemEditWand; import common.item.ItemEffect; -import common.item.ItemEgg; -import common.item.ItemEnchantedBook; -import common.item.ItemExpBottle; -import common.item.ItemExterminator; -import common.item.ItemFireball; -import common.item.ItemFirework; -import common.item.ItemFireworkCharge; -import common.item.ItemFishFood; -import common.item.ItemFishingRod; -import common.item.ItemFlintAndSteel; -import common.item.ItemFood; import common.item.ItemFragile; -import common.item.ItemGlassBottle; -import common.item.ItemHoe; -import common.item.ItemHorseArmor; -import common.item.ItemInfoWand; -import common.item.ItemKey; -import common.item.ItemLead; -import common.item.ItemLightning; -import common.item.ItemMagnet; import common.item.ItemMagnetic; -import common.item.ItemMetal; -import common.item.ItemMinecart; -import common.item.ItemMonsterPlacer; -import common.item.ItemNameTag; -import common.item.ItemNpcSpawner; -import common.item.ItemNugget; -import common.item.ItemPickaxe; -import common.item.ItemPotion; -import common.item.ItemRecord; import common.item.ItemRod; -import common.item.ItemSaddle; -import common.item.ItemShears; import common.item.ItemSmall; -import common.item.ItemSnowball; -import common.item.ItemSoup; -import common.item.ItemSpaceNavigator; -import common.item.ItemShovel; import common.item.ItemStack; import common.item.ItemStick; -import common.item.ItemSword; import common.item.ItemTiny; -import common.item.ItemWeatherToken; +import common.item.block.ItemBlock; +import common.item.material.ItemBook; +import common.item.material.ItemDye; +import common.item.material.ItemEnchantedBook; +import common.item.material.ItemMetal; +import common.item.material.ItemNugget; +import common.item.material.ItemRecord; +import common.item.spawner.ItemBoat; +import common.item.spawner.ItemMinecart; +import common.item.spawner.ItemMonsterPlacer; +import common.item.spawner.ItemNpcSpawner; +import common.item.tool.ItemAmmo; +import common.item.tool.ItemAppleGold; +import common.item.tool.ItemArmor; +import common.item.tool.ItemArrow; +import common.item.tool.ItemAxe; +import common.item.tool.ItemBanHammer; +import common.item.tool.ItemBoltgun; +import common.item.tool.ItemBow; +import common.item.tool.ItemBucket; +import common.item.tool.ItemBucketMilk; +import common.item.tool.ItemCamera; +import common.item.tool.ItemCarrotOnAStick; +import common.item.tool.ItemChargedOrb; +import common.item.tool.ItemDie; +import common.item.tool.ItemDynamite; +import common.item.tool.ItemEditWand; +import common.item.tool.ItemEgg; +import common.item.tool.ItemExpBottle; +import common.item.tool.ItemExterminator; +import common.item.tool.ItemFireball; +import common.item.tool.ItemFirework; +import common.item.tool.ItemFireworkCharge; +import common.item.tool.ItemFishFood; +import common.item.tool.ItemFishingRod; +import common.item.tool.ItemFlintAndSteel; +import common.item.tool.ItemFood; +import common.item.tool.ItemGlassBottle; +import common.item.tool.ItemHoe; +import common.item.tool.ItemHorseArmor; +import common.item.tool.ItemInfoWand; +import common.item.tool.ItemKey; +import common.item.tool.ItemLead; +import common.item.tool.ItemLightning; +import common.item.tool.ItemMagnet; +import common.item.tool.ItemNameTag; +import common.item.tool.ItemPickaxe; +import common.item.tool.ItemPotion; +import common.item.tool.ItemSaddle; +import common.item.tool.ItemShears; +import common.item.tool.ItemShovel; +import common.item.tool.ItemSnowball; +import common.item.tool.ItemSoup; +import common.item.tool.ItemSpaceNavigator; +import common.item.tool.ItemSword; +import common.item.tool.ItemWeatherToken; import common.log.Log; import common.potion.Potion; import common.potion.PotionHelper; @@ -272,7 +272,7 @@ public abstract class ItemRegistry { registerItem("rotten_flesh", (new ItemFood(4, true)).setDisplay("Verrottetes Fleisch")); registerItem("orb", (new ItemFragile()).setDisplay("Kugel").setTab(CheatTab.TOOLS)); registerItem("blaze_rod", (new ItemRod()).setDisplay("Lohenrute").setTab(CheatTab.MATERIALS).setMaxAmount(256)); - registerItem("ghast_tear", (new ItemTiny()).setDisplay("Ghastträne").setPotionEffect(PotionHelper.ghastTearEffect).setTab(CheatTab.MATERIALS).setMaxAmount(256)); + registerItem("tear", (new ItemTiny()).setDisplay("Träne").setPotionEffect(PotionHelper.tearEffect).setTab(CheatTab.MATERIALS).setMaxAmount(256)); registerItem("gold_nugget", (new ItemNugget()).setDisplay("Goldnugget").setTab(CheatTab.METALS).setMaxAmount(256)); for(int data : ItemPotion.getValidDataValues()) { ItemPotion potion = new ItemPotion(data); @@ -283,7 +283,7 @@ public abstract class ItemRegistry { .setPotionEffect(PotionHelper.spiderEyeEffect).setMaxAmount(128)); registerItem("fermented_spider_eye", (new Item()).setDisplay("Fermentiertes Spinnenauge") .setPotionEffect(PotionHelper.fermentedSpiderEyeEffect).setTab(CheatTab.MISC).setMaxAmount(128)); - registerItem("blaze_powder", (new Item()).setDisplay("Lohenstaub").setPotionEffect(PotionHelper.blazePowderEffect) + registerItem("blazing_powder", (new Item()).setDisplay("Glühender Staub").setPotionEffect(PotionHelper.blazingPowderEffect) .setTab(CheatTab.MATERIALS).setMaxAmount(256)); registerItem("magma_cream", (new Item()).setDisplay("Magmacreme").setPotionEffect(PotionHelper.magmaCreamEffect).setTab(CheatTab.MATERIALS).setMaxAmount(128)); registerItem("charged_orb", (new ItemChargedOrb()).setDisplay("Geladene Kugel")); diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index def067d4..8dc94a20 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -11,6 +11,81 @@ import java.util.Set; import common.collect.Lists; import common.collect.Sets; import common.item.*; +import common.item.block.ItemBanner; +import common.item.block.ItemBed; +import common.item.block.ItemBlock; +import common.item.block.ItemButton; +import common.item.block.ItemChest; +import common.item.block.ItemColored; +import common.item.block.ItemDoor; +import common.item.block.ItemDoublePlant; +import common.item.block.ItemFence; +import common.item.block.ItemLilyPad; +import common.item.block.ItemMetalBlock; +import common.item.block.ItemPiston; +import common.item.block.ItemPressurePlate; +import common.item.block.ItemRedstone; +import common.item.block.ItemSeedFood; +import common.item.block.ItemSeeds; +import common.item.block.ItemSign; +import common.item.block.ItemSlab; +import common.item.block.ItemSmallBlock; +import common.item.block.ItemSnow; +import common.item.block.ItemWall; +import common.item.material.ItemBook; +import common.item.material.ItemDye; +import common.item.material.ItemEnchantedBook; +import common.item.material.ItemMetal; +import common.item.material.ItemNugget; +import common.item.material.ItemRecord; +import common.item.spawner.ItemBoat; +import common.item.spawner.ItemMinecart; +import common.item.spawner.ItemMonsterPlacer; +import common.item.spawner.ItemNpcSpawner; +import common.item.tool.ItemAmmo; +import common.item.tool.ItemAppleGold; +import common.item.tool.ItemArmor; +import common.item.tool.ItemAxe; +import common.item.tool.ItemBanHammer; +import common.item.tool.ItemBoltgun; +import common.item.tool.ItemBow; +import common.item.tool.ItemBucket; +import common.item.tool.ItemBucketMilk; +import common.item.tool.ItemCamera; +import common.item.tool.ItemCarrotOnAStick; +import common.item.tool.ItemChargedOrb; +import common.item.tool.ItemDie; +import common.item.tool.ItemDynamite; +import common.item.tool.ItemEditWand; +import common.item.tool.ItemEgg; +import common.item.tool.ItemExpBottle; +import common.item.tool.ItemExterminator; +import common.item.tool.ItemFireball; +import common.item.tool.ItemFirework; +import common.item.tool.ItemFireworkCharge; +import common.item.tool.ItemFishFood; +import common.item.tool.ItemFishingRod; +import common.item.tool.ItemFlintAndSteel; +import common.item.tool.ItemFood; +import common.item.tool.ItemGlassBottle; +import common.item.tool.ItemHoe; +import common.item.tool.ItemHorseArmor; +import common.item.tool.ItemInfoWand; +import common.item.tool.ItemKey; +import common.item.tool.ItemLead; +import common.item.tool.ItemLightning; +import common.item.tool.ItemMagnet; +import common.item.tool.ItemNameTag; +import common.item.tool.ItemPickaxe; +import common.item.tool.ItemPotion; +import common.item.tool.ItemSaddle; +import common.item.tool.ItemShears; +import common.item.tool.ItemShovel; +import common.item.tool.ItemSnowball; +import common.item.tool.ItemSoup; +import common.item.tool.ItemSpaceNavigator; +import common.item.tool.ItemSword; +import common.item.tool.ItemWeatherToken; import common.util.Util; @@ -116,7 +191,7 @@ public abstract class Items { public static final ItemBlock blackwood_sapling = get("blackwood_sapling"); public static final ItemSlab blackwood_slab = get("blackwood_slab"); public static final ItemBlock blackwood_stairs = get("blackwood_stairs"); - public static final Item blaze_powder = get("blaze_powder"); + public static final Item blazing_powder = get("blazing_powder"); public static final ItemRod blaze_rod = get("blaze_rod"); public static final ItemBlock blood_brick = get("blood_brick"); public static final ItemFence blood_brick_fence = get("blood_brick_fence"); @@ -311,7 +386,7 @@ public abstract class Items { public static final ItemBlock floor_tiles_white = get("floor_tiles_white"); public static final ItemSmallBlock flowerpot = get("flowerpot"); public static final ItemBlock furnace = get("furnace"); - public static final ItemTiny ghast_tear = get("ghast_tear"); + public static final ItemTiny tear = get("tear"); public static final Item ghi_fragment = get("ghi_fragment"); public static final ItemBlock glass = get("glass"); public static final ItemGlassBottle glass_bottle = get("glass_bottle"); diff --git a/common/src/main/java/common/init/SmeltingRegistry.java b/common/src/main/java/common/init/SmeltingRegistry.java index 6c3361f9..121ec7d9 100755 --- a/common/src/main/java/common/init/SmeltingRegistry.java +++ b/common/src/main/java/common/init/SmeltingRegistry.java @@ -6,8 +6,8 @@ import java.util.Map.Entry; import common.block.Block; import common.collect.Maps; import common.item.Item; -import common.item.ItemFishFood; import common.item.ItemStack; +import common.item.tool.ItemFishFood; import java.util.Set; diff --git a/common/src/main/java/common/inventory/ContainerPlayer.java b/common/src/main/java/common/inventory/ContainerPlayer.java index 7db091b2..0de31a07 100755 --- a/common/src/main/java/common/inventory/ContainerPlayer.java +++ b/common/src/main/java/common/inventory/ContainerPlayer.java @@ -7,8 +7,8 @@ import common.attributes.UsageSlot; import common.collect.Lists; import common.entity.npc.EntityNPC; import common.init.CraftingRegistry; -import common.item.ItemArmor; import common.item.ItemStack; +import common.item.tool.ItemArmor; public class ContainerPlayer extends Container { diff --git a/common/src/main/java/common/inventory/InventoryPlayer.java b/common/src/main/java/common/inventory/InventoryPlayer.java index 1d8515a8..d9d4ebeb 100755 --- a/common/src/main/java/common/inventory/InventoryPlayer.java +++ b/common/src/main/java/common/inventory/InventoryPlayer.java @@ -3,8 +3,8 @@ package common.inventory; import common.block.Block; import common.entity.npc.EntityNPC; import common.item.Item; -import common.item.ItemArmor; import common.item.ItemStack; +import common.item.tool.ItemArmor; import common.tags.TagObject; import java.util.List; diff --git a/common/src/main/java/common/item/ItemStack.java b/common/src/main/java/common/item/ItemStack.java index 36805271..3584abb6 100755 --- a/common/src/main/java/common/item/ItemStack.java +++ b/common/src/main/java/common/item/ItemStack.java @@ -16,6 +16,7 @@ import common.enchantment.EnchantmentHelper; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.ItemRegistry; +import common.item.tool.ItemBow; import common.rng.Random; import common.tags.TagObject; import common.util.BlockPos; diff --git a/common/src/main/java/common/item/ItemBanner.java b/common/src/main/java/common/item/block/ItemBanner.java similarity index 98% rename from common/src/main/java/common/item/ItemBanner.java rename to common/src/main/java/common/item/block/ItemBanner.java index 99f6ab5d..55ad0a49 100755 --- a/common/src/main/java/common/item/ItemBanner.java +++ b/common/src/main/java/common/item/block/ItemBanner.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import java.util.List; @@ -10,6 +10,9 @@ import common.color.DyeColor; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; diff --git a/common/src/main/java/common/item/ItemBed.java b/common/src/main/java/common/item/block/ItemBed.java similarity index 96% rename from common/src/main/java/common/item/ItemBed.java rename to common/src/main/java/common/item/block/ItemBed.java index 2134bd9f..d272bf46 100755 --- a/common/src/main/java/common/item/ItemBed.java +++ b/common/src/main/java/common/item/block/ItemBed.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.artificial.BlockBed; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.util.ExtMath; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemBlock.java b/common/src/main/java/common/item/block/ItemBlock.java similarity index 98% rename from common/src/main/java/common/item/ItemBlock.java rename to common/src/main/java/common/item/block/ItemBlock.java index e7f22686..f864eed6 100755 --- a/common/src/main/java/common/item/ItemBlock.java +++ b/common/src/main/java/common/item/block/ItemBlock.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.color.TextColor; @@ -6,6 +6,9 @@ import common.entity.Entity; import common.entity.npc.EntityNPC; import common.init.BlockRegistry; import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; diff --git a/common/src/main/java/common/item/ItemButton.java b/common/src/main/java/common/item/block/ItemButton.java similarity index 95% rename from common/src/main/java/common/item/ItemButton.java rename to common/src/main/java/common/item/block/ItemButton.java index 607d8815..ebb000e7 100755 --- a/common/src/main/java/common/item/ItemButton.java +++ b/common/src/main/java/common/item/block/ItemButton.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.tech.BlockButton; import common.model.Model; diff --git a/common/src/main/java/common/item/ItemChest.java b/common/src/main/java/common/item/block/ItemChest.java similarity index 94% rename from common/src/main/java/common/item/ItemChest.java rename to common/src/main/java/common/item/block/ItemChest.java index 93fd5e91..53509b46 100755 --- a/common/src/main/java/common/item/ItemChest.java +++ b/common/src/main/java/common/item/block/ItemChest.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.model.Model; diff --git a/common/src/main/java/common/item/ItemCloth.java b/common/src/main/java/common/item/block/ItemCloth.java similarity index 96% rename from common/src/main/java/common/item/ItemCloth.java rename to common/src/main/java/common/item/block/ItemCloth.java index 62e4bbf8..74fbef91 100755 --- a/common/src/main/java/common/item/ItemCloth.java +++ b/common/src/main/java/common/item/block/ItemCloth.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.color.DyeColor; diff --git a/common/src/main/java/common/item/ItemColored.java b/common/src/main/java/common/item/block/ItemColored.java similarity index 89% rename from common/src/main/java/common/item/ItemColored.java rename to common/src/main/java/common/item/block/ItemColored.java index 8c69cc88..ba663c02 100755 --- a/common/src/main/java/common/item/ItemColored.java +++ b/common/src/main/java/common/item/block/ItemColored.java @@ -1,6 +1,7 @@ -package common.item; +package common.item.block; import common.block.Block; +import common.item.ItemStack; public class ItemColored extends ItemBlock { diff --git a/common/src/main/java/common/item/ItemDoor.java b/common/src/main/java/common/item/block/ItemDoor.java similarity index 96% rename from common/src/main/java/common/item/ItemDoor.java rename to common/src/main/java/common/item/block/ItemDoor.java index 6a050bec..c045bf60 100755 --- a/common/src/main/java/common/item/ItemDoor.java +++ b/common/src/main/java/common/item/block/ItemDoor.java @@ -1,10 +1,13 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.Material; import common.block.artificial.BlockDoor; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.util.Facing; import common.world.State; diff --git a/common/src/main/java/common/item/ItemDoublePlant.java b/common/src/main/java/common/item/block/ItemDoublePlant.java similarity index 94% rename from common/src/main/java/common/item/ItemDoublePlant.java rename to common/src/main/java/common/item/block/ItemDoublePlant.java index 70987b68..b3fbb867 100755 --- a/common/src/main/java/common/item/ItemDoublePlant.java +++ b/common/src/main/java/common/item/block/ItemDoublePlant.java @@ -1,8 +1,9 @@ -package common.item; +package common.item.block; import common.block.foliage.BlockDoublePlant; import common.block.foliage.BlockDoublePlant.EnumPlantType; import common.color.Colorizer; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/item/ItemFence.java b/common/src/main/java/common/item/block/ItemFence.java similarity index 98% rename from common/src/main/java/common/item/ItemFence.java rename to common/src/main/java/common/item/block/ItemFence.java index a3691e3d..3726574e 100755 --- a/common/src/main/java/common/item/ItemFence.java +++ b/common/src/main/java/common/item/block/ItemFence.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.artificial.BlockFence; diff --git a/common/src/main/java/common/item/ItemLilyPad.java b/common/src/main/java/common/item/block/ItemLilyPad.java similarity index 97% rename from common/src/main/java/common/item/ItemLilyPad.java rename to common/src/main/java/common/item/block/ItemLilyPad.java index 1650934e..65826431 100755 --- a/common/src/main/java/common/item/ItemLilyPad.java +++ b/common/src/main/java/common/item/block/ItemLilyPad.java @@ -1,10 +1,11 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.foliage.BlockLilyPad; import common.block.liquid.BlockLiquid; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.item.ItemStack; import common.util.BlockPos; import common.util.HitPosition; import common.world.State; diff --git a/common/src/main/java/common/item/ItemMetalBlock.java b/common/src/main/java/common/item/block/ItemMetalBlock.java similarity index 96% rename from common/src/main/java/common/item/ItemMetalBlock.java rename to common/src/main/java/common/item/block/ItemMetalBlock.java index a6531b27..21eb1c65 100755 --- a/common/src/main/java/common/item/ItemMetalBlock.java +++ b/common/src/main/java/common/item/block/ItemMetalBlock.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import java.util.List; import java.util.Map; @@ -8,6 +8,7 @@ import common.block.Block; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.MetalType; +import common.item.ItemStack; public class ItemMetalBlock extends ItemBlock { private final MetalType metal; diff --git a/common/src/main/java/common/item/ItemPiston.java b/common/src/main/java/common/item/block/ItemPiston.java similarity index 95% rename from common/src/main/java/common/item/ItemPiston.java rename to common/src/main/java/common/item/block/ItemPiston.java index 4da7a6ad..a602ef6d 100755 --- a/common/src/main/java/common/item/ItemPiston.java +++ b/common/src/main/java/common/item/block/ItemPiston.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.init.Blocks; diff --git a/common/src/main/java/common/item/ItemPressurePlate.java b/common/src/main/java/common/item/block/ItemPressurePlate.java similarity index 96% rename from common/src/main/java/common/item/ItemPressurePlate.java rename to common/src/main/java/common/item/block/ItemPressurePlate.java index 3338435c..cb655c82 100755 --- a/common/src/main/java/common/item/ItemPressurePlate.java +++ b/common/src/main/java/common/item/block/ItemPressurePlate.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.tech.BlockBasePressurePlate; diff --git a/common/src/main/java/common/item/ItemRedstone.java b/common/src/main/java/common/item/block/ItemRedstone.java similarity index 93% rename from common/src/main/java/common/item/ItemRedstone.java rename to common/src/main/java/common/item/block/ItemRedstone.java index 585ffbed..7ad6c44c 100755 --- a/common/src/main/java/common/item/ItemRedstone.java +++ b/common/src/main/java/common/item/block/ItemRedstone.java @@ -1,9 +1,12 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.tech.BlockRedstoneWire; import common.entity.Entity; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.util.Facing; import common.world.World; diff --git a/common/src/main/java/common/item/ItemSeedFood.java b/common/src/main/java/common/item/block/ItemSeedFood.java similarity index 91% rename from common/src/main/java/common/item/ItemSeedFood.java rename to common/src/main/java/common/item/block/ItemSeedFood.java index e7f7fb14..49ce4e7e 100755 --- a/common/src/main/java/common/item/ItemSeedFood.java +++ b/common/src/main/java/common/item/block/ItemSeedFood.java @@ -1,7 +1,10 @@ -package common.item; +package common.item.block; import common.block.Block; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.ItemStack; +import common.item.tool.ItemFood; import common.util.BlockPos; import common.util.Facing; import common.world.World; diff --git a/common/src/main/java/common/item/ItemSeeds.java b/common/src/main/java/common/item/block/ItemSeeds.java similarity index 92% rename from common/src/main/java/common/item/ItemSeeds.java rename to common/src/main/java/common/item/block/ItemSeeds.java index 6604c202..3ebd2a0d 100755 --- a/common/src/main/java/common/item/ItemSeeds.java +++ b/common/src/main/java/common/item/block/ItemSeeds.java @@ -1,7 +1,10 @@ -package common.item; +package common.item.block; import common.block.Block; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Transforms; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemSign.java b/common/src/main/java/common/item/block/ItemSign.java similarity index 96% rename from common/src/main/java/common/item/ItemSign.java rename to common/src/main/java/common/item/block/ItemSign.java index 60dd14b2..3880e593 100755 --- a/common/src/main/java/common/item/ItemSign.java +++ b/common/src/main/java/common/item/block/ItemSign.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.tile.BlockSign; @@ -6,6 +6,9 @@ import common.block.tile.BlockStandingSign; import common.block.tile.BlockWallSign; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.tileentity.TileEntitySign; import common.util.BlockPos; diff --git a/common/src/main/java/common/item/ItemSlab.java b/common/src/main/java/common/item/block/ItemSlab.java similarity index 99% rename from common/src/main/java/common/item/ItemSlab.java rename to common/src/main/java/common/item/block/ItemSlab.java index 043a0cc3..55431153 100755 --- a/common/src/main/java/common/item/ItemSlab.java +++ b/common/src/main/java/common/item/block/ItemSlab.java @@ -1,8 +1,9 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.artificial.BlockSlab; import common.entity.npc.EntityNPC; +import common.item.ItemStack; import common.util.BlockPos; import common.util.Facing; import common.world.State; diff --git a/common/src/main/java/common/item/ItemSmallBlock.java b/common/src/main/java/common/item/block/ItemSmallBlock.java similarity index 95% rename from common/src/main/java/common/item/ItemSmallBlock.java rename to common/src/main/java/common/item/block/ItemSmallBlock.java index a311d637..97ca2e2f 100755 --- a/common/src/main/java/common/item/ItemSmallBlock.java +++ b/common/src/main/java/common/item/block/ItemSmallBlock.java @@ -1,9 +1,11 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.natural.BlockSnow; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.util.Facing; import common.world.State; diff --git a/common/src/main/java/common/item/ItemSnow.java b/common/src/main/java/common/item/block/ItemSnow.java similarity index 97% rename from common/src/main/java/common/item/ItemSnow.java rename to common/src/main/java/common/item/block/ItemSnow.java index a1bb1954..8731b961 100755 --- a/common/src/main/java/common/item/ItemSnow.java +++ b/common/src/main/java/common/item/block/ItemSnow.java @@ -1,8 +1,9 @@ -package common.item; +package common.item.block; import common.block.Block; import common.block.natural.BlockSnow; import common.entity.npc.EntityNPC; +import common.item.ItemStack; import common.util.BlockPos; import common.util.BoundingBox; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemTNT.java b/common/src/main/java/common/item/block/ItemTNT.java similarity index 94% rename from common/src/main/java/common/item/ItemTNT.java rename to common/src/main/java/common/item/block/ItemTNT.java index 42894b79..ea000439 100644 --- a/common/src/main/java/common/item/ItemTNT.java +++ b/common/src/main/java/common/item/block/ItemTNT.java @@ -1,10 +1,11 @@ -package common.item; +package common.item.block; import common.block.tech.BlockTNT; import common.color.TextColor; import common.entity.item.EntityTnt; import common.entity.types.EntityLiving; import common.init.SoundEvent; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemWall.java b/common/src/main/java/common/item/block/ItemWall.java similarity index 97% rename from common/src/main/java/common/item/ItemWall.java rename to common/src/main/java/common/item/block/ItemWall.java index 50b9893c..7b900079 100755 --- a/common/src/main/java/common/item/ItemWall.java +++ b/common/src/main/java/common/item/block/ItemWall.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.block; import common.block.artificial.BlockWall; import common.model.Model; diff --git a/common/src/main/java/common/item/ItemBook.java b/common/src/main/java/common/item/material/ItemBook.java similarity index 81% rename from common/src/main/java/common/item/ItemBook.java rename to common/src/main/java/common/item/material/ItemBook.java index 16c714e3..d9539c30 100755 --- a/common/src/main/java/common/item/ItemBook.java +++ b/common/src/main/java/common/item/material/ItemBook.java @@ -1,4 +1,7 @@ -package common.item; +package common.item.material; + +import common.item.Item; +import common.item.ItemStack; public class ItemBook extends Item { diff --git a/common/src/main/java/common/item/ItemDye.java b/common/src/main/java/common/item/material/ItemDye.java similarity index 98% rename from common/src/main/java/common/item/ItemDye.java rename to common/src/main/java/common/item/material/ItemDye.java index 4d116a1b..ddb6bd2d 100755 --- a/common/src/main/java/common/item/ItemDye.java +++ b/common/src/main/java/common/item/material/ItemDye.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.material; import common.block.Block; import common.block.artificial.BlockBed; @@ -9,6 +9,9 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.BlockRegistry; import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; diff --git a/common/src/main/java/common/item/ItemEnchantedBook.java b/common/src/main/java/common/item/material/ItemEnchantedBook.java similarity index 96% rename from common/src/main/java/common/item/ItemEnchantedBook.java rename to common/src/main/java/common/item/material/ItemEnchantedBook.java index 762d62e8..c1b5636f 100755 --- a/common/src/main/java/common/item/ItemEnchantedBook.java +++ b/common/src/main/java/common/item/material/ItemEnchantedBook.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.material; import java.util.List; @@ -9,6 +9,10 @@ import common.enchantment.EnchantmentHelper; import common.enchantment.RngEnchantment; import common.entity.npc.EntityNPC; import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.item.RngLoot; import common.rng.Random; import common.tags.TagObject; diff --git a/common/src/main/java/common/item/ItemMetal.java b/common/src/main/java/common/item/material/ItemMetal.java similarity index 94% rename from common/src/main/java/common/item/ItemMetal.java rename to common/src/main/java/common/item/material/ItemMetal.java index 58656dca..b8cff889 100755 --- a/common/src/main/java/common/item/ItemMetal.java +++ b/common/src/main/java/common/item/material/ItemMetal.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.material; import java.util.List; import java.util.Map; @@ -7,6 +7,8 @@ import common.attributes.UsageSlot; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.MetalType; +import common.item.Item; +import common.item.ItemStack; public class ItemMetal extends Item { private final MetalType metal; diff --git a/common/src/main/java/common/item/ItemNugget.java b/common/src/main/java/common/item/material/ItemNugget.java similarity index 73% rename from common/src/main/java/common/item/ItemNugget.java rename to common/src/main/java/common/item/material/ItemNugget.java index 2fd2aef5..067dd998 100755 --- a/common/src/main/java/common/item/ItemNugget.java +++ b/common/src/main/java/common/item/material/ItemNugget.java @@ -1,5 +1,6 @@ -package common.item; +package common.item.material; +import common.item.Item; import common.model.Transforms; public class ItemNugget extends Item { diff --git a/common/src/main/java/common/item/ItemRecord.java b/common/src/main/java/common/item/material/ItemRecord.java similarity index 78% rename from common/src/main/java/common/item/ItemRecord.java rename to common/src/main/java/common/item/material/ItemRecord.java index 5f5f032f..76b39b48 100755 --- a/common/src/main/java/common/item/ItemRecord.java +++ b/common/src/main/java/common/item/material/ItemRecord.java @@ -1,5 +1,7 @@ -package common.item; +package common.item.material; +import common.item.CheatTab; +import common.item.Item; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/item/ItemBoat.java b/common/src/main/java/common/item/spawner/ItemBoat.java similarity index 97% rename from common/src/main/java/common/item/ItemBoat.java rename to common/src/main/java/common/item/spawner/ItemBoat.java index 619768d2..b16bcd35 100755 --- a/common/src/main/java/common/item/ItemBoat.java +++ b/common/src/main/java/common/item/spawner/ItemBoat.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.spawner; import java.util.List; @@ -7,6 +7,9 @@ import common.entity.Entity; import common.entity.item.EntityBoat; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.BoundingBox; diff --git a/common/src/main/java/common/item/ItemMinecart.java b/common/src/main/java/common/item/spawner/ItemMinecart.java similarity index 97% rename from common/src/main/java/common/item/ItemMinecart.java rename to common/src/main/java/common/item/spawner/ItemMinecart.java index 2cf59ad8..77e9834a 100755 --- a/common/src/main/java/common/item/ItemMinecart.java +++ b/common/src/main/java/common/item/spawner/ItemMinecart.java @@ -1,9 +1,12 @@ -package common.item; +package common.item.spawner; import common.block.tech.BlockRailBase; import common.entity.item.EntityCart; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemMonsterPlacer.java b/common/src/main/java/common/item/spawner/ItemMonsterPlacer.java similarity index 98% rename from common/src/main/java/common/item/ItemMonsterPlacer.java rename to common/src/main/java/common/item/spawner/ItemMonsterPlacer.java index 0869c28c..5c2dc6f5 100755 --- a/common/src/main/java/common/item/ItemMonsterPlacer.java +++ b/common/src/main/java/common/item/spawner/ItemMonsterPlacer.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.spawner; import java.util.List; @@ -12,6 +12,9 @@ import common.entity.types.EntityLiving; import common.init.EntityInfo; import common.init.EntityRegistry; import common.init.UniverseRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.tileentity.TileEntity; diff --git a/common/src/main/java/common/item/ItemNpcSpawner.java b/common/src/main/java/common/item/spawner/ItemNpcSpawner.java similarity index 98% rename from common/src/main/java/common/item/ItemNpcSpawner.java rename to common/src/main/java/common/item/spawner/ItemNpcSpawner.java index 75386fa0..a266e416 100755 --- a/common/src/main/java/common/item/ItemNpcSpawner.java +++ b/common/src/main/java/common/item/spawner/ItemNpcSpawner.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.spawner; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -14,6 +14,9 @@ import common.entity.npc.EntityNPC.CharacterTypeData; import common.entity.types.EntityLiving; import common.init.EntityRegistry; import common.init.UniverseRegistry; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.tileentity.TileEntity; diff --git a/common/src/main/java/common/item/ItemAmmo.java b/common/src/main/java/common/item/tool/ItemAmmo.java similarity index 77% rename from common/src/main/java/common/item/ItemAmmo.java rename to common/src/main/java/common/item/tool/ItemAmmo.java index c11cc9fc..ffacc2ab 100755 --- a/common/src/main/java/common/item/ItemAmmo.java +++ b/common/src/main/java/common/item/tool/ItemAmmo.java @@ -1,4 +1,8 @@ -package common.item; +package common.item.tool; + +import common.item.CheatTab; +import common.item.ItemMagnetic; +import common.item.ItemStack; public class ItemAmmo extends ItemMagnetic { private final int damage; diff --git a/common/src/main/java/common/item/ItemAppleGold.java b/common/src/main/java/common/item/tool/ItemAppleGold.java similarity index 95% rename from common/src/main/java/common/item/ItemAppleGold.java rename to common/src/main/java/common/item/tool/ItemAppleGold.java index e2e4d597..abae7448 100755 --- a/common/src/main/java/common/item/ItemAppleGold.java +++ b/common/src/main/java/common/item/tool/ItemAppleGold.java @@ -1,7 +1,8 @@ -package common.item; +package common.item.tool; import common.color.TextColor; import common.entity.npc.EntityNPC; +import common.item.ItemStack; import common.potion.Potion; import common.potion.PotionEffect; import common.world.World; diff --git a/common/src/main/java/common/item/ItemArmor.java b/common/src/main/java/common/item/tool/ItemArmor.java similarity index 98% rename from common/src/main/java/common/item/ItemArmor.java rename to common/src/main/java/common/item/tool/ItemArmor.java index 7a778c51..b0f2f163 100755 --- a/common/src/main/java/common/item/ItemArmor.java +++ b/common/src/main/java/common/item/tool/ItemArmor.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import java.util.List; import java.util.Map; @@ -9,6 +9,9 @@ import common.attributes.UsageSlot; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.ToolMaterial; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; diff --git a/common/src/main/java/common/item/ItemArrow.java b/common/src/main/java/common/item/tool/ItemArrow.java similarity index 88% rename from common/src/main/java/common/item/ItemArrow.java rename to common/src/main/java/common/item/tool/ItemArrow.java index 12a0f67c..6ddeef8d 100644 --- a/common/src/main/java/common/item/ItemArrow.java +++ b/common/src/main/java/common/item/tool/ItemArrow.java @@ -1,6 +1,8 @@ -package common.item; +package common.item.tool; import common.entity.projectile.EntityArrow; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemAxe.java b/common/src/main/java/common/item/tool/ItemAxe.java similarity index 82% rename from common/src/main/java/common/item/ItemAxe.java rename to common/src/main/java/common/item/tool/ItemAxe.java index d2230ed1..354f43a8 100755 --- a/common/src/main/java/common/item/ItemAxe.java +++ b/common/src/main/java/common/item/tool/ItemAxe.java @@ -1,7 +1,8 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.init.ToolMaterial; +import common.item.ItemStack; public class ItemAxe extends ItemTool { public ItemAxe(ToolMaterial material) { diff --git a/common/src/main/java/common/item/ItemBanHammer.java b/common/src/main/java/common/item/tool/ItemBanHammer.java similarity index 95% rename from common/src/main/java/common/item/ItemBanHammer.java rename to common/src/main/java/common/item/tool/ItemBanHammer.java index 17d20c12..3c86b2a5 100755 --- a/common/src/main/java/common/item/ItemBanHammer.java +++ b/common/src/main/java/common/item/tool/ItemBanHammer.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import java.util.List; @@ -6,6 +6,7 @@ import common.color.TextColor; import common.entity.DamageSource; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; +import common.item.ItemStack; import common.util.BoundingBox; import common.util.Vec3; import common.world.AWorldServer; diff --git a/common/src/main/java/common/item/ItemBoltgun.java b/common/src/main/java/common/item/tool/ItemBoltgun.java similarity index 89% rename from common/src/main/java/common/item/ItemBoltgun.java rename to common/src/main/java/common/item/tool/ItemBoltgun.java index 4c4f3870..9e95e657 100755 --- a/common/src/main/java/common/item/ItemBoltgun.java +++ b/common/src/main/java/common/item/tool/ItemBoltgun.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import common.init.Items; diff --git a/common/src/main/java/common/item/ItemBow.java b/common/src/main/java/common/item/tool/ItemBow.java similarity index 96% rename from common/src/main/java/common/item/ItemBow.java rename to common/src/main/java/common/item/tool/ItemBow.java index 320dde54..6da38765 100755 --- a/common/src/main/java/common/item/ItemBow.java +++ b/common/src/main/java/common/item/tool/ItemBow.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import common.enchantment.Enchantment; import common.enchantment.EnchantmentHelper; @@ -6,6 +6,10 @@ import common.entity.npc.EntityNPC; import common.entity.projectile.EntityArrow; import common.init.Items; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; import common.model.Transforms; import common.world.World; diff --git a/common/src/main/java/common/item/ItemBucket.java b/common/src/main/java/common/item/tool/ItemBucket.java similarity index 99% rename from common/src/main/java/common/item/ItemBucket.java rename to common/src/main/java/common/item/tool/ItemBucket.java index d5d9466b..13e291a5 100755 --- a/common/src/main/java/common/item/ItemBucket.java +++ b/common/src/main/java/common/item/tool/ItemBucket.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import java.util.ArrayDeque; import java.util.ArrayList; @@ -19,6 +19,9 @@ import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; diff --git a/common/src/main/java/common/item/ItemBucketMilk.java b/common/src/main/java/common/item/tool/ItemBucketMilk.java similarity index 93% rename from common/src/main/java/common/item/ItemBucketMilk.java rename to common/src/main/java/common/item/tool/ItemBucketMilk.java index 6485c168..404de170 100755 --- a/common/src/main/java/common/item/ItemBucketMilk.java +++ b/common/src/main/java/common/item/tool/ItemBucketMilk.java @@ -1,10 +1,14 @@ -package common.item; +package common.item.tool; import java.util.Map; import common.attributes.Attribute; import common.attributes.UsageSlot; import common.entity.npc.EntityNPC; import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; import common.world.World; public class ItemBucketMilk extends Item diff --git a/common/src/main/java/common/item/ItemCamera.java b/common/src/main/java/common/item/tool/ItemCamera.java similarity index 86% rename from common/src/main/java/common/item/ItemCamera.java rename to common/src/main/java/common/item/tool/ItemCamera.java index 6682fc47..852f0bea 100755 --- a/common/src/main/java/common/item/ItemCamera.java +++ b/common/src/main/java/common/item/tool/ItemCamera.java @@ -1,6 +1,9 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; +import common.item.ItemControl; +import common.item.ItemMagnetic; +import common.item.ItemStack; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/item/ItemCarrotOnAStick.java b/common/src/main/java/common/item/tool/ItemCarrotOnAStick.java similarity index 94% rename from common/src/main/java/common/item/ItemCarrotOnAStick.java rename to common/src/main/java/common/item/tool/ItemCarrotOnAStick.java index 580e908c..cd4f44b1 100755 --- a/common/src/main/java/common/item/ItemCarrotOnAStick.java +++ b/common/src/main/java/common/item/tool/ItemCarrotOnAStick.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.animal.EntityPig; import common.entity.npc.EntityNPC; import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Transforms; import common.world.World; diff --git a/common/src/main/java/common/item/ItemChargedOrb.java b/common/src/main/java/common/item/tool/ItemChargedOrb.java similarity index 98% rename from common/src/main/java/common/item/ItemChargedOrb.java rename to common/src/main/java/common/item/tool/ItemChargedOrb.java index 3efa71b3..cb2a1dc4 100755 --- a/common/src/main/java/common/item/ItemChargedOrb.java +++ b/common/src/main/java/common/item/tool/ItemChargedOrb.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import common.block.artificial.BlockPortalFrame; import common.color.TextColor; @@ -7,6 +7,9 @@ import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.ItemFragile; +import common.item.ItemStack; import common.model.ParticleType; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemDie.java b/common/src/main/java/common/item/tool/ItemDie.java similarity index 96% rename from common/src/main/java/common/item/ItemDie.java rename to common/src/main/java/common/item/tool/ItemDie.java index 5223db6b..c45c33ea 100755 --- a/common/src/main/java/common/item/ItemDie.java +++ b/common/src/main/java/common/item/tool/ItemDie.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import java.util.Collection; import java.util.Map; @@ -8,6 +8,9 @@ import common.color.TextColor; import common.entity.npc.EntityNPC; import common.entity.projectile.EntityDie; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; diff --git a/common/src/main/java/common/item/ItemDynamite.java b/common/src/main/java/common/item/tool/ItemDynamite.java similarity index 92% rename from common/src/main/java/common/item/ItemDynamite.java rename to common/src/main/java/common/item/tool/ItemDynamite.java index ed971b0b..a1b03e88 100755 --- a/common/src/main/java/common/item/ItemDynamite.java +++ b/common/src/main/java/common/item/tool/ItemDynamite.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.entity.projectile.EntityDynamite; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.ExtMath; diff --git a/common/src/main/java/common/item/ItemEditWand.java b/common/src/main/java/common/item/tool/ItemEditWand.java similarity index 89% rename from common/src/main/java/common/item/ItemEditWand.java rename to common/src/main/java/common/item/tool/ItemEditWand.java index ccceb58d..1ced388a 100755 --- a/common/src/main/java/common/item/ItemEditWand.java +++ b/common/src/main/java/common/item/tool/ItemEditWand.java @@ -1,6 +1,10 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemControl; +import common.item.ItemStack; import common.model.Transforms; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/item/ItemEgg.java b/common/src/main/java/common/item/tool/ItemEgg.java similarity index 92% rename from common/src/main/java/common/item/ItemEgg.java rename to common/src/main/java/common/item/tool/ItemEgg.java index cc27ea00..7bde8249 100755 --- a/common/src/main/java/common/item/ItemEgg.java +++ b/common/src/main/java/common/item/tool/ItemEgg.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.entity.projectile.EntityEgg; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemExpBottle.java b/common/src/main/java/common/item/tool/ItemExpBottle.java similarity index 92% rename from common/src/main/java/common/item/ItemExpBottle.java rename to common/src/main/java/common/item/tool/ItemExpBottle.java index 152ea4fa..4c6e3e15 100755 --- a/common/src/main/java/common/item/ItemExpBottle.java +++ b/common/src/main/java/common/item/tool/ItemExpBottle.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.item.EntityXpBottle; import common.entity.npc.EntityNPC; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemExterminator.java b/common/src/main/java/common/item/tool/ItemExterminator.java similarity index 93% rename from common/src/main/java/common/item/ItemExterminator.java rename to common/src/main/java/common/item/tool/ItemExterminator.java index 3abe8633..3e66e87c 100755 --- a/common/src/main/java/common/item/ItemExterminator.java +++ b/common/src/main/java/common/item/tool/ItemExterminator.java @@ -1,9 +1,11 @@ -package common.item; +package common.item.tool; import common.color.TextColor; import common.dimension.Space; import common.entity.npc.EntityNPC; import common.init.SoundEvent; +import common.item.ItemMagnetic; +import common.item.ItemStack; import common.world.World; import common.world.AWorldServer; diff --git a/common/src/main/java/common/item/ItemFireball.java b/common/src/main/java/common/item/tool/ItemFireball.java similarity index 92% rename from common/src/main/java/common/item/ItemFireball.java rename to common/src/main/java/common/item/tool/ItemFireball.java index 4cacb31f..198947a4 100755 --- a/common/src/main/java/common/item/ItemFireball.java +++ b/common/src/main/java/common/item/tool/ItemFireball.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.util.Facing; import common.world.World; diff --git a/common/src/main/java/common/item/ItemFirework.java b/common/src/main/java/common/item/tool/ItemFirework.java similarity index 97% rename from common/src/main/java/common/item/ItemFirework.java rename to common/src/main/java/common/item/tool/ItemFirework.java index 5d8b0102..90b25f39 100755 --- a/common/src/main/java/common/item/ItemFirework.java +++ b/common/src/main/java/common/item/tool/ItemFirework.java @@ -1,10 +1,12 @@ -package common.item; +package common.item.tool; import java.util.List; import common.collect.Lists; import common.entity.item.EntityFireworks; import common.entity.npc.EntityNPC; +import common.item.Item; +import common.item.ItemStack; import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; diff --git a/common/src/main/java/common/item/ItemFireworkCharge.java b/common/src/main/java/common/item/tool/ItemFireworkCharge.java similarity index 98% rename from common/src/main/java/common/item/ItemFireworkCharge.java rename to common/src/main/java/common/item/tool/ItemFireworkCharge.java index 6ad5bb11..aeabbcaf 100755 --- a/common/src/main/java/common/item/ItemFireworkCharge.java +++ b/common/src/main/java/common/item/tool/ItemFireworkCharge.java @@ -1,10 +1,13 @@ -package common.item; +package common.item.tool; import java.util.List; import common.color.DyeColor; import common.entity.npc.EntityNPC; import common.entity.projectile.EntityFireCharge; +import common.item.Item; +import common.item.ItemStack; +import common.item.material.ItemDye; import common.model.Model; import common.model.ModelProvider; import common.tags.TagObject; diff --git a/common/src/main/java/common/item/ItemFishFood.java b/common/src/main/java/common/item/tool/ItemFishFood.java similarity index 98% rename from common/src/main/java/common/item/ItemFishFood.java rename to common/src/main/java/common/item/tool/ItemFishFood.java index 3a785a37..cecc8371 100755 --- a/common/src/main/java/common/item/ItemFishFood.java +++ b/common/src/main/java/common/item/tool/ItemFishFood.java @@ -1,6 +1,7 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.potion.Potion; diff --git a/common/src/main/java/common/item/ItemFishingRod.java b/common/src/main/java/common/item/tool/ItemFishingRod.java similarity index 95% rename from common/src/main/java/common/item/ItemFishingRod.java rename to common/src/main/java/common/item/tool/ItemFishingRod.java index 72731eb4..c1e6425c 100755 --- a/common/src/main/java/common/item/ItemFishingRod.java +++ b/common/src/main/java/common/item/tool/ItemFishingRod.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.entity.projectile.EntityHook; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Transforms; import common.world.World; diff --git a/common/src/main/java/common/item/ItemFlintAndSteel.java b/common/src/main/java/common/item/tool/ItemFlintAndSteel.java similarity index 95% rename from common/src/main/java/common/item/ItemFlintAndSteel.java rename to common/src/main/java/common/item/tool/ItemFlintAndSteel.java index 7970cde9..461aa721 100755 --- a/common/src/main/java/common/item/ItemFlintAndSteel.java +++ b/common/src/main/java/common/item/tool/ItemFlintAndSteel.java @@ -1,10 +1,13 @@ -package common.item; +package common.item.tool; import common.block.natural.BlockFire; import common.block.tech.BlockTNT; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemFood.java b/common/src/main/java/common/item/tool/ItemFood.java similarity index 95% rename from common/src/main/java/common/item/ItemFood.java rename to common/src/main/java/common/item/tool/ItemFood.java index 90529048..72e3dfb0 100755 --- a/common/src/main/java/common/item/ItemFood.java +++ b/common/src/main/java/common/item/tool/ItemFood.java @@ -1,7 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; import common.potion.Potion; import common.potion.PotionEffect; import common.world.World; diff --git a/common/src/main/java/common/item/ItemGlassBottle.java b/common/src/main/java/common/item/tool/ItemGlassBottle.java similarity index 95% rename from common/src/main/java/common/item/ItemGlassBottle.java rename to common/src/main/java/common/item/tool/ItemGlassBottle.java index 3b2811cf..7c4d4581 100755 --- a/common/src/main/java/common/item/ItemGlassBottle.java +++ b/common/src/main/java/common/item/tool/ItemGlassBottle.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Items; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; diff --git a/common/src/main/java/common/item/ItemGunBase.java b/common/src/main/java/common/item/tool/ItemGunBase.java similarity index 94% rename from common/src/main/java/common/item/ItemGunBase.java rename to common/src/main/java/common/item/tool/ItemGunBase.java index 4ae5041d..c91efef0 100755 --- a/common/src/main/java/common/item/ItemGunBase.java +++ b/common/src/main/java/common/item/tool/ItemGunBase.java @@ -1,10 +1,14 @@ -package common.item; +package common.item.tool; import common.enchantment.Enchantment; import common.enchantment.EnchantmentHelper; import common.entity.npc.EntityNPC; import common.entity.projectile.EntityBullet; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; import common.model.Transforms; import common.world.World; diff --git a/common/src/main/java/common/item/ItemHoe.java b/common/src/main/java/common/item/tool/ItemHoe.java similarity index 96% rename from common/src/main/java/common/item/ItemHoe.java rename to common/src/main/java/common/item/tool/ItemHoe.java index 2b630181..3e995d79 100755 --- a/common/src/main/java/common/item/ItemHoe.java +++ b/common/src/main/java/common/item/tool/ItemHoe.java @@ -1,9 +1,12 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.ToolMaterial; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Transforms; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemHorseArmor.java b/common/src/main/java/common/item/tool/ItemHorseArmor.java similarity index 83% rename from common/src/main/java/common/item/ItemHorseArmor.java rename to common/src/main/java/common/item/tool/ItemHorseArmor.java index 86d14c20..b99127a2 100755 --- a/common/src/main/java/common/item/ItemHorseArmor.java +++ b/common/src/main/java/common/item/tool/ItemHorseArmor.java @@ -1,6 +1,8 @@ -package common.item; +package common.item.tool; import common.init.ToolMaterial; +import common.item.CheatTab; +import common.item.Item; public class ItemHorseArmor extends Item { private final ToolMaterial material; diff --git a/common/src/main/java/common/item/ItemInfoWand.java b/common/src/main/java/common/item/tool/ItemInfoWand.java similarity index 93% rename from common/src/main/java/common/item/ItemInfoWand.java rename to common/src/main/java/common/item/tool/ItemInfoWand.java index 6370462f..484b7b32 100755 --- a/common/src/main/java/common/item/ItemInfoWand.java +++ b/common/src/main/java/common/item/tool/ItemInfoWand.java @@ -1,8 +1,9 @@ -package common.item; +package common.item.tool; import common.biome.Biome; import common.color.TextColor; import common.entity.npc.EntityNPC; +import common.item.ItemStack; import common.util.BlockPos; import common.util.Vec3; import common.world.AWorldServer; diff --git a/common/src/main/java/common/item/ItemKey.java b/common/src/main/java/common/item/tool/ItemKey.java similarity index 71% rename from common/src/main/java/common/item/ItemKey.java rename to common/src/main/java/common/item/tool/ItemKey.java index 3eef65b8..848efe54 100755 --- a/common/src/main/java/common/item/ItemKey.java +++ b/common/src/main/java/common/item/tool/ItemKey.java @@ -1,5 +1,6 @@ -package common.item; +package common.item.tool; +import common.item.ItemMagnetic; import common.model.Transforms; public class ItemKey extends ItemMagnetic { diff --git a/common/src/main/java/common/item/ItemLead.java b/common/src/main/java/common/item/tool/ItemLead.java similarity index 94% rename from common/src/main/java/common/item/ItemLead.java rename to common/src/main/java/common/item/tool/ItemLead.java index fc914a4e..6d4a3848 100755 --- a/common/src/main/java/common/item/ItemLead.java +++ b/common/src/main/java/common/item/tool/ItemLead.java @@ -1,10 +1,13 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.block.artificial.BlockFence; import common.entity.item.EntityLeashKnot; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.util.BoundingBox; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemLightning.java b/common/src/main/java/common/item/tool/ItemLightning.java similarity index 91% rename from common/src/main/java/common/item/ItemLightning.java rename to common/src/main/java/common/item/tool/ItemLightning.java index 5e2e23be..970c03a1 100755 --- a/common/src/main/java/common/item/ItemLightning.java +++ b/common/src/main/java/common/item/tool/ItemLightning.java @@ -1,7 +1,8 @@ -package common.item; +package common.item.tool; import common.color.TextColor; import common.entity.npc.EntityNPC; +import common.item.ItemStack; import common.util.Vec3; import common.world.AWorldServer; diff --git a/common/src/main/java/common/item/ItemMagnet.java b/common/src/main/java/common/item/tool/ItemMagnet.java similarity index 95% rename from common/src/main/java/common/item/ItemMagnet.java rename to common/src/main/java/common/item/tool/ItemMagnet.java index 53aca673..699c7ce3 100755 --- a/common/src/main/java/common/item/ItemMagnet.java +++ b/common/src/main/java/common/item/tool/ItemMagnet.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import java.util.List; import java.util.function.Predicate; @@ -6,6 +6,9 @@ import java.util.function.Predicate; import common.entity.Entity; import common.entity.animal.EntityChicken; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Transforms; import common.util.BoundingBox; import common.util.Vec3; diff --git a/common/src/main/java/common/item/ItemNameTag.java b/common/src/main/java/common/item/tool/ItemNameTag.java similarity index 89% rename from common/src/main/java/common/item/ItemNameTag.java rename to common/src/main/java/common/item/tool/ItemNameTag.java index 109c2e0d..a8148e06 100755 --- a/common/src/main/java/common/item/ItemNameTag.java +++ b/common/src/main/java/common/item/tool/ItemNameTag.java @@ -1,7 +1,10 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; public class ItemNameTag extends Item { diff --git a/common/src/main/java/common/item/ItemPickaxe.java b/common/src/main/java/common/item/tool/ItemPickaxe.java similarity index 88% rename from common/src/main/java/common/item/ItemPickaxe.java rename to common/src/main/java/common/item/tool/ItemPickaxe.java index 1a2c7bab..d0b54494 100755 --- a/common/src/main/java/common/item/ItemPickaxe.java +++ b/common/src/main/java/common/item/tool/ItemPickaxe.java @@ -1,7 +1,8 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.init.ToolMaterial; +import common.item.ItemStack; public class ItemPickaxe extends ItemTool { public ItemPickaxe(ToolMaterial material) { diff --git a/common/src/main/java/common/item/ItemPotion.java b/common/src/main/java/common/item/tool/ItemPotion.java similarity index 98% rename from common/src/main/java/common/item/ItemPotion.java rename to common/src/main/java/common/item/tool/ItemPotion.java index ac186d53..e17454c3 100755 --- a/common/src/main/java/common/item/ItemPotion.java +++ b/common/src/main/java/common/item/tool/ItemPotion.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import java.util.Collection; import java.util.Iterator; @@ -11,6 +11,10 @@ import common.entity.npc.EntityNPC; import common.entity.projectile.EntityPotion; import common.init.Items; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.potion.Potion; diff --git a/common/src/main/java/common/item/ItemSaddle.java b/common/src/main/java/common/item/tool/ItemSaddle.java similarity index 92% rename from common/src/main/java/common/item/ItemSaddle.java rename to common/src/main/java/common/item/tool/ItemSaddle.java index b25254d5..23f84abe 100755 --- a/common/src/main/java/common/item/ItemSaddle.java +++ b/common/src/main/java/common/item/tool/ItemSaddle.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.animal.EntityPig; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; public class ItemSaddle extends Item { diff --git a/common/src/main/java/common/item/ItemShears.java b/common/src/main/java/common/item/tool/ItemShears.java similarity index 94% rename from common/src/main/java/common/item/ItemShears.java rename to common/src/main/java/common/item/tool/ItemShears.java index d82b517e..314d095f 100755 --- a/common/src/main/java/common/item/ItemShears.java +++ b/common/src/main/java/common/item/tool/ItemShears.java @@ -1,10 +1,13 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.block.Material; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.ToolMaterial; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/item/ItemShovel.java b/common/src/main/java/common/item/tool/ItemShovel.java similarity index 88% rename from common/src/main/java/common/item/ItemShovel.java rename to common/src/main/java/common/item/tool/ItemShovel.java index 5419e23d..ab424953 100755 --- a/common/src/main/java/common/item/ItemShovel.java +++ b/common/src/main/java/common/item/tool/ItemShovel.java @@ -1,8 +1,9 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.block.Material; import common.init.ToolMaterial; +import common.item.ItemStack; public class ItemShovel extends ItemTool { public ItemShovel(ToolMaterial material) { diff --git a/common/src/main/java/common/item/ItemSnowball.java b/common/src/main/java/common/item/tool/ItemSnowball.java similarity index 92% rename from common/src/main/java/common/item/ItemSnowball.java rename to common/src/main/java/common/item/tool/ItemSnowball.java index 535cb787..451562e1 100755 --- a/common/src/main/java/common/item/ItemSnowball.java +++ b/common/src/main/java/common/item/tool/ItemSnowball.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.entity.projectile.EntitySnowball; import common.init.SoundEvent; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/item/ItemSoup.java b/common/src/main/java/common/item/tool/ItemSoup.java similarity index 92% rename from common/src/main/java/common/item/ItemSoup.java rename to common/src/main/java/common/item/tool/ItemSoup.java index 39d7c223..5f69f729 100755 --- a/common/src/main/java/common/item/ItemSoup.java +++ b/common/src/main/java/common/item/tool/ItemSoup.java @@ -1,7 +1,8 @@ -package common.item; +package common.item.tool; import common.entity.npc.EntityNPC; import common.init.Items; +import common.item.ItemStack; import common.model.Transforms; import common.world.World; diff --git a/common/src/main/java/common/item/ItemSpaceNavigator.java b/common/src/main/java/common/item/tool/ItemSpaceNavigator.java similarity index 96% rename from common/src/main/java/common/item/ItemSpaceNavigator.java rename to common/src/main/java/common/item/tool/ItemSpaceNavigator.java index 14633f63..22dd4422 100755 --- a/common/src/main/java/common/item/ItemSpaceNavigator.java +++ b/common/src/main/java/common/item/tool/ItemSpaceNavigator.java @@ -1,10 +1,12 @@ -package common.item; +package common.item.tool; import java.util.List; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.UniverseRegistry; +import common.item.ItemMagnetic; +import common.item.ItemStack; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/item/ItemSword.java b/common/src/main/java/common/item/tool/ItemSword.java similarity index 96% rename from common/src/main/java/common/item/ItemSword.java rename to common/src/main/java/common/item/tool/ItemSword.java index ea1610a3..d3870c22 100755 --- a/common/src/main/java/common/item/ItemSword.java +++ b/common/src/main/java/common/item/tool/ItemSword.java @@ -1,4 +1,4 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.block.Material; @@ -6,6 +6,10 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.ToolMaterial; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; import common.model.Transforms; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/item/ItemTool.java b/common/src/main/java/common/item/tool/ItemTool.java similarity index 94% rename from common/src/main/java/common/item/ItemTool.java rename to common/src/main/java/common/item/tool/ItemTool.java index b287c04c..de42b2c2 100755 --- a/common/src/main/java/common/item/ItemTool.java +++ b/common/src/main/java/common/item/tool/ItemTool.java @@ -1,8 +1,11 @@ -package common.item; +package common.item.tool; import common.block.Block; import common.entity.types.EntityLiving; import common.init.ToolMaterial; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; import common.model.Transforms; import common.util.BlockPos; import common.world.World; diff --git a/common/src/main/java/common/item/ItemWand.java b/common/src/main/java/common/item/tool/ItemWand.java similarity index 95% rename from common/src/main/java/common/item/ItemWand.java rename to common/src/main/java/common/item/tool/ItemWand.java index c5a2017a..721afc8e 100755 --- a/common/src/main/java/common/item/ItemWand.java +++ b/common/src/main/java/common/item/tool/ItemWand.java @@ -1,9 +1,13 @@ -package common.item; +package common.item.tool; import java.util.List; import common.color.TextColor; import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemControl; +import common.item.ItemStack; import common.model.Transforms; import common.util.BlockPos; import common.util.ExtMath; diff --git a/common/src/main/java/common/item/ItemWeatherToken.java b/common/src/main/java/common/item/tool/ItemWeatherToken.java similarity index 93% rename from common/src/main/java/common/item/ItemWeatherToken.java rename to common/src/main/java/common/item/tool/ItemWeatherToken.java index a0937dd2..eeded184 100755 --- a/common/src/main/java/common/item/ItemWeatherToken.java +++ b/common/src/main/java/common/item/tool/ItemWeatherToken.java @@ -1,8 +1,10 @@ -package common.item; +package common.item.tool; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.SoundEvent; +import common.item.ItemMagnetic; +import common.item.ItemStack; import common.world.Weather; import common.world.World; import common.world.AWorldServer; diff --git a/common/src/main/java/common/potion/PotionHelper.java b/common/src/main/java/common/potion/PotionHelper.java index 967a346f..ca1bc498 100755 --- a/common/src/main/java/common/potion/PotionHelper.java +++ b/common/src/main/java/common/potion/PotionHelper.java @@ -13,11 +13,11 @@ public class PotionHelper private static final Integer[] INTEGERS = new Integer[65535]; public static final String sugarEffect = "-0+1-2-3&4-4+13"; - public static final String ghastTearEffect = "+0-1-2-3&4-4+13"; + public static final String tearEffect = "+0-1-2-3&4-4+13"; public static final String spiderEyeEffect = "-0-1+2-3&4-4+13"; public static final String fermentedSpiderEyeEffect = "-0+3-4+13"; public static final String speckledMelonEffect = "+0-1+2-3&4-4+13"; - public static final String blazePowderEffect = "+0-1-2+3&4-4+13"; + public static final String blazingPowderEffect = "+0-1-2+3&4-4+13"; public static final String magmaCreamEffect = "+0+1-2-3&4-4+13"; public static final String redstoneEffect = "-5+6-7"; public static final String glowstoneEffect = "+5-6-7"; diff --git a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java index 4d8950ef..bc154978 100755 --- a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java @@ -12,8 +12,8 @@ import common.inventory.ContainerBrewingStand; import common.inventory.ISidedInventory; import common.inventory.InventoryPlayer; import common.item.Item; -import common.item.ItemPotion; import common.item.ItemStack; +import common.item.tool.ItemPotion; import common.potion.PotionEffect; import common.potion.PotionHelper; import common.tags.TagObject; diff --git a/common/src/main/java/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java index cd25eea3..71755d0b 100755 --- a/common/src/main/java/common/tileentity/TileEntityFurnace.java +++ b/common/src/main/java/common/tileentity/TileEntityFurnace.java @@ -18,12 +18,12 @@ import common.inventory.ISidedInventory; import common.inventory.InventoryPlayer; import common.inventory.SlotFurnaceFuel; import common.item.Item; -import common.item.ItemBlock; -import common.item.ItemBucket; -import common.item.ItemHoe; import common.item.ItemStack; -import common.item.ItemSword; -import common.item.ItemTool; +import common.item.block.ItemBlock; +import common.item.tool.ItemBucket; +import common.item.tool.ItemHoe; +import common.item.tool.ItemSword; +import common.item.tool.ItemTool; import common.tags.TagObject; import java.util.List; import common.util.ExtMath; diff --git a/common/src/main/java/common/tileentity/TileEntityMobSpawner.java b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java index 89ff3d4f..7080a707 100755 --- a/common/src/main/java/common/tileentity/TileEntityMobSpawner.java +++ b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java @@ -3,9 +3,9 @@ package common.tileentity; import common.entity.types.EntityLiving; import common.init.EntityRegistry; import common.inventory.ContainerTile; -import common.item.ItemMonsterPlacer; -import common.item.ItemNpcSpawner; import common.item.ItemStack; +import common.item.spawner.ItemMonsterPlacer; +import common.item.spawner.ItemNpcSpawner; import common.tags.TagObject; import common.vars.Vars; diff --git a/server/src/main/java/server/command/commands/CommandTime.java b/server/src/main/java/server/command/commands/CommandTime.java index bcbbf59f..33d6d55e 100644 --- a/server/src/main/java/server/command/commands/CommandTime.java +++ b/server/src/main/java/server/command/commands/CommandTime.java @@ -1,7 +1,7 @@ package server.command.commands; import common.dimension.Dimension; -import common.item.ItemSpaceNavigator; +import common.item.tool.ItemSpaceNavigator; import common.util.Position; import server.command.Command; import server.command.CommandEnvironment; diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 8b9a84a3..de9b819a 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -41,9 +41,9 @@ import common.inventory.IInventory; import common.inventory.InventoryPlayer; import common.inventory.Slot; import common.inventory.SlotCrafting; -import common.item.ItemArmor; import common.item.ItemControl; import common.item.ItemStack; +import common.item.tool.ItemArmor; import common.log.Log; import common.net.util.concurrent.Future; import common.net.util.concurrent.GenericFutureListener; diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 46db8b6a..a6fc0114 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -37,7 +37,7 @@ import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.SoundEvent; import common.init.UniverseRegistry; -import common.item.ItemDoor; +import common.item.block.ItemDoor; import common.log.Log; import common.model.ParticleType; import common.network.IPlayer; diff --git a/server/src/main/java/server/worldgen/structure/StructureComponent.java b/server/src/main/java/server/worldgen/structure/StructureComponent.java index ab5ab6c8..134f944f 100755 --- a/server/src/main/java/server/worldgen/structure/StructureComponent.java +++ b/server/src/main/java/server/worldgen/structure/StructureComponent.java @@ -6,8 +6,8 @@ import common.block.Block; import common.block.Rotatable; import common.block.artificial.BlockDoor; import common.init.Blocks; -import common.item.ItemDoor; import common.item.RngLoot; +import common.item.block.ItemDoor; import common.rng.Random; import common.rng.WeightedList; import common.tags.TagObject;