diff --git a/src/minecraft/biomesoplenty/ClientProxy.java b/src/minecraft/biomesoplenty/ClientProxy.java index 6db5ef982..a2f016704 100644 --- a/src/minecraft/biomesoplenty/ClientProxy.java +++ b/src/minecraft/biomesoplenty/ClientProxy.java @@ -22,15 +22,15 @@ import biomesoplenty.blocks.renderers.TileEntityGraveRenderer; import biomesoplenty.entities.EntityGlob; import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityRosester; +import biomesoplenty.entities.projectiles.EntityDart; +import biomesoplenty.entities.projectiles.EntityMudball; +import biomesoplenty.entities.render.RenderDart; import biomesoplenty.entities.render.RenderGlob; import biomesoplenty.entities.render.RenderJungleSpider; import biomesoplenty.entities.render.RenderRosester; -import biomesoplenty.items.projectiles.EntityDart; -import biomesoplenty.items.projectiles.EntityMudball; -import biomesoplenty.items.projectiles.RenderDart; import biomesoplenty.particles.EntityDandelionFX; import biomesoplenty.particles.EntitySteamFX; -import biomesoplenty.tileentity.TileEntityGrave; +import biomesoplenty.tileentities.TileEntityGrave; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/minecraft/biomesoplenty/blocks/BlockAltar.java b/src/minecraft/biomesoplenty/blocks/BlockAltar.java index e491c5c88..ef5726a79 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockAltar.java +++ b/src/minecraft/biomesoplenty/blocks/BlockAltar.java @@ -19,7 +19,7 @@ import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; import biomesoplenty.blocks.renderers.RenderUtils; -import biomesoplenty.tileentity.TileEntityAltar; +import biomesoplenty.tileentities.TileEntityAltar; public class BlockAltar extends Block { diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPGlass.java b/src/minecraft/biomesoplenty/blocks/BlockBOPGlass.java index add61fcfc..a8782a4ef 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPGlass.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPGlass.java @@ -21,7 +21,7 @@ import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; -import biomesoplenty.tileentity.TileEntityAltar; +import biomesoplenty.tileentities.TileEntityAltar; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/biomesoplenty/blocks/BlockGrave.java b/src/minecraft/biomesoplenty/blocks/BlockGrave.java index ac1b7ca90..46b51ab6f 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockGrave.java +++ b/src/minecraft/biomesoplenty/blocks/BlockGrave.java @@ -14,7 +14,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; -import biomesoplenty.tileentity.TileEntityGrave; +import biomesoplenty.tileentities.TileEntityGrave; public class BlockGrave extends Block { diff --git a/src/minecraft/biomesoplenty/blocks/renderers/AltarRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/AltarRenderer.java index 29d33c580..5bfbffe2d 100644 --- a/src/minecraft/biomesoplenty/blocks/renderers/AltarRenderer.java +++ b/src/minecraft/biomesoplenty/blocks/renderers/AltarRenderer.java @@ -7,7 +7,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; import biomesoplenty.blocks.BlockAltar; -import biomesoplenty.tileentity.TileEntityAltar; +import biomesoplenty.tileentities.TileEntityAltar; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class AltarRenderer implements ISimpleBlockRenderingHandler diff --git a/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java index b79ae3185..d8a1a695d 100644 --- a/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java +++ b/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import biomesoplenty.blocks.models.ModelGrave0; -import biomesoplenty.tileentity.TileEntityGrave; +import biomesoplenty.tileentities.TileEntityGrave; import cpw.mods.fml.client.FMLClientHandler; public class TileEntityGraveRenderer extends TileEntitySpecialRenderer diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index 556ba0ba4..cfae60497 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -45,35 +45,35 @@ import biomesoplenty.blocks.BlockPromisedPortal; import biomesoplenty.blocks.BlockPuddle; import biomesoplenty.blocks.BlockTreeMoss; import biomesoplenty.blocks.BlockWillow; -import biomesoplenty.items.ItemBOPAltar; +import biomesoplenty.itemblocks.ItemBlockAltar; +import biomesoplenty.itemblocks.ItemBlockAppleLeaves; +import biomesoplenty.itemblocks.ItemBlockBamboo; +import biomesoplenty.itemblocks.ItemBlockBones; +import biomesoplenty.itemblocks.ItemBlockColorizedLeaves; +import biomesoplenty.itemblocks.ItemBlockColorizedSapling; +import biomesoplenty.itemblocks.ItemBlockCoral; +import biomesoplenty.itemblocks.ItemBlockFlower; +import biomesoplenty.itemblocks.ItemBlockFoliage; +import biomesoplenty.itemblocks.ItemBlockGlass; +import biomesoplenty.itemblocks.ItemBlockGrass; +import biomesoplenty.itemblocks.ItemBlockGrave; +import biomesoplenty.itemblocks.ItemBlockLeaves; +import biomesoplenty.itemblocks.ItemBlockLog; +import biomesoplenty.itemblocks.ItemBlockMoss; +import biomesoplenty.itemblocks.ItemBlockMud; +import biomesoplenty.itemblocks.ItemBlockMushroom; +import biomesoplenty.itemblocks.ItemBlockPetals; +import biomesoplenty.itemblocks.ItemBlockPlank; +import biomesoplenty.itemblocks.ItemBlockPlant; +import biomesoplenty.itemblocks.ItemBlockRedRock; +import biomesoplenty.itemblocks.ItemBlockSapling; +import biomesoplenty.itemblocks.ItemBlockSkystone; +import biomesoplenty.itemblocks.ItemBlockSlab; import biomesoplenty.items.ItemBOPAmethyst; -import biomesoplenty.items.ItemBOPAppleLeaves; -import biomesoplenty.items.ItemBOPBamboo; -import biomesoplenty.items.ItemBOPBones; -import biomesoplenty.items.ItemBOPColorizedLeaves; -import biomesoplenty.items.ItemBOPColorizedSapling; -import biomesoplenty.items.ItemBOPCoral; -import biomesoplenty.items.ItemBOPFlower; -import biomesoplenty.items.ItemBOPFoliage; -import biomesoplenty.items.ItemBOPGlass; -import biomesoplenty.items.ItemBOPGrass; -import biomesoplenty.items.ItemBOPGrave; import biomesoplenty.items.ItemBOPIvy; -import biomesoplenty.items.ItemBOPLeaves; -import biomesoplenty.items.ItemBOPLog; -import biomesoplenty.items.ItemBOPMoss; -import biomesoplenty.items.ItemBOPMud; -import biomesoplenty.items.ItemBOPMushroom; -import biomesoplenty.items.ItemBOPPetals; -import biomesoplenty.items.ItemBOPPlank; -import biomesoplenty.items.ItemBOPPlant; -import biomesoplenty.items.ItemBOPRedRock; -import biomesoplenty.items.ItemBOPSapling; -import biomesoplenty.items.ItemBOPSkystone; -import biomesoplenty.items.ItemBOPSlab; import biomesoplenty.items.ItemBOPWillow; -import biomesoplenty.tileentity.TileEntityAltar; -import biomesoplenty.tileentity.TileEntityGrave; +import biomesoplenty.tileentities.TileEntityAltar; +import biomesoplenty.tileentities.TileEntityGrave; import com.google.common.base.Optional; @@ -202,67 +202,67 @@ public class BOPBlocks private static void registerBlocks() { // Add block registration - GameRegistry.registerBlock(Blocks.mud.get(), ItemBOPMud.class, "bop.mud"); + GameRegistry.registerBlock(Blocks.mud.get(), ItemBlockMud.class, "bop.mud"); GameRegistry.registerBlock(Blocks.driedDirt.get(), "bop.driedDirt"); - GameRegistry.registerBlock(Blocks.redRock.get(), ItemBOPRedRock.class, "bop.redRock"); + GameRegistry.registerBlock(Blocks.redRock.get(), ItemBlockRedRock.class, "bop.redRock"); GameRegistry.registerBlock(Blocks.ash.get(), "bop.ash"); - GameRegistry.registerBlock(Blocks.plants.get(), ItemBOPPlant.class, "bop.plants"); - GameRegistry.registerBlock(Blocks.flowers.get(), ItemBOPFlower.class, "bop.flowers"); - GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBOPMushroom.class, "bop.mushrooms"); - GameRegistry.registerBlock(Blocks.coral.get(), ItemBOPCoral.class, "bop.coral"); + GameRegistry.registerBlock(Blocks.plants.get(), ItemBlockPlant.class, "bop.plants"); + GameRegistry.registerBlock(Blocks.flowers.get(), ItemBlockFlower.class, "bop.flowers"); + GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBlockMushroom.class, "bop.mushrooms"); + GameRegistry.registerBlock(Blocks.coral.get(), ItemBlockCoral.class, "bop.coral"); GameRegistry.registerBlock(Blocks.willow.get(), ItemBOPWillow.class, "bop.willow"); GameRegistry.registerBlock(Blocks.ivy.get(), ItemBOPIvy.class, "bop.ivy"); - GameRegistry.registerBlock(Blocks.leaves1.get(), ItemBOPLeaves.class, "bop.leaves1"); - GameRegistry.registerBlock(Blocks.leaves2.get(), ItemBOPLeaves.class, "bop.leaves2"); - GameRegistry.registerBlock(Blocks.foliage.get(), ItemBOPFoliage.class, "bop.foliage"); + GameRegistry.registerBlock(Blocks.leaves1.get(), ItemBlockLeaves.class, "bop.leaves1"); + GameRegistry.registerBlock(Blocks.leaves2.get(), ItemBlockLeaves.class, "bop.leaves2"); + GameRegistry.registerBlock(Blocks.foliage.get(), ItemBlockFoliage.class, "bop.foliage"); GameRegistry.registerBlock(Blocks.ashStone.get(), "bop.ashStone"); GameRegistry.registerBlock(Blocks.hardIce.get(), "bop.hardIce"); - GameRegistry.registerBlock(Blocks.leavesFruit.get(), ItemBOPAppleLeaves.class, "bop.leavesFruit"); - GameRegistry.registerBlock(Blocks.bamboo.get(), ItemBOPBamboo.class, "bop.bamboo"); + GameRegistry.registerBlock(Blocks.leavesFruit.get(), ItemBlockAppleLeaves.class, "bop.leavesFruit"); + GameRegistry.registerBlock(Blocks.bamboo.get(), ItemBlockBamboo.class, "bop.bamboo"); GameRegistry.registerBlock(Blocks.mudBrick.get(), "bop.mudBrick"); GameRegistry.registerBlock(Blocks.mudBricksStairs.get(), "bop.mudBricksStairs"); GameRegistry.registerBlock(Blocks.originGrass.get(), "bop.originGrass"); GameRegistry.registerBlock(Blocks.treeMoss.get(), "bop.treeMoss"); - GameRegistry.registerBlock(Blocks.logs1.get(), ItemBOPLog.class, "bop.wood1"); - GameRegistry.registerBlock(Blocks.logs2.get(), ItemBOPLog.class, "bop.wood2"); - GameRegistry.registerBlock(Blocks.logs3.get(), ItemBOPLog.class, "bop.wood3"); - GameRegistry.registerBlock(Blocks.logs4.get(), ItemBOPLog.class, "bop.wood4"); - GameRegistry.registerBlock(Blocks.petals.get(), ItemBOPPetals.class, "bop.petals"); - GameRegistry.registerBlock(Blocks.saplings.get(), ItemBOPSapling.class, "bop.saplings"); - GameRegistry.registerBlock(Blocks.colorizedSaplings.get(), ItemBOPColorizedSapling.class, "bop.colorizedSaplings"); + GameRegistry.registerBlock(Blocks.logs1.get(), ItemBlockLog.class, "bop.wood1"); + GameRegistry.registerBlock(Blocks.logs2.get(), ItemBlockLog.class, "bop.wood2"); + GameRegistry.registerBlock(Blocks.logs3.get(), ItemBlockLog.class, "bop.wood3"); + GameRegistry.registerBlock(Blocks.logs4.get(), ItemBlockLog.class, "bop.wood4"); + GameRegistry.registerBlock(Blocks.petals.get(), ItemBlockPetals.class, "bop.petals"); + GameRegistry.registerBlock(Blocks.saplings.get(), ItemBlockSapling.class, "bop.saplings"); + GameRegistry.registerBlock(Blocks.colorizedSaplings.get(), ItemBlockColorizedSapling.class, "bop.colorizedSaplings"); GameRegistry.registerBlock(Blocks.redCobbleStairs.get(), "bop.redCobbleStairs"); GameRegistry.registerBlock(Blocks.redBricksStairs.get(), "bop.redBricksStairs"); GameRegistry.registerBlock(Blocks.hardSand.get(), "bop.hardSand"); GameRegistry.registerBlock(Blocks.hardDirt.get(), "bop.hardDirt"); GameRegistry.registerBlock(Blocks.crystal.get(), "bop.crystal"); - GameRegistry.registerBlock(Blocks.holyGrass.get(), ItemBOPGrass.class, "bop.holyGrass"); + GameRegistry.registerBlock(Blocks.holyGrass.get(), ItemBlockGrass.class, "bop.holyGrass"); GameRegistry.registerBlock(Blocks.holyDirt.get(), "bop.holyDirt"); - GameRegistry.registerBlock(Blocks.holyStone.get(), ItemBOPSkystone.class, "bop.holyStone"); + GameRegistry.registerBlock(Blocks.holyStone.get(), ItemBlockSkystone.class, "bop.holyStone"); GameRegistry.registerBlock(Blocks.holyCobbleStairs.get(), "bop.holyCobbleStairs"); GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "bop.holyBricksStairs"); GameRegistry.registerBlock(Blocks.promisedPortal.get(), "bop.promisedPortal"); GameRegistry.registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class, "bop.amethystOre"); - GameRegistry.registerBlock(Blocks.moss.get(), ItemBOPMoss.class, "bop.moss"); + GameRegistry.registerBlock(Blocks.moss.get(), ItemBlockMoss.class, "bop.moss"); GameRegistry.registerBlock(Blocks.cragRock.get(), "bop.cragRock"); GameRegistry.registerBlock(Blocks.cloud.get(), "bop.cloud"); - GameRegistry.registerBlock(Blocks.bones.get(), ItemBOPBones.class, "bop.bones"); - GameRegistry.registerBlock(Blocks.glass.get(), ItemBOPGlass.class, "bop.glass"); - GameRegistry.registerBlock(Blocks.altar.get(), ItemBOPAltar.class, "bop.altar"); + GameRegistry.registerBlock(Blocks.bones.get(), ItemBlockBones.class, "bop.bones"); + GameRegistry.registerBlock(Blocks.glass.get(), ItemBlockGlass.class, "bop.glass"); + GameRegistry.registerBlock(Blocks.altar.get(), ItemBlockAltar.class, "bop.altar"); GameRegistry.registerBlock(Blocks.puddle.get(), "bop.puddle"); - GameRegistry.registerBlock(Blocks.grave.get(), ItemBOPGrave.class, "bop.grave"); + GameRegistry.registerBlock(Blocks.grave.get(), ItemBlockGrave.class, "bop.grave"); - ItemBOPSlab.setSlabs(Blocks.stoneSingleSlab.get(), Blocks.stoneDoubleSlab.get()); - GameRegistry.registerBlock(Blocks.stoneDoubleSlab.get(), ItemBOPSlab.class, "bop.stoneDoubleSlab"); - GameRegistry.registerBlock(Blocks.stoneSingleSlab.get(), ItemBOPSlab.class, "bop.stoneSingleSlab"); - ItemBOPSlab.setSlabs(Blocks.woodenSingleSlab1.get(), Blocks.woodenDoubleSlab1.get()); - GameRegistry.registerBlock(Blocks.woodenDoubleSlab1.get(), ItemBOPSlab.class, "bop.woodenDoubleSlab1"); - GameRegistry.registerBlock(Blocks.woodenSingleSlab1.get(), ItemBOPSlab.class, "bop.woodenSingleSlab1"); - ItemBOPSlab.setSlabs(Blocks.woodenSingleSlab2.get(), Blocks.woodenDoubleSlab2.get()); - GameRegistry.registerBlock(Blocks.woodenDoubleSlab2.get(), ItemBOPSlab.class, "bop.woodenDoubleSlab2"); - GameRegistry.registerBlock(Blocks.woodenSingleSlab2.get(), ItemBOPSlab.class, "bop.woodenSingleSlab2"); + ItemBlockSlab.setSlabs(Blocks.stoneSingleSlab.get(), Blocks.stoneDoubleSlab.get()); + GameRegistry.registerBlock(Blocks.stoneDoubleSlab.get(), ItemBlockSlab.class, "bop.stoneDoubleSlab"); + GameRegistry.registerBlock(Blocks.stoneSingleSlab.get(), ItemBlockSlab.class, "bop.stoneSingleSlab"); + ItemBlockSlab.setSlabs(Blocks.woodenSingleSlab1.get(), Blocks.woodenDoubleSlab1.get()); + GameRegistry.registerBlock(Blocks.woodenDoubleSlab1.get(), ItemBlockSlab.class, "bop.woodenDoubleSlab1"); + GameRegistry.registerBlock(Blocks.woodenSingleSlab1.get(), ItemBlockSlab.class, "bop.woodenSingleSlab1"); + ItemBlockSlab.setSlabs(Blocks.woodenSingleSlab2.get(), Blocks.woodenDoubleSlab2.get()); + GameRegistry.registerBlock(Blocks.woodenDoubleSlab2.get(), ItemBlockSlab.class, "bop.woodenDoubleSlab2"); + GameRegistry.registerBlock(Blocks.woodenSingleSlab2.get(), ItemBlockSlab.class, "bop.woodenSingleSlab2"); - GameRegistry.registerBlock(Blocks.planks.get(), ItemBOPPlank.class, "bop.planks"); + GameRegistry.registerBlock(Blocks.planks.get(), ItemBlockPlank.class, "bop.planks"); GameRegistry.registerBlock(Blocks.acaciaStairs.get(), "bop.acaciaStairs"); GameRegistry.registerBlock(Blocks.cherryStairs.get(), "bop.cherryStairs"); @@ -278,7 +278,7 @@ public class BOPBlocks GameRegistry.registerBlock(Blocks.hellBarkStairs.get(), "bop.hellBarkStairs"); GameRegistry.registerBlock(Blocks.jacarandaStairs.get(), "bop.jacarandaStairs"); - GameRegistry.registerBlock(Blocks.leavesColorized.get(), ItemBOPColorizedLeaves.class, "bop.leavesColorized"); + GameRegistry.registerBlock(Blocks.leavesColorized.get(), ItemBlockColorizedLeaves.class, "bop.leavesColorized"); } private static void registerTileEntities() diff --git a/src/minecraft/biomesoplenty/configuration/BOPEntities.java b/src/minecraft/biomesoplenty/configuration/BOPEntities.java index 977383a30..c8c738667 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPEntities.java +++ b/src/minecraft/biomesoplenty/configuration/BOPEntities.java @@ -9,9 +9,9 @@ import biomesoplenty.api.Biomes; import biomesoplenty.entities.EntityGlob; import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityRosester; -import biomesoplenty.items.projectiles.EntityDart; -import biomesoplenty.items.projectiles.EntityMudball; -import biomesoplenty.items.projectiles.EntityPoisonDart; +import biomesoplenty.entities.projectiles.EntityDart; +import biomesoplenty.entities.projectiles.EntityMudball; +import biomesoplenty.entities.projectiles.EntityPoisonDart; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; diff --git a/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java b/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java index 27d309ad7..c63422cea 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java +++ b/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java @@ -6,8 +6,8 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; -import biomesoplenty.items.projectiles.DispenserBehaviorDart; -import biomesoplenty.items.projectiles.DispenserBehaviorMudball; +import biomesoplenty.entities.projectiles.DispenserBehaviorDart; +import biomesoplenty.entities.projectiles.DispenserBehaviorMudball; public class BOPVanillaCompat { diff --git a/src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorDart.java b/src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorDart.java similarity index 91% rename from src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorDart.java rename to src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorDart.java index 186d2ce6c..83e5c20bc 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorDart.java +++ b/src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorDart.java @@ -1,4 +1,4 @@ -package biomesoplenty.items.projectiles; +package biomesoplenty.entities.projectiles; import net.minecraft.dispenser.BehaviorProjectileDispense; import net.minecraft.dispenser.IPosition; diff --git a/src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorMudball.java b/src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorMudball.java similarity index 91% rename from src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorMudball.java rename to src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorMudball.java index 218f77e8f..bade50246 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorMudball.java +++ b/src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorMudball.java @@ -1,4 +1,4 @@ -package biomesoplenty.items.projectiles; +package biomesoplenty.entities.projectiles; import net.minecraft.dispenser.BehaviorProjectileDispense; import net.minecraft.dispenser.IPosition; diff --git a/src/minecraft/biomesoplenty/items/projectiles/EntityDart.java b/src/minecraft/biomesoplenty/entities/projectiles/EntityDart.java similarity index 99% rename from src/minecraft/biomesoplenty/items/projectiles/EntityDart.java rename to src/minecraft/biomesoplenty/entities/projectiles/EntityDart.java index 695e0e94f..5a2c047fa 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/EntityDart.java +++ b/src/minecraft/biomesoplenty/entities/projectiles/EntityDart.java @@ -1,4 +1,4 @@ -package biomesoplenty.items.projectiles; +package biomesoplenty.entities.projectiles; import java.util.List; diff --git a/src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java b/src/minecraft/biomesoplenty/entities/projectiles/EntityMudball.java similarity index 97% rename from src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java rename to src/minecraft/biomesoplenty/entities/projectiles/EntityMudball.java index 577ea8253..92dbf8d01 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java +++ b/src/minecraft/biomesoplenty/entities/projectiles/EntityMudball.java @@ -1,4 +1,4 @@ -package biomesoplenty.items.projectiles; +package biomesoplenty.entities.projectiles; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; diff --git a/src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java b/src/minecraft/biomesoplenty/entities/projectiles/EntityPoisonDart.java similarity index 99% rename from src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java rename to src/minecraft/biomesoplenty/entities/projectiles/EntityPoisonDart.java index 521588a26..84da595bb 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java +++ b/src/minecraft/biomesoplenty/entities/projectiles/EntityPoisonDart.java @@ -1,4 +1,4 @@ -package biomesoplenty.items.projectiles; +package biomesoplenty.entities.projectiles; import java.util.List; diff --git a/src/minecraft/biomesoplenty/items/projectiles/RenderDart.java b/src/minecraft/biomesoplenty/entities/render/RenderDart.java similarity index 97% rename from src/minecraft/biomesoplenty/items/projectiles/RenderDart.java rename to src/minecraft/biomesoplenty/entities/render/RenderDart.java index 54c67cd29..7d38fa5b6 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/RenderDart.java +++ b/src/minecraft/biomesoplenty/entities/render/RenderDart.java @@ -1,4 +1,4 @@ -package biomesoplenty.items.projectiles; +package biomesoplenty.entities.render; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -9,6 +9,7 @@ import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import biomesoplenty.entities.projectiles.EntityDart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java index 7b0b7a7aa..f8be800e7 100644 --- a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java +++ b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java @@ -26,7 +26,6 @@ import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; import net.minecraftforge.event.entity.player.EntityInteractEvent; import biomesoplenty.api.Biomes; import biomesoplenty.api.Blocks; diff --git a/src/minecraft/biomesoplenty/items/ItemBOPAltar.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockAltar.java similarity index 82% rename from src/minecraft/biomesoplenty/items/ItemBOPAltar.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockAltar.java index c91641df0..ba9af9b59 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPAltar.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockAltar.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPAltar extends ItemBlock +public class ItemBlockAltar extends ItemBlock { private static final String[] altarTypes = new String[] {"altarframe"}; - public ItemBOPAltar(int par1) + public ItemBlockAltar(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPAppleLeaves.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockAppleLeaves.java similarity index 72% rename from src/minecraft/biomesoplenty/items/ItemBOPAppleLeaves.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockAppleLeaves.java index bbd3d14e6..e81b10a37 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPAppleLeaves.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockAppleLeaves.java @@ -1,16 +1,16 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemBOPAppleLeaves extends ItemBlock +public class ItemBlockAppleLeaves extends ItemBlock { @SideOnly(Side.CLIENT) private Icon texture; - public ItemBOPAppleLeaves(int par1) + public ItemBlockAppleLeaves(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPBamboo.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockBamboo.java similarity index 96% rename from src/minecraft/biomesoplenty/items/ItemBOPBamboo.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockBamboo.java index a92ac6a1f..9e39ff402 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPBamboo.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockBamboo.java @@ -1,12 +1,12 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemBlock; import net.minecraft.util.Icon; -public class ItemBOPBamboo extends ItemBlock +public class ItemBlockBamboo extends ItemBlock { - public ItemBOPBamboo(int par1) + public ItemBlockBamboo(int par1) { super(par1); } diff --git a/src/minecraft/biomesoplenty/items/ItemBOPBones.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockBones.java similarity index 95% rename from src/minecraft/biomesoplenty/items/ItemBOPBones.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockBones.java index 59bf34f34..adae63d93 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPBones.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockBones.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -6,11 +6,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class ItemBOPBones extends ItemBlock +public class ItemBlockBones extends ItemBlock { private static final String[] types = new String[] {"bones_small", "bones_medium", "bones_large", "bones_small_side_1", "bones_small_side_2", "bones_medium_side_1", "bones_medium_side_2"}; - public ItemBOPBones(int par1) + public ItemBlockBones(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPColorizedLeaves.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedLeaves.java similarity index 80% rename from src/minecraft/biomesoplenty/items/ItemBOPColorizedLeaves.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedLeaves.java index cc6a13337..e9fec63c2 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPColorizedLeaves.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedLeaves.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import biomesoplenty.blocks.BlockBOPColorizedLeaves; -public class ItemBOPColorizedLeaves extends ItemBlock +public class ItemBlockColorizedLeaves extends ItemBlock { - public ItemBOPColorizedLeaves(int par1) + public ItemBlockColorizedLeaves(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPColorizedSapling.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java similarity index 85% rename from src/minecraft/biomesoplenty/items/ItemBOPColorizedSapling.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java index 4de91d48d..856c7e5ed 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPColorizedSapling.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java @@ -1,15 +1,15 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -public class ItemBOPColorizedSapling extends ItemBlock +public class ItemBlockColorizedSapling extends ItemBlock { private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"}; - public ItemBOPColorizedSapling(int par1) + public ItemBlockColorizedSapling(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPCoral.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java similarity index 96% rename from src/minecraft/biomesoplenty/items/ItemBOPCoral.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java index c478d727c..0814e4b9f 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPCoral.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -10,13 +10,13 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemBOPCoral extends ItemBlock +public class ItemBlockCoral extends ItemBlock { private static final String[] coral = new String[] {"kelp"}; @SideOnly(Side.CLIENT) private Icon[] textures; - public ItemBOPCoral(int par1) + public ItemBlockCoral(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPFlower.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java similarity index 97% rename from src/minecraft/biomesoplenty/items/ItemBOPFlower.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java index b61744b61..5d8d3207f 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPFlower.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import java.util.Random; @@ -16,14 +16,14 @@ import biomesoplenty.BiomesOPlenty; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemBOPFlower extends ItemBlock +public class ItemBlockFlower extends ItemBlock { private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "daisy", "tulip", "wildflower", "violet", "anemone", "lilyflower", "cactus", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; @SideOnly(Side.CLIENT) private Icon[] textures; private static final int SUNFLOWERTOP = 14; - public ItemBOPFlower(int par1) + public ItemBlockFlower(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockFoliage.java similarity index 97% rename from src/minecraft/biomesoplenty/items/ItemBOPFoliage.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockFoliage.java index dcc91ad94..c907b976f 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPFoliage.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockFoliage.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -15,14 +15,14 @@ import biomesoplenty.api.Blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemBOPFoliage extends ItemColored +public class ItemBlockFoliage extends ItemColored { private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush"}; @SideOnly(Side.CLIENT) private Icon[] textures; private static final int GRASSTOP = 6; - public ItemBOPFoliage(int par1) + public ItemBlockFoliage(int par1) { super(par1, true); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPGlass.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockGlass.java similarity index 84% rename from src/minecraft/biomesoplenty/items/ItemBOPGlass.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockGlass.java index f3e0dd8db..353e74f53 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPGlass.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockGlass.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPGlass extends ItemBlock +public class ItemBlockGlass extends ItemBlock { private static final String[] glassTypes = new String[] {"celestialLens", "sacrificialfocus_empty", "sacrificialfocus_active", "sacrificialfocus_villager"}; - public ItemBOPGlass(int par1) + public ItemBlockGlass(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPGrass.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockGrass.java similarity index 78% rename from src/minecraft/biomesoplenty/items/ItemBOPGrass.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockGrass.java index 6135009df..3c4df2b6f 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPGrass.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockGrass.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPGrass extends ItemBlock +public class ItemBlockGrass extends ItemBlock { private static final String[] types = new String[] {"holygrass", "smolderinggrass"}; - public ItemBOPGrass(int par1) + public ItemBlockGrass(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPGrave.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockGrave.java similarity index 61% rename from src/minecraft/biomesoplenty/items/ItemBOPGrave.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockGrave.java index 1618f3b2e..9e93185f3 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPGrave.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockGrave.java @@ -1,10 +1,10 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; -public class ItemBOPGrave extends ItemBlock +public class ItemBlockGrave extends ItemBlock { - public ItemBOPGrave(int par1) + public ItemBlockGrave(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPLeaves.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockLeaves.java similarity index 82% rename from src/minecraft/biomesoplenty/items/ItemBOPLeaves.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockLeaves.java index e7680eeb3..f8a6b2d2e 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPLeaves.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockLeaves.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import biomesoplenty.blocks.BlockBOPLeaves; -public class ItemBOPLeaves extends ItemBlock +public class ItemBlockLeaves extends ItemBlock { - public ItemBOPLeaves(int par1) + public ItemBlockLeaves(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPLog.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockLog.java similarity index 83% rename from src/minecraft/biomesoplenty/items/ItemBOPLog.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockLog.java index de685c65c..0cabb03bd 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPLog.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockLog.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import biomesoplenty.blocks.BlockBOPLog; -public class ItemBOPLog extends ItemBlock +public class ItemBlockLog extends ItemBlock { - public ItemBOPLog(int par1) + public ItemBlockLog(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMoss.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockMoss.java similarity index 82% rename from src/minecraft/biomesoplenty/items/ItemBOPMoss.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockMoss.java index 56230e021..1ec17798e 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPMoss.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockMoss.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemBlock; @@ -6,12 +6,12 @@ import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemBOPMoss extends ItemBlock +public class ItemBlockMoss extends ItemBlock { @SideOnly(Side.CLIENT) private Icon texture; - public ItemBOPMoss(int par1) + public ItemBlockMoss(int par1) { super(par1); } diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMud.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockMud.java similarity index 82% rename from src/minecraft/biomesoplenty/items/ItemBOPMud.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockMud.java index 992dbe442..0c9866054 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPMud.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockMud.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPMud extends ItemBlock +public class ItemBlockMud extends ItemBlock { private static final String[] types = new String[] {"mud", "quicksand"}; - public ItemBOPMud(int par1) + public ItemBlockMud(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMushroom.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockMushroom.java similarity index 95% rename from src/minecraft/biomesoplenty/items/ItemBOPMushroom.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockMushroom.java index 576901cf0..344139787 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPMushroom.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockMushroom.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; -public class ItemBOPMushroom extends ItemBlock +public class ItemBlockMushroom extends ItemBlock { private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom"}; - public ItemBOPMushroom(int par1) + public ItemBlockMushroom(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPPetals.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPetals.java similarity index 82% rename from src/minecraft/biomesoplenty/items/ItemBOPPetals.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockPetals.java index e58098988..d6b44d543 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPPetals.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPetals.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPPetals extends ItemBlock +public class ItemBlockPetals extends ItemBlock { private static final String[] petals = new String[] {"bigflowerred", "bigfloweryellow"}; - public ItemBOPPetals(int par1) + public ItemBlockPetals(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPPlank.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlank.java similarity index 86% rename from src/minecraft/biomesoplenty/items/ItemBOPPlank.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockPlank.java index 4cb53c9e2..a9088c37c 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPPlank.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlank.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPPlank extends ItemBlock +public class ItemBlockPlank extends ItemBlock { private static final String[] woodTypes = new String[] {"acaciaPlank", "cherryPlank", "darkPlank", "firPlank", "holyPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching", "pinePlank", "hellBarkPlank", "jacarandaPlank"}; - public ItemBOPPlank(int par1) + public ItemBlockPlank(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPPlant.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java similarity index 96% rename from src/minecraft/biomesoplenty/items/ItemBOPPlant.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java index c6bb0da47..30161137e 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPPlant.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; @@ -11,13 +11,13 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemBOPPlant extends ItemBlock +public class ItemBlockPlant extends ItemBlock { private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom"}; @SideOnly(Side.CLIENT) private Icon[] textures; - public ItemBOPPlant(int par1) + public ItemBlockPlant(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockRedRock.java similarity index 82% rename from src/minecraft/biomesoplenty/items/ItemBOPRedRock.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockRedRock.java index eb121d314..b79d64f15 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockRedRock.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPRedRock extends ItemBlock +public class ItemBlockRedRock extends ItemBlock { private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; - public ItemBOPRedRock(int par1) + public ItemBlockRedRock(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPSapling.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockSapling.java similarity index 88% rename from src/minecraft/biomesoplenty/items/ItemBOPSapling.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockSapling.java index 8b099a215..47c638aa6 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPSapling.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockSapling.java @@ -1,16 +1,16 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -public class ItemBOPSapling extends ItemBlock +public class ItemBlockSapling extends ItemBlock { private static final String[] saplings = new String[] {"apple", "yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "holy", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda"}; private static final int MAX = 14; - public ItemBOPSapling(int par1) + public ItemBlockSapling(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockSkystone.java similarity index 81% rename from src/minecraft/biomesoplenty/items/ItemBOPSkystone.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockSkystone.java index 45ad8287d..86b83a653 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockSkystone.java @@ -1,13 +1,13 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBOPSkystone extends ItemBlock +public class ItemBlockSkystone extends ItemBlock { private static final String[] types = new String[] {"holystone", "holycobble", "holybrick"}; - public ItemBOPSkystone(int par1) + public ItemBlockSkystone(int par1) { super(par1); setMaxDamage(0); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPSlab.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockSlab.java similarity index 80% rename from src/minecraft/biomesoplenty/items/ItemBOPSlab.java rename to src/minecraft/biomesoplenty/itemblocks/ItemBlockSlab.java index 945db7492..9ba1b5dd6 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPSlab.java +++ b/src/minecraft/biomesoplenty/itemblocks/ItemBlockSlab.java @@ -1,4 +1,4 @@ -package biomesoplenty.items; +package biomesoplenty.itemblocks; import net.minecraft.block.Block; import net.minecraft.block.BlockHalfSlab; @@ -8,18 +8,18 @@ import biomesoplenty.blocks.BlockBOPSlab; import com.google.common.base.Optional; -public class ItemBOPSlab extends ItemSlab +public class ItemBlockSlab extends ItemSlab { private static Optional singleSlab = Optional.absent(); private static Optional doubleSlab = Optional.absent(); static public void setSlabs(BlockHalfSlab singleSlab, BlockHalfSlab doubleSlab) { - ItemBOPSlab.singleSlab = Optional.of(singleSlab); - ItemBOPSlab.doubleSlab = Optional.of(doubleSlab); + ItemBlockSlab.singleSlab = Optional.of(singleSlab); + ItemBlockSlab.doubleSlab = Optional.of(doubleSlab); } - public ItemBOPSlab(int id) { + public ItemBlockSlab(int id) { super(id, singleSlab.get(), doubleSlab.get(), id == doubleSlab.get().blockID); } diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMudball.java b/src/minecraft/biomesoplenty/items/ItemBOPMudball.java index 33f134455..3d67820e3 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPMudball.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPMudball.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; -import biomesoplenty.items.projectiles.EntityMudball; +import biomesoplenty.entities.projectiles.EntityMudball; public class ItemBOPMudball extends Item { diff --git a/src/minecraft/biomesoplenty/items/ItemDartBlower.java b/src/minecraft/biomesoplenty/items/ItemDartBlower.java index a8deb65a6..6d10cb123 100644 --- a/src/minecraft/biomesoplenty/items/ItemDartBlower.java +++ b/src/minecraft/biomesoplenty/items/ItemDartBlower.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Items; -import biomesoplenty.items.projectiles.EntityDart; -import biomesoplenty.items.projectiles.EntityDart.DartType; +import biomesoplenty.entities.projectiles.EntityDart; +import biomesoplenty.entities.projectiles.EntityDart.DartType; public class ItemDartBlower extends Item { diff --git a/src/minecraft/biomesoplenty/tileentity/TileEntityAltar.java b/src/minecraft/biomesoplenty/tileentities/TileEntityAltar.java similarity index 99% rename from src/minecraft/biomesoplenty/tileentity/TileEntityAltar.java rename to src/minecraft/biomesoplenty/tileentities/TileEntityAltar.java index 93da6a5af..0820558ef 100644 --- a/src/minecraft/biomesoplenty/tileentity/TileEntityAltar.java +++ b/src/minecraft/biomesoplenty/tileentities/TileEntityAltar.java @@ -1,4 +1,4 @@ -package biomesoplenty.tileentity; +package biomesoplenty.tileentities; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/src/minecraft/biomesoplenty/tileentity/TileEntityGrave.java b/src/minecraft/biomesoplenty/tileentities/TileEntityGrave.java similarity index 78% rename from src/minecraft/biomesoplenty/tileentity/TileEntityGrave.java rename to src/minecraft/biomesoplenty/tileentities/TileEntityGrave.java index af9ce5946..6ef634074 100644 --- a/src/minecraft/biomesoplenty/tileentity/TileEntityGrave.java +++ b/src/minecraft/biomesoplenty/tileentities/TileEntityGrave.java @@ -1,4 +1,4 @@ -package biomesoplenty.tileentity; +package biomesoplenty.tileentities; import net.minecraft.tileentity.TileEntity;