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

Simplified block registration and added item registration

This commit is contained in:
Adubbz 2013-11-16 09:15:49 +11:00
parent 020d7fce30
commit 3a5f1ae812
2 changed files with 150 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
common/biomesoplenty/configuration/BOPBlocks.java
View File

@ -3,6 +3,7 @@ package biomesoplenty.configuration;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import biomesoplenty.blocks.BlockAsh; import biomesoplenty.blocks.BlockAsh;
@ -213,88 +214,93 @@ public class BOPBlocks
private static void registerBlocks() private static void registerBlocks()
{ {
// Add block registration // Add block registration
GameRegistry.registerBlock(Blocks.mud.get(), ItemBlockMud.class, "bop.mud"); registerBlock(Blocks.mud.get(), ItemBlockMud.class);
GameRegistry.registerBlock(Blocks.driedDirt.get(), "bop.driedDirt"); registerBlock(Blocks.driedDirt.get());
GameRegistry.registerBlock(Blocks.redRock.get(), ItemBlockRedRock.class, "bop.redRock"); registerBlock(Blocks.redRock.get(), ItemBlockRedRock.class);
GameRegistry.registerBlock(Blocks.ash.get(), "bop.ash"); registerBlock(Blocks.ash.get());
GameRegistry.registerBlock(Blocks.flesh.get(), "bop.flesh"); registerBlock(Blocks.flesh.get());
GameRegistry.registerBlock(Blocks.plants.get(), ItemBlockPlant.class, "bop.plants"); registerBlock(Blocks.plants.get(), ItemBlockPlant.class);
GameRegistry.registerBlock(Blocks.flowers.get(), ItemBlockFlower.class, "bop.flowers"); registerBlock(Blocks.flowers.get(), ItemBlockFlower.class);
GameRegistry.registerBlock(Blocks.flowers2.get(), ItemBlockFlower2.class, "bop.flowers2"); registerBlock(Blocks.flowers2.get(), ItemBlockFlower2.class);
GameRegistry.registerBlock(Blocks.stoneFormations.get(), ItemBlockStoneFormations.class, "bop.stoneFormations"); registerBlock(Blocks.stoneFormations.get(), ItemBlockStoneFormations.class);
GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBlockMushroom.class, "bop.mushrooms"); registerBlock(Blocks.mushrooms.get(), ItemBlockMushroom.class);
GameRegistry.registerBlock(Blocks.coral.get(), ItemBlockCoral.class, "bop.coral"); registerBlock(Blocks.coral.get(), ItemBlockCoral.class);
GameRegistry.registerBlock(Blocks.willow.get(), ItemBOPWillow.class, "bop.willow"); registerBlock(Blocks.willow.get(), ItemBOPWillow.class);
GameRegistry.registerBlock(Blocks.ivy.get(), ItemBOPIvy.class, "bop.ivy"); registerBlock(Blocks.ivy.get(), ItemBOPIvy.class);
GameRegistry.registerBlock(Blocks.leaves1.get(), ItemBlockLeaves.class, "bop.leaves1"); registerBlock(Blocks.leaves1.get(), ItemBlockLeaves.class);
GameRegistry.registerBlock(Blocks.leaves2.get(), ItemBlockLeaves.class, "bop.leaves2"); registerBlock(Blocks.leaves2.get(), ItemBlockLeaves.class);
GameRegistry.registerBlock(Blocks.foliage.get(), ItemBlockFoliage.class, "bop.foliage"); registerBlock(Blocks.foliage.get(), ItemBlockFoliage.class);
GameRegistry.registerBlock(Blocks.ashStone.get(), "bop.ashStone"); registerBlock(Blocks.ashStone.get());
GameRegistry.registerBlock(Blocks.hardIce.get(), "bop.hardIce"); registerBlock(Blocks.hardIce.get());
GameRegistry.registerBlock(Blocks.leavesFruit.get(), ItemBlockAppleLeaves.class, "bop.leavesFruit"); registerBlock(Blocks.leavesFruit.get(), ItemBlockAppleLeaves.class);
GameRegistry.registerBlock(Blocks.leavesFruit2.get(), ItemBlockPersimmonLeaves.class, "bop.leavesFruit2"); registerBlock(Blocks.leavesFruit2.get(), ItemBlockPersimmonLeaves.class);
GameRegistry.registerBlock(Blocks.bamboo.get(), ItemBlockBamboo.class, "bop.bamboo"); registerBlock(Blocks.bamboo.get(), ItemBlockBamboo.class);
GameRegistry.registerBlock(Blocks.mudBrick.get(), "bop.mudBrick"); registerBlock(Blocks.mudBrick.get());
GameRegistry.registerBlock(Blocks.mudBricksStairs.get(), "bop.mudBricksStairs"); registerBlock(Blocks.mudBricksStairs.get());
GameRegistry.registerBlock(Blocks.originGrass.get(), "bop.originGrass"); registerBlock(Blocks.originGrass.get());
GameRegistry.registerBlock(Blocks.longGrass.get(), "bop.longGrass"); registerBlock(Blocks.longGrass.get());
GameRegistry.registerBlock(Blocks.treeMoss.get(), "bop.treeMoss"); registerBlock(Blocks.treeMoss.get());
GameRegistry.registerBlock(Blocks.logs1.get(), ItemBlockLog.class, "bop.wood1"); registerBlock(Blocks.logs1.get(), ItemBlockLog.class);
GameRegistry.registerBlock(Blocks.logs2.get(), ItemBlockLog.class, "bop.wood2"); registerBlock(Blocks.logs2.get(), ItemBlockLog.class);
GameRegistry.registerBlock(Blocks.logs3.get(), ItemBlockLog.class, "bop.wood3"); registerBlock(Blocks.logs3.get(), ItemBlockLog.class);
GameRegistry.registerBlock(Blocks.logs4.get(), ItemBlockLog.class, "bop.wood4"); registerBlock(Blocks.logs4.get(), ItemBlockLog.class);
GameRegistry.registerBlock(Blocks.petals.get(), ItemBlockPetals.class, "bop.petals"); registerBlock(Blocks.petals.get(), ItemBlockPetals.class);
GameRegistry.registerBlock(Blocks.saplings.get(), ItemBlockSapling.class, "bop.saplings"); registerBlock(Blocks.saplings.get(), ItemBlockSapling.class);
GameRegistry.registerBlock(Blocks.colorizedSaplings.get(), ItemBlockColorizedSapling.class, "bop.colorizedSaplings"); registerBlock(Blocks.colorizedSaplings.get(), ItemBlockColorizedSapling.class);
GameRegistry.registerBlock(Blocks.redCobbleStairs.get(), "bop.redCobbleStairs"); registerBlock(Blocks.redCobbleStairs.get());
GameRegistry.registerBlock(Blocks.redBricksStairs.get(), "bop.redBricksStairs"); registerBlock(Blocks.redBricksStairs.get());
GameRegistry.registerBlock(Blocks.hardSand.get(), "bop.hardSand"); registerBlock(Blocks.hardSand.get());
GameRegistry.registerBlock(Blocks.hardDirt.get(), "bop.hardDirt"); registerBlock(Blocks.hardDirt.get());
GameRegistry.registerBlock(Blocks.crystal.get(), "bop.crystal"); registerBlock(Blocks.crystal.get());
GameRegistry.registerBlock(Blocks.holyGrass.get(), ItemBlockGrass.class, "bop.holyGrass"); registerBlock(Blocks.holyGrass.get(), ItemBlockGrass.class);
GameRegistry.registerBlock(Blocks.holyDirt.get(), "bop.holyDirt"); registerBlock(Blocks.holyDirt.get());
GameRegistry.registerBlock(Blocks.holyStone.get(), ItemBlockSkystone.class, "bop.holyStone"); registerBlock(Blocks.holyStone.get(), ItemBlockSkystone.class);
GameRegistry.registerBlock(Blocks.holyCobbleStairs.get(), "bop.holyCobbleStairs"); registerBlock(Blocks.holyCobbleStairs.get());
GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "bop.holyBricksStairs"); registerBlock(Blocks.holyBricksStairs.get());
GameRegistry.registerBlock(Blocks.promisedPortal.get(), "bop.promisedPortal"); registerBlock(Blocks.promisedPortal.get());
GameRegistry.registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class, "bop.amethystOre"); registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class);
GameRegistry.registerBlock(Blocks.moss.get(), ItemBlockMoss.class, "bop.moss"); registerBlock(Blocks.moss.get(), ItemBlockMoss.class);
GameRegistry.registerBlock(Blocks.cragRock.get(), "bop.cragRock"); registerBlock(Blocks.cragRock.get());
GameRegistry.registerBlock(Blocks.cloud.get(), "bop.cloud"); registerBlock(Blocks.cloud.get());
GameRegistry.registerBlock(Blocks.hive.get(), ItemBlockHive.class, "bop.hive"); registerBlock(Blocks.hive.get(), ItemBlockHive.class);
GameRegistry.registerBlock(Blocks.honeyBlock.get(), "bop.honeyBlock"); registerBlock(Blocks.honeyBlock.get());
GameRegistry.registerBlock(Blocks.bones.get(), ItemBlockBones.class, "bop.bones"); registerBlock(Blocks.bones.get(), ItemBlockBones.class);
GameRegistry.registerBlock(Blocks.puddle.get(), "bop.puddle"); registerBlock(Blocks.puddle.get());
GameRegistry.registerBlock(Blocks.grave.get(), ItemBlockGrave.class, "bop.grave"); registerBlock(Blocks.grave.get(), ItemBlockGrave.class);
ItemBlockSlab.setSlabs(Blocks.stoneSingleSlab.get(), Blocks.stoneDoubleSlab.get()); 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"); registerBlock(Blocks.stoneDoubleSlab.get(), ItemBlockSlab.class);
registerBlock(Blocks.stoneSingleSlab.get(), ItemBlockSlab.class);
ItemBlockSlab.setSlabs(Blocks.woodenSingleSlab1.get(), Blocks.woodenDoubleSlab1.get()); 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"); registerBlock(Blocks.woodenDoubleSlab1.get(), ItemBlockSlab.class);
registerBlock(Blocks.woodenSingleSlab1.get(), ItemBlockSlab.class);
ItemBlockSlab.setSlabs(Blocks.woodenSingleSlab2.get(), Blocks.woodenDoubleSlab2.get()); 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"); registerBlock(Blocks.woodenDoubleSlab2.get(), ItemBlockSlab.class);
registerBlock(Blocks.woodenSingleSlab2.get(), ItemBlockSlab.class);
GameRegistry.registerBlock(Blocks.planks.get(), ItemBlockPlank.class, "bop.planks"); registerBlock(Blocks.planks.get(), ItemBlockPlank.class);
GameRegistry.registerBlock(Blocks.acaciaStairs.get(), "bop.acaciaStairs"); registerBlock(Blocks.acaciaStairs.get());
GameRegistry.registerBlock(Blocks.cherryStairs.get(), "bop.cherryStairs"); registerBlock(Blocks.cherryStairs.get());
GameRegistry.registerBlock(Blocks.darkStairs.get(), "bop.darkStairs"); registerBlock(Blocks.darkStairs.get());
GameRegistry.registerBlock(Blocks.firStairs.get(), "bop.firStairs"); registerBlock(Blocks.firStairs.get());
GameRegistry.registerBlock(Blocks.holyStairs.get(), "bop.holyStairs"); registerBlock(Blocks.holyStairs.get());
GameRegistry.registerBlock(Blocks.magicStairs.get(), "bop.magicStairs"); registerBlock(Blocks.magicStairs.get());
GameRegistry.registerBlock(Blocks.mangroveStairs.get(), "bop.mangroveStairs"); registerBlock(Blocks.mangroveStairs.get());
GameRegistry.registerBlock(Blocks.palmStairs.get(), "bop.palmStairs"); registerBlock(Blocks.palmStairs.get());
GameRegistry.registerBlock(Blocks.redwoodStairs.get(), "bop.redwoodStairs"); registerBlock(Blocks.redwoodStairs.get());
GameRegistry.registerBlock(Blocks.willowStairs.get(), "bop.willowStairs"); registerBlock(Blocks.willowStairs.get());
GameRegistry.registerBlock(Blocks.pineStairs.get(), "bop.pineStairs"); registerBlock(Blocks.pineStairs.get());
GameRegistry.registerBlock(Blocks.hellBarkStairs.get(), "bop.hellBarkStairs"); registerBlock(Blocks.hellBarkStairs.get());
GameRegistry.registerBlock(Blocks.jacarandaStairs.get(), "bop.jacarandaStairs"); registerBlock(Blocks.jacarandaStairs.get());
GameRegistry.registerBlock(Blocks.leavesColorized.get(), ItemBlockColorizedLeaves.class, "bop.leavesColorized"); registerBlock(Blocks.leavesColorized.get(), ItemBlockColorizedLeaves.class);
} }
private static void registerTileEntities() private static void registerTileEntities()
@ -315,4 +321,14 @@ public class BOPBlocks
MinecraftForge.addGrassPlant(Blocks.foliage.get(), 10, 75); MinecraftForge.addGrassPlant(Blocks.foliage.get(), 10, 75);
MinecraftForge.addGrassPlant(Blocks.foliage.get(), 11, 75); MinecraftForge.addGrassPlant(Blocks.foliage.get(), 11, 75);
} }
private static void registerBlock(Block block)
{
GameRegistry.registerBlock(block, block.getUnlocalizedName().replace("tile.", ""));
}
private static void registerBlock(Block block, Class<? extends ItemBlock> itemBlockClass)
{
GameRegistry.registerBlock(block, itemBlockClass, block.getUnlocalizedName().replace("tile.", ""));
}
} }

