etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moving some things around

Browse source
This commit is contained in:
Adubbz 2013-07-03 17:51:39 +10:00
parent 18b5eac424
commit d2c5f5e4b3
44 changed files with 162 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/minecraft/biomesoplenty/ClientProxy.java
View file

@ -22,15 +22,15 @@ import biomesoplenty.blocks.renderers.TileEntityGraveRenderer;
import biomesoplenty.entities.EntityGlob; import biomesoplenty.entities.EntityGlob;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
import biomesoplenty.entities.EntityRosester; 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.RenderGlob;
import biomesoplenty.entities.render.RenderJungleSpider; import biomesoplenty.entities.render.RenderJungleSpider;
import biomesoplenty.entities.render.RenderRosester; 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.EntityDandelionFX;
import biomesoplenty.particles.EntitySteamFX; 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.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;

2
src/minecraft/biomesoplenty/blocks/BlockAltar.java
View file

@ -19,7 +19,7 @@ import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Items; import biomesoplenty.api.Items;
import biomesoplenty.blocks.renderers.RenderUtils; import biomesoplenty.blocks.renderers.RenderUtils;
import biomesoplenty.tileentity.TileEntityAltar; import biomesoplenty.tileentities.TileEntityAltar;
public class BlockAltar extends Block public class BlockAltar extends Block
{ {

2
src/minecraft/biomesoplenty/blocks/BlockBOPGlass.java
View file

@ -21,7 +21,7 @@ import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Items; import biomesoplenty.api.Items;
import biomesoplenty.tileentity.TileEntityAltar; import biomesoplenty.tileentities.TileEntityAltar;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/biomesoplenty/blocks/BlockGrave.java
View file

@ -14,7 +14,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.tileentity.TileEntityGrave; import biomesoplenty.tileentities.TileEntityGrave;
public class BlockGrave extends Block public class BlockGrave extends Block
{ {

2
src/minecraft/biomesoplenty/blocks/renderers/AltarRenderer.java
View file

@ -7,7 +7,7 @@ import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import biomesoplenty.blocks.BlockAltar; import biomesoplenty.blocks.BlockAltar;
import biomesoplenty.tileentity.TileEntityAltar; import biomesoplenty.tileentities.TileEntityAltar;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
public class AltarRenderer implements ISimpleBlockRenderingHandler public class AltarRenderer implements ISimpleBlockRenderingHandler

2
src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.World;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import biomesoplenty.blocks.models.ModelGrave0; import biomesoplenty.blocks.models.ModelGrave0;
import biomesoplenty.tileentity.TileEntityGrave; import biomesoplenty.tileentities.TileEntityGrave;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
public class TileEntityGraveRenderer extends TileEntitySpecialRenderer public class TileEntityGraveRenderer extends TileEntitySpecialRenderer

124
src/minecraft/biomesoplenty/configuration/BOPBlocks.java
View file

@ -45,35 +45,35 @@ import biomesoplenty.blocks.BlockPromisedPortal;
import biomesoplenty.blocks.BlockPuddle; import biomesoplenty.blocks.BlockPuddle;
import biomesoplenty.blocks.BlockTreeMoss; import biomesoplenty.blocks.BlockTreeMoss;
import biomesoplenty.blocks.BlockWillow; 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.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.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.items.ItemBOPWillow;
import biomesoplenty.tileentity.TileEntityAltar; import biomesoplenty.tileentities.TileEntityAltar;
import biomesoplenty.tileentity.TileEntityGrave; import biomesoplenty.tileentities.TileEntityGrave;
import com.google.common.base.Optional; import com.google.common.base.Optional;
@ -202,67 +202,67 @@ public class BOPBlocks
private static void registerBlocks() private static void registerBlocks()
{ {
// Add block registration // 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.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.ash.get(), "bop.ash");
GameRegistry.registerBlock(Blocks.plants.get(), ItemBOPPlant.class, "bop.plants"); GameRegistry.registerBlock(Blocks.plants.get(), ItemBlockPlant.class, "bop.plants");
GameRegistry.registerBlock(Blocks.flowers.get(), ItemBOPFlower.class, "bop.flowers"); GameRegistry.registerBlock(Blocks.flowers.get(), ItemBlockFlower.class, "bop.flowers");
GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBOPMushroom.class, "bop.mushrooms"); GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBlockMushroom.class, "bop.mushrooms");
GameRegistry.registerBlock(Blocks.coral.get(), ItemBOPCoral.class, "bop.coral"); GameRegistry.registerBlock(Blocks.coral.get(), ItemBlockCoral.class, "bop.coral");
GameRegistry.registerBlock(Blocks.willow.get(), ItemBOPWillow.class, "bop.willow"); GameRegistry.registerBlock(Blocks.willow.get(), ItemBOPWillow.class, "bop.willow");
GameRegistry.registerBlock(Blocks.ivy.get(), ItemBOPIvy.class, "bop.ivy"); GameRegistry.registerBlock(Blocks.ivy.get(), ItemBOPIvy.class, "bop.ivy");
GameRegistry.registerBlock(Blocks.leaves1.get(), ItemBOPLeaves.class, "bop.leaves1"); GameRegistry.registerBlock(Blocks.leaves1.get(), ItemBlockLeaves.class, "bop.leaves1");
GameRegistry.registerBlock(Blocks.leaves2.get(), ItemBOPLeaves.class, "bop.leaves2"); GameRegistry.registerBlock(Blocks.leaves2.get(), ItemBlockLeaves.class, "bop.leaves2");
GameRegistry.registerBlock(Blocks.foliage.get(), ItemBOPFoliage.class, "bop.foliage"); GameRegistry.registerBlock(Blocks.foliage.get(), ItemBlockFoliage.class, "bop.foliage");
GameRegistry.registerBlock(Blocks.ashStone.get(), "bop.ashStone"); GameRegistry.registerBlock(Blocks.ashStone.get(), "bop.ashStone");
GameRegistry.registerBlock(Blocks.hardIce.get(), "bop.hardIce"); GameRegistry.registerBlock(Blocks.hardIce.get(), "bop.hardIce");
GameRegistry.registerBlock(Blocks.leavesFruit.get(), ItemBOPAppleLeaves.class, "bop.leavesFruit"); GameRegistry.registerBlock(Blocks.leavesFruit.get(), ItemBlockAppleLeaves.class, "bop.leavesFruit");
GameRegistry.registerBlock(Blocks.bamboo.get(), ItemBOPBamboo.class, "bop.bamboo"); GameRegistry.registerBlock(Blocks.bamboo.get(), ItemBlockBamboo.class, "bop.bamboo");
GameRegistry.registerBlock(Blocks.mudBrick.get(), "bop.mudBrick"); GameRegistry.registerBlock(Blocks.mudBrick.get(), "bop.mudBrick");
GameRegistry.registerBlock(Blocks.mudBricksStairs.get(), "bop.mudBricksStairs"); GameRegistry.registerBlock(Blocks.mudBricksStairs.get(), "bop.mudBricksStairs");
GameRegistry.registerBlock(Blocks.originGrass.get(), "bop.originGrass"); GameRegistry.registerBlock(Blocks.originGrass.get(), "bop.originGrass");
GameRegistry.registerBlock(Blocks.treeMoss.get(), "bop.treeMoss"); GameRegistry.registerBlock(Blocks.treeMoss.get(), "bop.treeMoss");
GameRegistry.registerBlock(Blocks.logs1.get(), ItemBOPLog.class, "bop.wood1"); GameRegistry.registerBlock(Blocks.logs1.get(), ItemBlockLog.class, "bop.wood1");
GameRegistry.registerBlock(Blocks.logs2.get(), ItemBOPLog.class, "bop.wood2"); GameRegistry.registerBlock(Blocks.logs2.get(), ItemBlockLog.class, "bop.wood2");
GameRegistry.registerBlock(Blocks.logs3.get(), ItemBOPLog.class, "bop.wood3"); GameRegistry.registerBlock(Blocks.logs3.get(), ItemBlockLog.class, "bop.wood3");
GameRegistry.registerBlock(Blocks.logs4.get(), ItemBOPLog.class, "bop.wood4"); GameRegistry.registerBlock(Blocks.logs4.get(), ItemBlockLog.class, "bop.wood4");
GameRegistry.registerBlock(Blocks.petals.get(), ItemBOPPetals.class, "bop.petals"); GameRegistry.registerBlock(Blocks.petals.get(), ItemBlockPetals.class, "bop.petals");
GameRegistry.registerBlock(Blocks.saplings.get(), ItemBOPSapling.class, "bop.saplings"); GameRegistry.registerBlock(Blocks.saplings.get(), ItemBlockSapling.class, "bop.saplings");
GameRegistry.registerBlock(Blocks.colorizedSaplings.get(), ItemBOPColorizedSapling.class, "bop.colorizedSaplings"); GameRegistry.registerBlock(Blocks.colorizedSaplings.get(), ItemBlockColorizedSapling.class, "bop.colorizedSaplings");
GameRegistry.registerBlock(Blocks.redCobbleStairs.get(), "bop.redCobbleStairs"); GameRegistry.registerBlock(Blocks.redCobbleStairs.get(), "bop.redCobbleStairs");
GameRegistry.registerBlock(Blocks.redBricksStairs.get(), "bop.redBricksStairs"); GameRegistry.registerBlock(Blocks.redBricksStairs.get(), "bop.redBricksStairs");
GameRegistry.registerBlock(Blocks.hardSand.get(), "bop.hardSand"); GameRegistry.registerBlock(Blocks.hardSand.get(), "bop.hardSand");
GameRegistry.registerBlock(Blocks.hardDirt.get(), "bop.hardDirt"); GameRegistry.registerBlock(Blocks.hardDirt.get(), "bop.hardDirt");
GameRegistry.registerBlock(Blocks.crystal.get(), "bop.crystal"); 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.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.holyCobbleStairs.get(), "bop.holyCobbleStairs");
GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "bop.holyBricksStairs"); GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "bop.holyBricksStairs");
GameRegistry.registerBlock(Blocks.promisedPortal.get(), "bop.promisedPortal"); GameRegistry.registerBlock(Blocks.promisedPortal.get(), "bop.promisedPortal");
GameRegistry.registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class, "bop.amethystOre"); 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.cragRock.get(), "bop.cragRock");
GameRegistry.registerBlock(Blocks.cloud.get(), "bop.cloud"); GameRegistry.registerBlock(Blocks.cloud.get(), "bop.cloud");
GameRegistry.registerBlock(Blocks.bones.get(), ItemBOPBones.class, "bop.bones"); GameRegistry.registerBlock(Blocks.bones.get(), ItemBlockBones.class, "bop.bones");
GameRegistry.registerBlock(Blocks.glass.get(), ItemBOPGlass.class, "bop.glass"); GameRegistry.registerBlock(Blocks.glass.get(), ItemBlockGlass.class, "bop.glass");
GameRegistry.registerBlock(Blocks.altar.get(), ItemBOPAltar.class, "bop.altar"); GameRegistry.registerBlock(Blocks.altar.get(), ItemBlockAltar.class, "bop.altar");
GameRegistry.registerBlock(Blocks.puddle.get(), "bop.puddle"); 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()); ItemBlockSlab.setSlabs(Blocks.stoneSingleSlab.get(), Blocks.stoneDoubleSlab.get());
GameRegistry.registerBlock(Blocks.stoneDoubleSlab.get(), ItemBOPSlab.class, "bop.stoneDoubleSlab"); GameRegistry.registerBlock(Blocks.stoneDoubleSlab.get(), ItemBlockSlab.class, "bop.stoneDoubleSlab");
GameRegistry.registerBlock(Blocks.stoneSingleSlab.get(), ItemBOPSlab.class, "bop.stoneSingleSlab"); GameRegistry.registerBlock(Blocks.stoneSingleSlab.get(), ItemBlockSlab.class, "bop.stoneSingleSlab");
ItemBOPSlab.setSlabs(Blocks.woodenSingleSlab1.get(), Blocks.woodenDoubleSlab1.get()); ItemBlockSlab.setSlabs(Blocks.woodenSingleSlab1.get(), Blocks.woodenDoubleSlab1.get());
GameRegistry.registerBlock(Blocks.woodenDoubleSlab1.get(), ItemBOPSlab.class, "bop.woodenDoubleSlab1"); GameRegistry.registerBlock(Blocks.woodenDoubleSlab1.get(), ItemBlockSlab.class, "bop.woodenDoubleSlab1");
GameRegistry.registerBlock(Blocks.woodenSingleSlab1.get(), ItemBOPSlab.class, "bop.woodenSingleSlab1"); GameRegistry.registerBlock(Blocks.woodenSingleSlab1.get(), ItemBlockSlab.class, "bop.woodenSingleSlab1");
ItemBOPSlab.setSlabs(Blocks.woodenSingleSlab2.get(), Blocks.woodenDoubleSlab2.get()); ItemBlockSlab.setSlabs(Blocks.woodenSingleSlab2.get(), Blocks.woodenDoubleSlab2.get());
GameRegistry.registerBlock(Blocks.woodenDoubleSlab2.get(), ItemBOPSlab.class, "bop.woodenDoubleSlab2"); GameRegistry.registerBlock(Blocks.woodenDoubleSlab2.get(), ItemBlockSlab.class, "bop.woodenDoubleSlab2");
GameRegistry.registerBlock(Blocks.woodenSingleSlab2.get(), ItemBOPSlab.class, "bop.woodenSingleSlab2"); 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.acaciaStairs.get(), "bop.acaciaStairs");
GameRegistry.registerBlock(Blocks.cherryStairs.get(), "bop.cherryStairs"); GameRegistry.registerBlock(Blocks.cherryStairs.get(), "bop.cherryStairs");
@ -278,7 +278,7 @@ public class BOPBlocks
GameRegistry.registerBlock(Blocks.hellBarkStairs.get(), "bop.hellBarkStairs"); GameRegistry.registerBlock(Blocks.hellBarkStairs.get(), "bop.hellBarkStairs");
GameRegistry.registerBlock(Blocks.jacarandaStairs.get(), "bop.jacarandaStairs"); 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() private static void registerTileEntities()

