Merge pull request #10 from Adubbz/master

Misc cleanup
This commit is contained in:
ted 2013-04-01 01:01:53 -07:00
commit 09b9d2d569
9 changed files with 151 additions and 180 deletions

View file

@ -2,8 +2,6 @@ package tdwp_ftw.biomesop;
import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ClientProxy extends CommonProxy {

View file

@ -1,18 +1,13 @@
package tdwp_ftw.biomesop.items;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.helpers.TeleporterPromised;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
public class ItemAncientStaff extends Item
{

View file

@ -3,7 +3,6 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemSword;
public class ItemBOPAxe extends ItemAxe
{

View file

@ -3,7 +3,6 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemSword;
public class ItemBOPHoe extends ItemHoe
{

View file

@ -3,7 +3,6 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemSword;
public class ItemBOPPickaxe extends ItemPickaxe
{

View file

@ -3,7 +3,6 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemSword;
public class ItemBOPSpade extends ItemSpade
{

View file

@ -1,8 +1,6 @@
package tdwp_ftw.biomesop.items;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

View file

@ -11,23 +11,11 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumArmorMaterial;
import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.Item;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.potion.Potion;
import net.minecraft.world.gen.structure.MapGenVillage;
import net.minecraft.util.WeightedRandomChestContent;
import java.util.ArrayList;
import java.util.Arrays;
import net.minecraft.stats.Achievement;
import net.minecraft.stats.AchievementList;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.WorldProvider;
import net.minecraftforge.event.terraingen.BiomeEvent;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.common.BiomeManager;
import net.minecraftforge.common.Configuration;
@ -35,7 +23,6 @@ import net.minecraftforge.common.EnumHelper;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.AchievementPage;
import net.minecraftforge.common.DungeonHooks;
import net.minecraftforge.common.ChestGenHooks;
import tdwp_ftw.biomesop.armor.*;
import tdwp_ftw.biomesop.biomes.*;
@ -47,11 +34,9 @@ import tdwp_ftw.biomesop.worldtype.WTBiomesOP;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.Mod.PostInit;
import cpw.mods.fml.common.Mod.PreInit;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.EntityRegistry;
@ -890,167 +875,167 @@ public class mod_BiomesOPlenty
LanguageRegistry.instance().addStringLocalization("itemGroup.tabBiomesOPlenty", "en_US", "Biomes O\' Plenty");
// Add block registration
GameRegistry.registerBlock(mud);
GameRegistry.registerBlock(driedDirt);
GameRegistry.registerBlock(redRock);
GameRegistry.registerBlock(ash);
GameRegistry.registerBlock(deadGrass);
GameRegistry.registerBlock(desertGrass);
GameRegistry.registerBlock(whiteFlower);
GameRegistry.registerBlock(blueFlower);
GameRegistry.registerBlock(purpleFlower);
GameRegistry.registerBlock(orangeFlower);
GameRegistry.registerBlock(tinyFlower);
GameRegistry.registerBlock(glowFlower);
GameRegistry.registerBlock(cattail);
GameRegistry.registerBlock(willow);
GameRegistry.registerBlock(autumnLeaves);
GameRegistry.registerBlock(thorn);
GameRegistry.registerBlock(toadstool);
GameRegistry.registerBlock(highGrassBottom);
GameRegistry.registerBlock(highGrassTop);
GameRegistry.registerBlock(ashStone);
GameRegistry.registerBlock(hardIce);
GameRegistry.registerBlock(redLeaves);
GameRegistry.registerBlock(orangeLeaves);
GameRegistry.registerBlock(pinkLeaves);
GameRegistry.registerBlock(blueLeaves);
GameRegistry.registerBlock(whiteLeaves);
GameRegistry.registerBlock(deadLeaves);
GameRegistry.registerBlock(shortGrass);
GameRegistry.registerBlock(appleLeaves);
GameRegistry.registerBlock(sprout);
GameRegistry.registerBlock(bush);
GameRegistry.registerBlock(bamboo);
GameRegistry.registerBlock(bambooLeaves);
GameRegistry.registerBlock(mudBrickBlock);
GameRegistry.registerBlock(mudBrickDoubleSlab);
GameRegistry.registerBlock(mudBrickSingleSlab);
GameRegistry.registerBlock(mudBrickStairs);
GameRegistry.registerBlock(originGrass);
GameRegistry.registerBlock(originLeaves);
GameRegistry.registerBlock(pinkFlower);
GameRegistry.registerBlock(treeMoss);
GameRegistry.registerBlock(deadWood);
GameRegistry.registerBlock(appleLeavesFruitless);
GameRegistry.registerBlock(barley);
GameRegistry.registerBlock(giantFlowerStem);
GameRegistry.registerBlock(giantFlowerRed);
GameRegistry.registerBlock(giantFlowerYellow);
GameRegistry.registerBlock(tinyCactus);
GameRegistry.registerBlock(firSapling);
GameRegistry.registerBlock(redwoodSapling);
GameRegistry.registerBlock(palmSapling);
GameRegistry.registerBlock(redSapling);
GameRegistry.registerBlock(orangeSapling);
GameRegistry.registerBlock(yellowSapling);
GameRegistry.registerBlock(brownSapling);
GameRegistry.registerBlock(willowSapling);
GameRegistry.registerBlock(appleSapling);
GameRegistry.registerBlock(originSapling);
GameRegistry.registerBlock(pinkSapling);
GameRegistry.registerBlock(whiteSapling);
GameRegistry.registerBlock(darkSapling);
GameRegistry.registerBlock(magicSapling);
GameRegistry.registerBlock(deathbloom);
GameRegistry.registerBlock(redRockCobble);
GameRegistry.registerBlock(redRockCobbleDoubleSlab);
GameRegistry.registerBlock(redRockCobbleSingleSlab);
GameRegistry.registerBlock(redRockCobbleStairs);
GameRegistry.registerBlock(redRockBrick);
GameRegistry.registerBlock(redRockBrickDoubleSlab);
GameRegistry.registerBlock(redRockBrickSingleSlab);
GameRegistry.registerBlock(redRockBrickStairs);
GameRegistry.registerBlock(hydrangea);
GameRegistry.registerBlock(violet);
GameRegistry.registerBlock(mediumGrass);
GameRegistry.registerBlock(duneGrass);
GameRegistry.registerBlock(desertSprouts);
GameRegistry.registerBlock(mangroveSapling);
GameRegistry.registerBlock(hardSand);
GameRegistry.registerBlock(acaciaSapling);
GameRegistry.registerBlock(hardDirt);
GameRegistry.registerBlock(holyGrass);
GameRegistry.registerBlock(holyStone);
GameRegistry.registerBlock(holyTallGrass);
GameRegistry.registerBlock(promisedPortal);
GameRegistry.registerBlock(holySapling);
GameRegistry.registerBlock(amethystOre);
GameRegistry.registerBlock(amethystBlock);
GameRegistry.registerBlock(bambooThatching);
GameRegistry.registerBlock(moss);
GameRegistry.registerBlock(algae);
GameRegistry.registerBlock(smolderingGrass);
GameRegistry.registerBlock(cragRock);
GameRegistry.registerBlock(quicksand);
GameRegistry.registerBlock(mud, "mud");
GameRegistry.registerBlock(driedDirt, "driedDirt");
GameRegistry.registerBlock(redRock, "redRock");
GameRegistry.registerBlock(ash, "ash");
GameRegistry.registerBlock(deadGrass, "deadGrass");
GameRegistry.registerBlock(desertGrass, "desertGrass");
GameRegistry.registerBlock(whiteFlower, "whiteFlower");
GameRegistry.registerBlock(blueFlower, "blueFlower");
GameRegistry.registerBlock(purpleFlower, "purpleFlower");
GameRegistry.registerBlock(orangeFlower, "orangeFlower");
GameRegistry.registerBlock(tinyFlower, "tinyFlower");
GameRegistry.registerBlock(glowFlower, "glowFlower");
GameRegistry.registerBlock(cattail, "cattail");
GameRegistry.registerBlock(willow, "willow");
GameRegistry.registerBlock(autumnLeaves, "autumnLeaves");
GameRegistry.registerBlock(thorn, "thorn");
GameRegistry.registerBlock(toadstool, "toadstool");
GameRegistry.registerBlock(highGrassBottom, "highGrassBottom");
GameRegistry.registerBlock(highGrassTop, "highGrassTop");
GameRegistry.registerBlock(ashStone, "ashStone");
GameRegistry.registerBlock(hardIce, "hardIce");
GameRegistry.registerBlock(redLeaves, "redLeaves");
GameRegistry.registerBlock(orangeLeaves, "orangeLeaves");
GameRegistry.registerBlock(pinkLeaves, "pinkLeaves");
GameRegistry.registerBlock(blueLeaves, "blueLeaves");
GameRegistry.registerBlock(whiteLeaves, "whiteLeaves");
GameRegistry.registerBlock(deadLeaves, "deadLeaves");
GameRegistry.registerBlock(shortGrass, "shortGrass");
GameRegistry.registerBlock(appleLeaves, "appleLeaves");
GameRegistry.registerBlock(sprout, "sprout");
GameRegistry.registerBlock(bush, "bush");
GameRegistry.registerBlock(bamboo, "bamboo");
GameRegistry.registerBlock(bambooLeaves, "bambooLeaves");
GameRegistry.registerBlock(mudBrickBlock, "mudBrickBlock");
GameRegistry.registerBlock(mudBrickDoubleSlab, "mudBrickDoubleSlab");
GameRegistry.registerBlock(mudBrickSingleSlab, "mudBrickSingleSlab");
GameRegistry.registerBlock(mudBrickStairs, "mudBrickStairs");
GameRegistry.registerBlock(originGrass, "originGrass");
GameRegistry.registerBlock(originLeaves, "originLeaves");
GameRegistry.registerBlock(pinkFlower, "pinkFlower");
GameRegistry.registerBlock(treeMoss, "treeMoss");
GameRegistry.registerBlock(deadWood, "deadWood");
GameRegistry.registerBlock(appleLeavesFruitless, "appleLeavesFruitless");
GameRegistry.registerBlock(barley, "barley");
GameRegistry.registerBlock(giantFlowerStem, "giantFlowerStem");
GameRegistry.registerBlock(giantFlowerRed, "giantFlowerRed");
GameRegistry.registerBlock(giantFlowerYellow, "giantFlowerYellow");
GameRegistry.registerBlock(tinyCactus, "tinyCactus");
GameRegistry.registerBlock(firSapling, "firSapling");
GameRegistry.registerBlock(redwoodSapling, "redwoodSapling");
GameRegistry.registerBlock(palmSapling, "palmSapling");
GameRegistry.registerBlock(redSapling, "redSapling");
GameRegistry.registerBlock(orangeSapling, "orangeSapling");
GameRegistry.registerBlock(yellowSapling, "yellowSapling");
GameRegistry.registerBlock(brownSapling, "brownSapling");
GameRegistry.registerBlock(willowSapling, "willowSapling");
GameRegistry.registerBlock(appleSapling, "appleSapling");
GameRegistry.registerBlock(originSapling, "originSapling");
GameRegistry.registerBlock(pinkSapling, "pinkSapling");
GameRegistry.registerBlock(whiteSapling, "whiteSapling");
GameRegistry.registerBlock(darkSapling, "darkSapling");
GameRegistry.registerBlock(magicSapling, "magicSapling");
GameRegistry.registerBlock(deathbloom, "deathbloom");
GameRegistry.registerBlock(redRockCobble, "redRockCobble");
GameRegistry.registerBlock(redRockCobbleDoubleSlab, "redRockCobbleDoubleSlab");
GameRegistry.registerBlock(redRockCobbleSingleSlab, "redRockCobbleSingleSlab");
GameRegistry.registerBlock(redRockCobbleStairs, "redRockCobbleStairs");
GameRegistry.registerBlock(redRockBrick, "redRockBrick");
GameRegistry.registerBlock(redRockBrickDoubleSlab, "redRockBrickDoubleSlab");
GameRegistry.registerBlock(redRockBrickSingleSlab, "redRockBrickSingleSlab");
GameRegistry.registerBlock(redRockBrickStairs, "redRockBrickStairs");
GameRegistry.registerBlock(hydrangea, "hydrangea");
GameRegistry.registerBlock(violet, "violet");
GameRegistry.registerBlock(mediumGrass, "mediumGrass");
GameRegistry.registerBlock(duneGrass, "duneGrass");
GameRegistry.registerBlock(desertSprouts, "desertSprouts");
GameRegistry.registerBlock(mangroveSapling, "mangroveSapling");
GameRegistry.registerBlock(hardSand, "hardSand");
GameRegistry.registerBlock(acaciaSapling, "acaciaSapling");
GameRegistry.registerBlock(hardDirt, "hardDirt");
GameRegistry.registerBlock(holyGrass, "holyGrass");
GameRegistry.registerBlock(holyStone, "holyStone");
GameRegistry.registerBlock(holyTallGrass, "holyTallGrass");
GameRegistry.registerBlock(promisedPortal, "promisedPortal");
GameRegistry.registerBlock(holySapling, "holySapling");
GameRegistry.registerBlock(amethystOre, "amethystOre");
GameRegistry.registerBlock(amethystBlock, "amethystBlock");
GameRegistry.registerBlock(bambooThatching, "bambooThatching");
GameRegistry.registerBlock(moss, "moss");
GameRegistry.registerBlock(algae, "algae");
GameRegistry.registerBlock(smolderingGrass, "smolderingGrass");
GameRegistry.registerBlock(cragRock, "cragRock");
GameRegistry.registerBlock(quicksand, "quicksand");
GameRegistry.registerBlock(redwoodPlank);
GameRegistry.registerBlock(redwoodWood);
GameRegistry.registerBlock(redwoodLeaves);
GameRegistry.registerBlock(redwoodDoubleSlab);
GameRegistry.registerBlock(redwoodSingleSlab);
GameRegistry.registerBlock(redwoodStairs);
GameRegistry.registerBlock(redwoodPlank, "redwoodPlank");
GameRegistry.registerBlock(redwoodWood, "redwoodWood");
GameRegistry.registerBlock(redwoodLeaves, "redwoodLeaves");
GameRegistry.registerBlock(redwoodDoubleSlab, "redwoodDoubleSlab");
GameRegistry.registerBlock(redwoodSingleSlab, "redwoodSingleSlab");
GameRegistry.registerBlock(redwoodStairs, "redwoodStairs");
GameRegistry.registerBlock(willowPlank);
GameRegistry.registerBlock(willowWood);
GameRegistry.registerBlock(willowLeaves);
GameRegistry.registerBlock(willowDoubleSlab);
GameRegistry.registerBlock(willowSingleSlab);
GameRegistry.registerBlock(willowStairs);
GameRegistry.registerBlock(willowPlank, "willowPlank");
GameRegistry.registerBlock(willowWood, "willowWood");
GameRegistry.registerBlock(willowLeaves, "willowLeaves");
GameRegistry.registerBlock(willowDoubleSlab, "willowDoubleSlab");
GameRegistry.registerBlock(willowSingleSlab, "willowSingleSlab");
GameRegistry.registerBlock(willowStairs, "willowStairs");
GameRegistry.registerBlock(firPlank);
GameRegistry.registerBlock(firWood);
GameRegistry.registerBlock(firLeaves);
GameRegistry.registerBlock(firDoubleSlab);
GameRegistry.registerBlock(firSingleSlab);
GameRegistry.registerBlock(firStairs);
GameRegistry.registerBlock(firPlank, "firPlank");
GameRegistry.registerBlock(firWood, "firWood");
GameRegistry.registerBlock(firLeaves, "firLeaves");
GameRegistry.registerBlock(firDoubleSlab, "firDoubleSlab");
GameRegistry.registerBlock(firSingleSlab, "firSingleSlab");
GameRegistry.registerBlock(firStairs, "firStairs");
GameRegistry.registerBlock(acaciaPlank);
GameRegistry.registerBlock(acaciaWood);
GameRegistry.registerBlock(acaciaLeaves);
GameRegistry.registerBlock(acaciaDoubleSlab);
GameRegistry.registerBlock(acaciaSingleSlab);
GameRegistry.registerBlock(acaciaStairs);
GameRegistry.registerBlock(acaciaPlank, "acaciaPlank");
GameRegistry.registerBlock(acaciaWood, "acaciaWood");
GameRegistry.registerBlock(acaciaLeaves, "acaciaLeaves");
GameRegistry.registerBlock(acaciaDoubleSlab, "acaciaDoubleSlab");
GameRegistry.registerBlock(acaciaSingleSlab, "acaciaSingleSlab");
GameRegistry.registerBlock(acaciaStairs, "acaciaStairs");
GameRegistry.registerBlock(cherryPlank);
GameRegistry.registerBlock(cherryWood);
GameRegistry.registerBlock(cherryDoubleSlab);
GameRegistry.registerBlock(cherrySingleSlab);
GameRegistry.registerBlock(cherryStairs);
GameRegistry.registerBlock(cherryPlank, "cherryPlank");
GameRegistry.registerBlock(cherryWood, "cherryWood");
GameRegistry.registerBlock(cherryDoubleSlab, "cherryDoubleSlab");
GameRegistry.registerBlock(cherrySingleSlab, "cherrySingleSlab");
GameRegistry.registerBlock(cherryStairs, "cherryStairs");
GameRegistry.registerBlock(darkPlank);
GameRegistry.registerBlock(darkWood);
GameRegistry.registerBlock(darkLeaves);
GameRegistry.registerBlock(darkDoubleSlab);
GameRegistry.registerBlock(darkSingleSlab);
GameRegistry.registerBlock(darkStairs);
GameRegistry.registerBlock(darkPlank, "darkPlank");
GameRegistry.registerBlock(darkWood, "darkWood");
GameRegistry.registerBlock(darkLeaves, "darkLeaves");
GameRegistry.registerBlock(darkDoubleSlab, "darkDoubleSlab");
GameRegistry.registerBlock(darkSingleSlab, "darkSingleSlab");
GameRegistry.registerBlock(darkStairs, "darkStairs");
GameRegistry.registerBlock(magicPlank);
GameRegistry.registerBlock(magicWood);
GameRegistry.registerBlock(magicDoubleSlab);
GameRegistry.registerBlock(magicSingleSlab);
GameRegistry.registerBlock(magicStairs);
GameRegistry.registerBlock(magicPlank, "magicPlank");
GameRegistry.registerBlock(magicWood, "magicWood");
GameRegistry.registerBlock(magicDoubleSlab, "magicDoubleSlab");
GameRegistry.registerBlock(magicSingleSlab, "magicSingleSlab");
GameRegistry.registerBlock(magicStairs, "magicStairs");
GameRegistry.registerBlock(palmPlank);
GameRegistry.registerBlock(palmWood);
GameRegistry.registerBlock(palmLeaves);
GameRegistry.registerBlock(palmDoubleSlab);
GameRegistry.registerBlock(palmSingleSlab);
GameRegistry.registerBlock(palmStairs);
GameRegistry.registerBlock(palmPlank, "palmPlank");
GameRegistry.registerBlock(palmWood, "palmWood");
GameRegistry.registerBlock(palmLeaves, "palmLeaves");
GameRegistry.registerBlock(palmDoubleSlab, "palmDoubleSlab");
GameRegistry.registerBlock(palmSingleSlab, "palmSingleSlab");
GameRegistry.registerBlock(palmStairs, "palmStairs");
GameRegistry.registerBlock(mangrovePlank);
GameRegistry.registerBlock(mangroveWood);
GameRegistry.registerBlock(mangroveLeaves);
GameRegistry.registerBlock(mangroveDoubleSlab);
GameRegistry.registerBlock(mangroveSingleSlab);
GameRegistry.registerBlock(mangroveStairs);
GameRegistry.registerBlock(mangrovePlank, "mangrovePlank");
GameRegistry.registerBlock(mangroveWood, "mangroveWood");
GameRegistry.registerBlock(mangroveLeaves, "mangroveLeaves");
GameRegistry.registerBlock(mangroveDoubleSlab, "mangroveDoubleSlab");
GameRegistry.registerBlock(mangroveSingleSlab, "mangroveSingleSlab");
GameRegistry.registerBlock(mangroveStairs, "mangroveStairs");
GameRegistry.registerBlock(holyPlank);
GameRegistry.registerBlock(holyWood);
GameRegistry.registerBlock(holyLeaves);
GameRegistry.registerBlock(holyDoubleSlab);
GameRegistry.registerBlock(holySingleSlab);
GameRegistry.registerBlock(holyStairs);
GameRegistry.registerBlock(holyPlank, "holyPlank");
GameRegistry.registerBlock(holyWood, "holyWood");
GameRegistry.registerBlock(holyLeaves, "holyLeaves");
GameRegistry.registerBlock(holyDoubleSlab, "holyDoubleSlab");
GameRegistry.registerBlock(holySingleSlab, "holySingleSlab");
GameRegistry.registerBlock(holyStairs, "holyStairs");
MinecraftForge.setBlockHarvestLevel(amethystOre, "pickaxe", 3);

View file

@ -1,6 +1,5 @@
package tdwp_ftw.biomesop.worldtype;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.BiomeGenBase;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;