60
common/biomesoplenty/configuration/BOPItems.java
View File

@ -3,9 +3,11 @@ package biomesoplenty.configuration;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.block.Block;
import net.minecraft.item.EnumArmorMaterial; import net.minecraft.item.EnumArmorMaterial;
import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.common.EnumHelper; import net.minecraftforge.common.EnumHelper;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import biomesoplenty.BiomesOPlenty; import biomesoplenty.BiomesOPlenty;
@ -39,6 +41,7 @@ import com.google.common.base.Optional;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.ReflectionHelper;
public class BOPItems { public class BOPItems {
@ -98,6 +101,7 @@ public class BOPItems {
EnumArmorMaterialFlippers = EnumHelper.addArmorMaterial("FLIPPERS", -1, new int[]{0, 0, 0, 0}, 0); EnumArmorMaterialFlippers = EnumHelper.addArmorMaterial("FLIPPERS", -1, new int[]{0, 0, 0, 0}, 0);
initializeItems(); initializeItems();
registerItems();
MinecraftForge.setToolClass(Items.shovelAmethyst.get(), "shovel", 4); MinecraftForge.setToolClass(Items.shovelAmethyst.get(), "shovel", 4);
MinecraftForge.setToolClass(Items.pickaxeAmethyst.get(), "pickaxe", 4); MinecraftForge.setToolClass(Items.pickaxeAmethyst.get(), "pickaxe", 4);
@ -155,4 +159,60 @@ public class BOPItems {
Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfigurationIDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots")); Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfigurationIDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots"));
Items.flippers = Optional.of((new ArmorFlippers(BOPConfigurationIDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers")); Items.flippers = Optional.of((new ArmorFlippers(BOPConfigurationIDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers"));
} }
private static void registerItems()
{
registerItem(Items.food.get());
registerItem(Items.miscItems.get());
registerItem(Items.jarEmpty.get());
registerItem(Items.jarFilled.get());
registerItem(Items.gems.get());
registerItem(Items.mudball.get());
registerItem(Items.dartBlower.get());
registerItem(Items.dart.get());
registerItem(Items.ancientStaff.get());
registerItem(Items.enderporter.get());
registerItem(Items.bopDisc.get());
registerItem(Items.bopDiscMud.get());
registerItem(Items.swordMud.get());
registerItem(Items.shovelMud.get());
registerItem(Items.pickaxeMud.get());
registerItem(Items.axeMud.get());
registerItem(Items.hoeMud.get());
registerItem(Items.helmetMud.get());
registerItem(Items.chestplateMud.get());
registerItem(Items.leggingsMud.get());
registerItem(Items.bootsMud.get());
registerItem(Items.swordAmethyst.get());
registerItem(Items.shovelAmethyst.get());
registerItem(Items.pickaxeAmethyst.get());
registerItem(Items.axeAmethyst.get());
registerItem(Items.hoeAmethyst.get());
registerItem(Items.helmetAmethyst.get());
registerItem(Items.chestplateAmethyst.get());
registerItem(Items.leggingsAmethyst.get());
registerItem(Items.bootsAmethyst.get());
registerItem(Items.scytheWood.get());
registerItem(Items.scytheStone.get());
registerItem(Items.scytheIron.get());
registerItem(Items.scytheGold.get());
registerItem(Items.scytheDiamond.get());
registerItem(Items.scytheMud.get());
registerItem(Items.scytheAmethyst.get());
registerItem(Items.flowerBand.get());
registerItem(Items.wadingBoots.get());
registerItem(Items.flippers.get());
}
private static void registerItem(Item item)
{
GameRegistry.registerItem(item, item.getUnlocalizedName().replace("item.", ""));
}
} }