6
src/minecraft/biomesoplenty/configuration/BOPEntities.java
View file

@ -9,9 +9,9 @@ import biomesoplenty.api.Biomes;
import biomesoplenty.entities.EntityGlob; import biomesoplenty.entities.EntityGlob;
import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityJungleSpider;
import biomesoplenty.entities.EntityRosester; import biomesoplenty.entities.EntityRosester;
import biomesoplenty.items.projectiles.EntityDart; import biomesoplenty.entities.projectiles.EntityDart;
import biomesoplenty.items.projectiles.EntityMudball; import biomesoplenty.entities.projectiles.EntityMudball;
import biomesoplenty.items.projectiles.EntityPoisonDart; import biomesoplenty.entities.projectiles.EntityPoisonDart;
import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.LanguageRegistry;

4
src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java
View file

@ -6,8 +6,8 @@ import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.ChestGenHooks;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.api.Items; import biomesoplenty.api.Items;
import biomesoplenty.items.projectiles.DispenserBehaviorDart; import biomesoplenty.entities.projectiles.DispenserBehaviorDart;
import biomesoplenty.items.projectiles.DispenserBehaviorMudball; import biomesoplenty.entities.projectiles.DispenserBehaviorMudball;
public class BOPVanillaCompat { public class BOPVanillaCompat {

2
src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorDart.java → src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorDart.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items.projectiles; package biomesoplenty.entities.projectiles;
import net.minecraft.dispenser.BehaviorProjectileDispense; import net.minecraft.dispenser.BehaviorProjectileDispense;
import net.minecraft.dispenser.IPosition; import net.minecraft.dispenser.IPosition;

2
src/minecraft/biomesoplenty/items/projectiles/DispenserBehaviorMudball.java → src/minecraft/biomesoplenty/entities/projectiles/DispenserBehaviorMudball.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items.projectiles; package biomesoplenty.entities.projectiles;
import net.minecraft.dispenser.BehaviorProjectileDispense; import net.minecraft.dispenser.BehaviorProjectileDispense;
import net.minecraft.dispenser.IPosition; import net.minecraft.dispenser.IPosition;

2
src/minecraft/biomesoplenty/items/projectiles/EntityDart.java → src/minecraft/biomesoplenty/entities/projectiles/EntityDart.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items.projectiles; package biomesoplenty.entities.projectiles;
import java.util.List; import java.util.List;

2
src/minecraft/biomesoplenty/items/projectiles/EntityMudball.java → src/minecraft/biomesoplenty/entities/projectiles/EntityMudball.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items.projectiles; package biomesoplenty.entities.projectiles;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.entity.projectile.EntityThrowable;

2
src/minecraft/biomesoplenty/items/projectiles/EntityPoisonDart.java → src/minecraft/biomesoplenty/entities/projectiles/EntityPoisonDart.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items.projectiles; package biomesoplenty.entities.projectiles;
import java.util.List; import java.util.List;

3
src/minecraft/biomesoplenty/items/projectiles/RenderDart.java → src/minecraft/biomesoplenty/entities/render/RenderDart.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items.projectiles; package biomesoplenty.entities.render;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render; 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.GL11;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL12;
import biomesoplenty.entities.projectiles.EntityDart;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

1
src/minecraft/biomesoplenty/handlers/EntityEventHandler.java
View file

@ -26,7 +26,6 @@ import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn;
import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent;
import biomesoplenty.api.Biomes; import biomesoplenty.api.Biomes;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;

6
src/minecraft/biomesoplenty/items/ItemBOPAltar.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockAltar.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class ItemBOPAltar extends ItemBlock public class ItemBlockAltar extends ItemBlock
{ {
private static final String[] altarTypes = new String[] {"altarframe"}; private static final String[] altarTypes = new String[] {"altarframe"};
public ItemBOPAltar(int par1) public ItemBlockAltar(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPAppleLeaves.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockAppleLeaves.java
View file

@ -1,16 +1,16 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.util.Icon; import net.minecraft.util.Icon;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class ItemBOPAppleLeaves extends ItemBlock public class ItemBlockAppleLeaves extends ItemBlock
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon texture; private Icon texture;
public ItemBOPAppleLeaves(int par1) public ItemBlockAppleLeaves(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPBamboo.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockBamboo.java
View file

@ -1,12 +1,12 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.util.Icon; 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); super(par1);
} }

6
src/minecraft/biomesoplenty/items/ItemBOPBones.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockBones.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -6,11 +6,11 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; 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"}; 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); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPColorizedLeaves.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedLeaves.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import biomesoplenty.blocks.BlockBOPColorizedLeaves; import biomesoplenty.blocks.BlockBOPColorizedLeaves;
public class ItemBOPColorizedLeaves extends ItemBlock public class ItemBlockColorizedLeaves extends ItemBlock
{ {
public ItemBOPColorizedLeaves(int par1) public ItemBlockColorizedLeaves(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPColorizedSapling.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java
View file

@ -1,15 +1,15 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon; 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"}; private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"};
public ItemBOPColorizedSapling(int par1) public ItemBlockColorizedSapling(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPCoral.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockCoral.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class ItemBOPCoral extends ItemBlock public class ItemBlockCoral extends ItemBlock
{ {
private static final String[] coral = new String[] {"kelp"}; private static final String[] coral = new String[] {"kelp"};
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon[] textures; private Icon[] textures;
public ItemBOPCoral(int par1) public ItemBlockCoral(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPFlower.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockFlower.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import java.util.Random; import java.util.Random;
@ -16,14 +16,14 @@ import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; 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"}; 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) @SideOnly(Side.CLIENT)
private Icon[] textures; private Icon[] textures;
private static final int SUNFLOWERTOP = 14; private static final int SUNFLOWERTOP = 14;
public ItemBOPFlower(int par1) public ItemBlockFlower(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPFoliage.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockFoliage.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; 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"}; private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush"};
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon[] textures; private Icon[] textures;
private static final int GRASSTOP = 6; private static final int GRASSTOP = 6;
public ItemBOPFoliage(int par1) public ItemBlockFoliage(int par1)
{ {
super(par1, true); super(par1, true);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPGlass.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockGlass.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; 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"}; private static final String[] glassTypes = new String[] {"celestialLens", "sacrificialfocus_empty", "sacrificialfocus_active", "sacrificialfocus_villager"};
public ItemBOPGlass(int par1) public ItemBlockGlass(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPGrass.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockGrass.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class ItemBOPGrass extends ItemBlock public class ItemBlockGrass extends ItemBlock
{ {
private static final String[] types = new String[] {"holygrass", "smolderinggrass"}; private static final String[] types = new String[] {"holygrass", "smolderinggrass"};
public ItemBOPGrass(int par1) public ItemBlockGrass(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPGrave.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockGrave.java
View file

@ -1,10 +1,10 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; 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); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPLeaves.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockLeaves.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import biomesoplenty.blocks.BlockBOPLeaves; import biomesoplenty.blocks.BlockBOPLeaves;
public class ItemBOPLeaves extends ItemBlock public class ItemBlockLeaves extends ItemBlock
{ {
public ItemBOPLeaves(int par1) public ItemBlockLeaves(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPLog.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockLog.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import biomesoplenty.blocks.BlockBOPLog; import biomesoplenty.blocks.BlockBOPLog;
public class ItemBOPLog extends ItemBlock public class ItemBlockLog extends ItemBlock
{ {
public ItemBOPLog(int par1) public ItemBlockLog(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPMoss.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockMoss.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.ItemBlock; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class ItemBOPMoss extends ItemBlock public class ItemBlockMoss extends ItemBlock
{ {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon texture; private Icon texture;
public ItemBOPMoss(int par1) public ItemBlockMoss(int par1)
{ {
super(par1); super(par1);
} }

6
src/minecraft/biomesoplenty/items/ItemBOPMud.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockMud.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class ItemBOPMud extends ItemBlock public class ItemBlockMud extends ItemBlock
{ {
private static final String[] types = new String[] {"mud", "quicksand"}; private static final String[] types = new String[] {"mud", "quicksand"};
public ItemBOPMud(int par1) public ItemBlockMud(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPMushroom.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockMushroom.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon; import net.minecraft.util.Icon;
import net.minecraft.world.World; 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"}; private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom"};
public ItemBOPMushroom(int par1) public ItemBlockMushroom(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPPetals.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockPetals.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class ItemBOPPetals extends ItemBlock public class ItemBlockPetals extends ItemBlock
{ {
private static final String[] petals = new String[] {"bigflowerred", "bigfloweryellow"}; private static final String[] petals = new String[] {"bigflowerred", "bigfloweryellow"};
public ItemBOPPetals(int par1) public ItemBlockPetals(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPPlank.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockPlank.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; 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"}; 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); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPPlant.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; 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"}; private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom"};
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon[] textures; private Icon[] textures;
public ItemBOPPlant(int par1) public ItemBlockPlant(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPRedRock.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockRedRock.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; 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"}; private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"};
public ItemBOPRedRock(int par1) public ItemBlockRedRock(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPSapling.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockSapling.java
View file

@ -1,16 +1,16 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon; 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 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; private static final int MAX = 14;
public ItemBOPSapling(int par1) public ItemBlockSapling(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

6
src/minecraft/biomesoplenty/items/ItemBOPSkystone.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockSkystone.java
View file

@ -1,13 +1,13 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; 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"}; private static final String[] types = new String[] {"holystone", "holycobble", "holybrick"};
public ItemBOPSkystone(int par1) public ItemBlockSkystone(int par1)
{ {
super(par1); super(par1);
setMaxDamage(0); setMaxDamage(0);

10
src/minecraft/biomesoplenty/items/ItemBOPSlab.java → src/minecraft/biomesoplenty/itemblocks/ItemBlockSlab.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.items; package biomesoplenty.itemblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.BlockHalfSlab;
@ -8,18 +8,18 @@ import biomesoplenty.blocks.BlockBOPSlab;
import com.google.common.base.Optional; import com.google.common.base.Optional;
public class ItemBOPSlab extends ItemSlab public class ItemBlockSlab extends ItemSlab
{ {
private static Optional<BlockHalfSlab> singleSlab = Optional.absent(); private static Optional<BlockHalfSlab> singleSlab = Optional.absent();
private static Optional<BlockHalfSlab> doubleSlab = Optional.absent(); private static Optional<BlockHalfSlab> doubleSlab = Optional.absent();
static public void setSlabs(BlockHalfSlab singleSlab, BlockHalfSlab doubleSlab) static public void setSlabs(BlockHalfSlab singleSlab, BlockHalfSlab doubleSlab)
{ {
ItemBOPSlab.singleSlab = Optional.of(singleSlab); ItemBlockSlab.singleSlab = Optional.of(singleSlab);
ItemBOPSlab.doubleSlab = Optional.of(doubleSlab); ItemBlockSlab.doubleSlab = Optional.of(doubleSlab);
} }
public ItemBOPSlab(int id) { public ItemBlockSlab(int id) {
super(id, singleSlab.get(), doubleSlab.get(), id == doubleSlab.get().blockID); super(id, singleSlab.get(), doubleSlab.get(), id == doubleSlab.get().blockID);
} }

2
src/minecraft/biomesoplenty/items/ItemBOPMudball.java
View file

@ -6,7 +6,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.items.projectiles.EntityMudball; import biomesoplenty.entities.projectiles.EntityMudball;
public class ItemBOPMudball extends Item public class ItemBOPMudball extends Item
{ {

4
src/minecraft/biomesoplenty/items/ItemDartBlower.java
View file

@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Items; import biomesoplenty.api.Items;
import biomesoplenty.items.projectiles.EntityDart; import biomesoplenty.entities.projectiles.EntityDart;
import biomesoplenty.items.projectiles.EntityDart.DartType; import biomesoplenty.entities.projectiles.EntityDart.DartType;
public class ItemDartBlower extends Item public class ItemDartBlower extends Item
{ {

2
src/minecraft/biomesoplenty/tileentity/TileEntityAltar.java → src/minecraft/biomesoplenty/tileentities/TileEntityAltar.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.tileentity; package biomesoplenty.tileentities;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;

2
src/minecraft/biomesoplenty/tileentity/TileEntityGrave.java → src/minecraft/biomesoplenty/tileentities/TileEntityGrave.java
View file

@ -1,4 +1,4 @@
package biomesoplenty.tileentity; package biomesoplenty.tileentities;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;