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

Made item references non-retarded, removed the odd few crafting config options. These are not our responsibility, if you want to tweak the hell out of things to an extent that we don't allow use a mod like MineTweaker

Browse source
This commit is contained in:
Adubbz 2014-06-03 21:28:26 +10:00
parent 949046c09b
commit 61df48b3db
65 changed files with 389 additions and 430 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/biomesoplenty/ClientProxy.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.util.MathHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.client.particles.EntityDandelionFX;
import biomesoplenty.client.particles.EntityMagicTreeFX;
import biomesoplenty.client.particles.EntityPixieTrailFX;
@ -55,7 +56,7 @@ public class ClientProxy extends CommonProxy
RenderUtils.bambooModel = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerEntityRenderingHandler(EntityDart.class, new RenderDart());
RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, new RenderSnowball(BOPItemHelper.get("mudball"), 0));
RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, new RenderSnowball(BOPCItems.mudball, 0));
if (BOPConfigurationIDs.globID > 0)
{
@ -108,15 +109,15 @@ public class ClientProxy extends CommonProxy
if (string == "mud")
{
entityfx = new EntityBreakingFX(minecraft.theWorld, x, y, z, BOPItemHelper.get("mudball"));
entityfx = new EntityBreakingFX(minecraft.theWorld, x, y, z, BOPCItems.mudball);
}
else if (string == "dart")
{
entityfx = new EntityBreakingFX(minecraft.theWorld, x, y, z, BOPItemHelper.get("dart"), 0);
entityfx = new EntityBreakingFX(minecraft.theWorld, x, y, z, BOPCItems.dart, 0);
}
else if (string == "poisondart")
{
entityfx = new EntityBreakingFX(minecraft.theWorld, x, y, z, BOPItemHelper.get("dart"), 1);
entityfx = new EntityBreakingFX(minecraft.theWorld, x, y, z, BOPCItems.dart, 1);
}
else if (string == "dandelion")
{

2
src/main/java/biomesoplenty/api/BOPBlockHelper.java
View file

@ -18,6 +18,6 @@ public class BOPBlockHelper
public static String getUniqueName(Block block)
{
return GameData.blockRegistry.getNameForObject(block);
return GameData.getBlockRegistry().getNameForObject(block);
}
}

14
src/main/java/biomesoplenty/api/BOPItemHelper.java
View file

@ -1,12 +1,9 @@
package biomesoplenty.api;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import biomesoplenty.common.utils.BOPModInfo;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;
public class BOPItemHelper
{
@ -18,17 +15,8 @@ public class BOPItemHelper
public static ArmorMaterial armorMaterialUnprotective;
public static Item get(String name)
{
Item item = GameRegistry.findItem(BOPModInfo.modID, name);
if (item == null) throw new RuntimeException("The referenced item is null!");
return GameRegistry.findItem(BOPModInfo.modID, name);
}
public static String getUniqueName(Item item)
{
return GameData.itemRegistry.getNameForObject(item);
return GameData.getItemRegistry().getNameForObject(item);
}
}

58
src/main/java/biomesoplenty/api/content/BOPCItems.java Normal file
View file

@ -0,0 +1,58 @@
package biomesoplenty.api.content;
import net.minecraft.item.Item;
public class BOPCItems
{
public static Item food;
public static Item turnipSeeds;
public static Item misc;
public static Item gems;
public static Item mudball;
public static Item jarEmpty;
public static Item jarFilled;
public static Item dartBlower;
public static Item dart;
public static Item ancientStaff;
public static Item enderporter;
public static Item record_wanderer;
public static Item record_corruption;
public static Item biomeFinder;
public static Item biomeEssence;
public static Item bopBucket;
public static Item swordMud;
public static Item shovelMud;
public static Item pickaxeMud;
public static Item axeMud;
public static Item hoeMud;
public static Item swordAmethyst;
public static Item shovelAmethyst;
public static Item pickaxeAmethyst;
public static Item axeAmethyst;
public static Item hoeAmethyst;
public static Item scytheWood;
public static Item scytheStone;
public static Item scytheIron;
public static Item scytheGold;
public static Item scytheDiamond;
public static Item scytheMud;
public static Item scytheAmethyst;
public static Item helmetMud;
public static Item chestplateMud;
public static Item leggingsMud;
public static Item bootsMud;
public static Item helmetAmethyst;
public static Item chestplateAmethyst;
public static Item leggingsAmethyst;
public static Item bootsAmethyst;
public static Item flowerBand;
public static Item flippers;
public static Item wadingBoots;
}

7
src/main/java/biomesoplenty/common/armor/ItemAmethystArmor.java
View file

@ -7,6 +7,7 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemAmethystArmor extends ItemArmor
{
@ -24,7 +25,7 @@ public class ItemAmethystArmor extends ItemArmor
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith)
{
if (itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
return true;
return false;
@ -33,10 +34,10 @@ public class ItemAmethystArmor extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
if (stack.getItem() == BOPItemHelper.get("helmetAmethyst") || stack.getItem() == BOPItemHelper.get("chestplateAmethyst") || stack.getItem() == BOPItemHelper.get("bootsAmethyst"))
if (stack.getItem() == BOPCItems.helmetAmethyst || stack.getItem() == BOPCItems.chestplateAmethyst || stack.getItem() == BOPCItems.bootsAmethyst)
return "biomesoplenty:textures/armor/amethyst_1.png";
if (stack.getItem() == BOPItemHelper.get("leggingsAmethyst"))
if (stack.getItem() == BOPCItems.leggingsAmethyst)
return "biomesoplenty:textures/armor/amethyst_2.png";
return null;

3
src/main/java/biomesoplenty/common/armor/ItemFlippers.java
View file

@ -6,6 +6,7 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemFlippers extends ItemArmor
{
@ -25,7 +26,7 @@ public class ItemFlippers extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
if (stack.getItem() == BOPItemHelper.get("flippers")) return "biomesoplenty:textures/armor/flippers.png";
if (stack.getItem() == BOPCItems.flippers) return "biomesoplenty:textures/armor/flippers.png";
return null;
}

5
src/main/java/biomesoplenty/common/armor/ItemMuddyArmor.java
View file

@ -6,6 +6,7 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemMuddyArmor extends ItemArmor
{
@ -23,10 +24,10 @@ public class ItemMuddyArmor extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
if (stack.getItem() == BOPItemHelper.get("helmetMud") || stack.getItem() == BOPItemHelper.get("chestplateMud") || stack.getItem() == BOPItemHelper.get("bootsMud"))
if (stack.getItem() == BOPCItems.helmetMud || stack.getItem() == BOPCItems.chestplateMud || stack.getItem() == BOPCItems.bootsMud)
return "biomesoplenty:textures/armor/mud_1.png";
if (stack.getItem() == BOPItemHelper.get("leggingsMud"))
if (stack.getItem() == BOPCItems.leggingsMud)
return "biomesoplenty:textures/armor/mud_2.png";
return null;

3
src/main/java/biomesoplenty/common/armor/ItemWadingBoots.java
View file

@ -6,6 +6,7 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemWadingBoots extends ItemArmor
{
@ -24,7 +25,7 @@ public class ItemWadingBoots extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{
if (stack.getItem() == BOPItemHelper.get("wadingBoots"))
if (stack.getItem() == BOPCItems.wadingBoots)
return "biomesoplenty:textures/armor/wadingboots.png";
return null;

3
src/main/java/biomesoplenty/common/blocks/BOPBlock.java
View file

@ -2,12 +2,11 @@ package biomesoplenty.common.blocks;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
public abstract class BOPBlock extends Block
{

26
src/main/java/biomesoplenty/common/blocks/BlockAsh.java
View file

@ -1,7 +1,7 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -12,37 +12,31 @@ import net.minecraft.item.Item;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class BlockAsh extends Block
{
public BlockAsh()
{
//TODO: Material.sand
super(Material.sand);
//TODO: this.setHardness
this.setHardness(0.4F);
this.setHarvestLevel("shovel", 0);
//TODO setStepSound(Block.soundSandFootstep)
this.setStepSound(Block.soundTypeSand);
//TODO: this.setCreativeTab()
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
@Override
//TODO: registerIcons()
public void registerBlockIcons(IIconRegister iconRegister)
{
//TODO: blockIcon
this.blockIcon = iconRegister.registerIcon("biomesoplenty:ashblock");
}
@Override
//TODO: getCollisionBoundingBoxFromPool
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z)
{
float yOffset = 0.125F;
@ -50,7 +44,6 @@ public class BlockAsh extends Block
}
@Override
//TODO: randomDisplayTick()
public void randomDisplayTick(World world, int x, int y, int z, Random random)
{
super.randomDisplayTick(world, x, y, z, random);
@ -73,14 +66,13 @@ public class BlockAsh extends Block
}
@Override
//TODO: onEntityCollidedWithBlock()
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity)
{
if (entity instanceof EntityPlayer)
{
InventoryPlayer inventory = ((EntityPlayer)entity).inventory;
if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPItemHelper.get("wadingBoots"))
if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPCItems.wadingBoots)
{
return;
}
@ -90,15 +82,13 @@ public class BlockAsh extends Block
entity.motionZ *= 0.4D;
}
//@Override
//TODO: getItemDropped()
@Override
public Item getItemDropped(int metadata, Random random, int fortune)
{
return BOPItemHelper.get("misc");
return BOPCItems.misc;
}
@Override
//TODO damageDropped()
public int damageDropped(int meta)
{
return 1;

2
src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java
View file

@ -23,8 +23,6 @@ import net.minecraftforge.common.util.FakePlayer;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
{

2
src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java
View file

@ -1,7 +1,6 @@
package biomesoplenty.common.blocks;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
@ -20,7 +19,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import cpw.mods.fml.common.Loader;
public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearable

1
src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java
View file

@ -12,7 +12,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.BiomesOPlenty;

5
src/main/java/biomesoplenty/common/blocks/BlockBOPCoral.java
View file

@ -6,7 +6,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -14,11 +13,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.blocks.BlockBOPLog.LogCategory;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPCoral extends BOPBlock
{

18
src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java
View file

@ -1,11 +1,8 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.templates.BOPBlockWorldDecor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -23,9 +20,12 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.templates.BOPBlockWorldDecor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower extends BOPBlockWorldDecor
{

7
src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java
View file

@ -29,6 +29,7 @@ import net.minecraftforge.common.util.FakePlayer;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.templates.BOPBlockWorldDecor;
import cpw.mods.fml.relauncher.Side;
@ -132,12 +133,12 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
if (world.rand.nextInt(2) == 0)
{
ret.add(new ItemStack(BOPItemHelper.get("turnipSeeds"), 1));
ret.add(new ItemStack(BOPCItems.turnipSeeds, 1));
}
break;
case 8:
ret.add(new ItemStack(BOPItemHelper.get("food"), 1, 0));
ret.add(new ItemStack(BOPCItems.food, 1, 0));
break;
}
@ -341,7 +342,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable
{
world.setBlock(x, y, z, this, 4, 3);
EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 0));
EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 0));
if (!world.isRemote)
{

23
src/main/java/biomesoplenty/common/blocks/BlockBOPGems.java
View file

@ -15,6 +15,7 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class BlockBOPGems extends Block
{
@ -23,7 +24,6 @@ public class BlockBOPGems extends Block
public BlockBOPGems()
{
//TODO: Material.rock
super(Material.rock);
this.setHarvestLevel("pickaxe", 3, 0);
@ -33,15 +33,12 @@ public class BlockBOPGems extends Block
this.setHarvestLevel("pickaxe", 2, i);
}
//TODO setStepSound(Block.soundStoneFootstep)
this.setStepSound(Block.soundTypePiston);
//TODO: this.setCreativeTab()
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
@Override
//TODO: registerIcons()
public void registerBlockIcons(IIconRegister iconRegister)
{
textures = new IIcon[types.length];
@ -52,7 +49,6 @@ public class BlockBOPGems extends Block
}
@Override
//TODO: getIcon()
public IIcon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length) {
@ -63,14 +59,12 @@ public class BlockBOPGems extends Block
}
@Override
//TODO: getDamageValue()
public int getDamageValue(World world, int x, int y, int z)
{
return world.getBlockMetadata(x, y, z);
}
@Override
//TODO: getSubBlocks()
public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list)
{
for (int i = 0; i < types.length; ++i)
@ -80,7 +74,6 @@ public class BlockBOPGems extends Block
}
@Override
//TODO: getBlockHardness()
public float getBlockHardness(World world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
@ -97,15 +90,12 @@ public class BlockBOPGems extends Block
}
@Override
//TODO: getItemDropped()
public Item getItemDropped(int metadata, Random random, int fortune)
{
//TODO: getItemFromBlock()
return (metadata % 2 == 0) ? BOPItemHelper.get("gems") : Item.getItemFromBlock(this);
return (metadata % 2 == 0) ? BOPCItems.gems : Item.getItemFromBlock(this);
}
@Override
//TODO damageDropped()
public int damageDropped(int meta)
{
if (meta == 0)
@ -179,15 +169,12 @@ public class BlockBOPGems extends Block
@Override
public int quantityDropped(int meta, int fortune, Random random)
{
//TODO: quantityDroppedWithBonus()
return (meta % 2 == 0) ? quantityDroppedWithBonus(fortune, random) : 1;
}
@Override
//TODO: quantityDroppedWithBonus()
public int quantityDroppedWithBonus(int bonus, Random random)
{
//TODO: getItemForBlock() getItem()
if (bonus > 0 && Item.getItemFromBlock(this) != this.getItemDropped(0, random, bonus))
{
int rnd = random.nextInt(bonus + 2) - 1;
@ -196,7 +183,6 @@ public class BlockBOPGems extends Block
rnd = 0;
}
//TODO: quantityDropped()
return this.quantityDropped(random) * (rnd + 1);
}
else
@ -204,17 +190,14 @@ public class BlockBOPGems extends Block
}
@Override
//TODO: dropBlockAsItemWithChance()
public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float chance, int fortune)
{
//TODO: dropBlockAsItemWithChance()
super.dropBlockAsItemWithChance(world, x, y, z, metadata, chance, fortune);
//TODO: getItemDropped() getItemFromBlock()
if (this.getItemDropped(metadata, world.rand, fortune) != Item.getItemFromBlock(this))
{
int var8 = MathHelper.getRandomIntegerInRange(world.rand, 3, 7);
//TODO: dropXpOnBlockBreak()
this.dropXpOnBlockBreak(world, x, y, z, var8);
}
}

6
src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java
View file

@ -16,7 +16,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCBiomes;
import biomesoplenty.api.utils.BiomeUtils;
import biomesoplenty.api.content.BOPCItems;
public class BlockBOPGeneric extends Block
{
@ -147,7 +147,7 @@ public class BlockBOPGeneric extends Block
switch (type)
{
case CRYSTAL:
return BOPItemHelper.get("misc");
return BOPCItems.misc;
default:
return super.getItemDropped(metadata, random, fortune);
@ -170,7 +170,7 @@ public class BlockBOPGeneric extends Block
!areBiomesEqual(biome, BiomeGenBase.frozenRiver) && !areBiomesEqual(biome, BiomeGenBase.hell) && !areBiomesEqual(biome, BiomeGenBase.river) && !areBiomesEqual(biome, BiomeGenBase.sky) &&
!areBiomesEqual(biome, BiomeGenBase.ocean) && !areBiomesEqual(biome, BiomeGenBase.deepOcean))
{
ItemStack biomeEssence = new ItemStack(BOPItemHelper.get("biomeEssence"));
ItemStack biomeEssence = new ItemStack(BOPCItems.biomeEssence);
biomeEssence.setTagCompound(new NBTTagCompound());

1
src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import biomesoplenty.BiomesOPlenty;

20
src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java
View file

@ -1,10 +1,9 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import cpw.mods.fml.common.Loader;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
import net.minecraft.block.material.Material;
@ -18,11 +17,10 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.common.Loader;
public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
{
@ -400,7 +398,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
if (((metadata & 3) == 0 || (metadata & 3) == 4 || (metadata & 3) == 7) && (world.rand.nextInt(50) == 0))
{
//TODO:dropBlockAsItem_do
this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8));
this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 8));
}
}

2
src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java
View file

@ -1,6 +1,5 @@
package biomesoplenty.common.blocks;
import java.util.Calendar;
import java.util.List;
import net.minecraft.block.Block;
@ -16,7 +15,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
public class BlockBOPMushroom extends BlockBush
{

15
src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java
View file

@ -12,7 +12,6 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@ -22,10 +21,8 @@ import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.FakePlayer;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearable
{
@ -288,7 +285,7 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab
{
//TODO: setBlock
world.setBlock(x, y, z, this, meta - 3, 3);
EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8));
EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 8));
if (!world.isRemote)
{
@ -339,13 +336,13 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab
}
//TODO: dropBlockAsItem_do
if ((metadata & 3) == 3) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8));
if ((metadata & 3) == 3) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 8));
//TODO: dropBlockAsItem_do
else if ((metadata & 3) == 2 && world.rand.nextInt(8) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8));
else if ((metadata & 3) == 2 && world.rand.nextInt(8) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 8));
//TODO: dropBlockAsItem_do
else if ((metadata & 3) == 1 && world.rand.nextInt(16) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8));
else if ((metadata & 3) == 1 && world.rand.nextInt(16) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 8));
//TODO: dropBlockAsItem_do
else if ((metadata & 3) == 0 && world.rand.nextInt(32) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPItemHelper.get("food"), 1, 8));
else if ((metadata & 3) == 0 && world.rand.nextInt(32) == 0) this.dropBlockAsItem(world, x, y, z, new ItemStack(BOPCItems.food, 1, 8));
}
@Override

1
src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java
View file

@ -14,7 +14,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import biomesoplenty.BiomesOPlenty;

1
src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java
View file

@ -6,7 +6,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;

6
src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java
View file

@ -26,7 +26,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.client.render.RenderUtils;
import biomesoplenty.common.blocks.templates.BOPBlockWorldDecor;
import cpw.mods.fml.relauncher.Side;
@ -265,7 +265,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable
return new ItemStack(this, 1, 7);
case 11:
return new ItemStack(BOPItemHelper.get("food"), 1, 2);
return new ItemStack(BOPCItems.food, 1, 2);
}
return new ItemStack(this, 1, meta);
@ -296,7 +296,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable
}
else if (metadata == 11)
{
return BOPItemHelper.get("food");
return BOPCItems.food;
}
else
{

1
src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java
View file

@ -9,7 +9,6 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;

1
src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java
View file

@ -6,7 +6,6 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStairs;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
import biomesoplenty.BiomesOPlenty;

4
src/main/java/biomesoplenty/common/blocks/BlockFlesh.java
View file

@ -12,7 +12,7 @@ import net.minecraft.item.Item;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class BlockFlesh extends Block
{
@ -88,7 +88,7 @@ public class BlockFlesh extends Block
//TODO: getItemDropped()
public Item getItemDropped(int metadata, Random random, int fortune)
{
return BOPItemHelper.get("misc");
return BOPCItems.misc;
}
@Override

6
src/main/java/biomesoplenty/common/blocks/BlockFlowerVine.java
View file

@ -1,12 +1,12 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.world.IBlockAccess;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockFlowerVine extends BlockVine
{

1
src/main/java/biomesoplenty/common/blocks/BlockGrave.java
View file

@ -5,7 +5,6 @@ import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;

6
src/main/java/biomesoplenty/common/blocks/BlockHive.java
View file

@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.entities.EntityWasp;
public class BlockHive extends Block
@ -87,12 +87,12 @@ public class BlockHive extends Block
{
if (metadata == 0)
{
return BOPItemHelper.get("misc");
return BOPCItems.misc;
}
if (metadata == 3)
{
return BOPItemHelper.get("food");
return BOPCItems.food;
}
//TODO: getItemFromBlock()

9
src/main/java/biomesoplenty/common/blocks/BlockMud.java
View file

@ -3,8 +3,6 @@ package biomesoplenty.common.blocks;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@ -18,6 +16,9 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockMud extends BOPBlock
{
@ -87,7 +88,7 @@ public class BlockMud extends BOPBlock
{
InventoryPlayer inventory = ((EntityPlayer)entity).inventory;
if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPItemHelper.get("wadingBoots"))
if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPCItems.wadingBoots)
{
return;
}
@ -105,7 +106,7 @@ public class BlockMud extends BOPBlock
@Override
public Item getItemDropped(int metadata, Random random, int fortune)
{
if (metadata == 0) return BOPItemHelper.get("mudball");
if (metadata == 0) return BOPCItems.mudball;
else return super.getItemDropped(metadata, random, fortune);
}

1
src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java
View file

@ -3,7 +3,6 @@ package biomesoplenty.common.blocks;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.IGrowable;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;

6
src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java
View file

@ -1,12 +1,12 @@
package biomesoplenty.common.blocks;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.world.IBlockAccess;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockTreeMoss extends BlockVine
{

17
src/main/java/biomesoplenty/common/blocks/BlockTurnip.java
View file

@ -1,15 +1,11 @@
package biomesoplenty.common.blocks;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.block.BlockCrops;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -20,12 +16,10 @@ public class BlockTurnip extends BlockCrops
public BlockTurnip()
{
//TODO: setTextureName()
this.setBlockTextureName("turnip");
}
@Override
//TODO: getIcon()
public IIcon getIcon(int side, int meta)
{
if (meta < 7)
@ -47,32 +41,29 @@ public class BlockTurnip extends BlockCrops
//TODO: getSeedItem()
protected Item func_149866_i()
{
return BOPItemHelper.get("turnipSeeds");
return BOPCItems.turnipSeeds;
}
@Override
//TODO: getCropItem()
protected Item func_149865_P()
{
return BOPItemHelper.get("food");
return BOPCItems.food;
}
//@Override
//TODO damageDropped()
@Override
public int damageDropped(int meta)
{
return meta == 7 ? 11 : 0;
}
@Override
//TODO: registerIcons()
public void registerBlockIcons(IIconRegister iconRegister)
{
this.iconArray = new IIcon[4];
for (int i = 0; i < this.iconArray.length; ++i)
{
//TODO: getTextureName()
this.iconArray[i] = iconRegister.registerIcon("biomesoplenty:" + this.getTextureName() + "_stage_" + i);
}
}

1
src/main/java/biomesoplenty/common/blocks/BlockWillow.java
View file

@ -3,7 +3,6 @@ package biomesoplenty.common.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import biomesoplenty.BiomesOPlenty;
public class BlockWillow extends BlockVine

20
src/main/java/biomesoplenty/common/configuration/BOPConfigurationMisc.java
View file

@ -16,16 +16,6 @@ public class BOPConfigurationMisc
public static boolean hotSpringsRegeneration;
public static boolean amethystTools;
public static boolean mudTools;
public static boolean scytheCrafting;
public static boolean staffCrafting;
public static boolean enderporterCrafting;
public static boolean dartCrafting;
public static boolean flowerbandCrafting;
public static int promisedLandSkyColor;
public static int spawnSearchRadius;
public static boolean onlySpawnOnBeaches;
@ -42,22 +32,12 @@ public class BOPConfigurationMisc
hotSpringsRegeneration = config.get("Miscellanious Settings", "Enable Spring Water Regeneration Effect", true).getBoolean(true);
hotSpringsRegeneration = config.get("Miscellanious Settings", "Behave Normally During Special Events", false).getBoolean(false);
amethystTools = config.get("Crafting Settings", "Enable Amethyst Tool/Armor Crafting", true).getBoolean(true);
mudTools = config.get("Crafting Settings", "Enable Mud Tool/Armor Crafting", true).getBoolean(true);
scytheCrafting = config.get("Crafting Settings", "Enable Scythe Crafting", true).getBoolean(true);
staffCrafting = config.get("Crafting Settings", "Enable Ancient Staff Crafting", true).getBoolean(true);
enderporterCrafting = config.get("Crafting Settings", "Enable Enderporter Crafting", true).getBoolean(true);
dartCrafting = config.get("Crafting Settings", "Enable Dartblower/Dart Crafting", true).getBoolean(true);
flowerbandCrafting = config.get("Crafting Settings", "Enable Flower Band Crafting", true).getBoolean(true);
//Hard-Coded Colors
skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false);
spawnSearchRadius = config.get("Spawn Settings", "Spawn Location Search Radius", 1024, "Must be 256 or higher").getInt();
if (spawnSearchRadius < 256) spawnSearchRadius = 256;
onlySpawnOnBeaches = config.get("Spawn Settings", "Only Spawn On Beaches", true).getBoolean(true);
promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 5883101, null).getInt();
}
catch (Exception e)
{

16
src/main/java/biomesoplenty/common/core/BOPArmor.java
View file

@ -18,20 +18,6 @@ public class BOPArmor
private static void initializeArmor()
{
registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0).setUnlocalizedName("helmetMud"));
registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1).setUnlocalizedName("chestplateMud"));
registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2).setUnlocalizedName("leggingsMud"));
registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3).setUnlocalizedName("bootsMud"));
registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0).setUnlocalizedName("helmetAmethyst"));
registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1).setUnlocalizedName("chestplateAmethyst"));
registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2).setUnlocalizedName("leggingsAmethyst"));
registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3).setUnlocalizedName("bootsAmethyst"));
registerItem(new ItemFlowerBand(BOPItemHelper.armorMaterialUnprotective, BiomesOPlenty.proxy.addArmor("flowerBand"), 0).setUnlocalizedName("flowerBand"));
registerItem(new ItemFlippers(BOPItemHelper.armorMaterialUnprotective, BiomesOPlenty.proxy.addArmor("flippers"), 3).setUnlocalizedName("flippers"));
registerItem(new ItemWadingBoots(BOPItemHelper.armorMaterialUnprotective, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3).setUnlocalizedName("wadingBoots"));
}
}

235
src/main/java/biomesoplenty/common/core/BOPCrafting.java
View file

@ -2,6 +2,7 @@ package biomesoplenty.common.core;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import biomesoplenty.common.handlers.FurnaceFuelHandler;
import biomesoplenty.common.recipes.BiomeEssenceRecipe;
@ -45,23 +46,23 @@ public class BOPCrafting
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 12), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,4)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,8)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 10), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,3)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 8), new Object[] {new ItemStack(BOPItemHelper.get("misc"), 1, 1)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 8), new Object[] {new ItemStack(BOPCItems.misc, 1, 1)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 12), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,7)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,4)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,4)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,1)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,1)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 14), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,3)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 11), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,4)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,5)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("flowers2"),1,5)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("plants"),1,7)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 7), new Object[] {new ItemStack(BOPBlockHelper.get("moss"),1,0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,9)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("misc"), 1, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 4, 3), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,13)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 5), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 6), new Object[] {new ItemStack(BOPBlockHelper.get("plants"),1,7)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 7), new Object[] {new ItemStack(BOPBlockHelper.get("moss"),1,0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 8), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,9)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.misc, 1, 9), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 4, 3), new Object[] {new ItemStack(BOPBlockHelper.get("flowers"),1,13)});
//Brick stairs and slabs
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("stoneSingleSlab"), 6, 2), new Object[] {"RRR", 'R', BOPBlockHelper.get("mudBricks")});
@ -154,127 +155,107 @@ public class BOPCrafting
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("overgrownNetherrack"), 1, 0), new Object[] {"SSS", "SNS", "SSS", 'S', Items.wheat_seeds, 'N', Blocks.netherrack});
GameRegistry.addRecipe(new ItemStack(Blocks.wool, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(BOPBlockHelper.get("plants"), 1, 7)});
GameRegistry.addRecipe(new ItemStack(Items.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("misc"), 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("mud"), 1), new Object[] {"MM", "MM", 'M', BOPItemHelper.get("mudball")});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 3), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 5), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 2)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 7), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 3)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 9), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 4)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 11), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 5)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 13), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 6)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 15), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 7)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("ash"), 1), new Object[] {"AA", "AA", 'A', new ItemStack(BOPItemHelper.get("misc"), 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("mudBricks"), 1), new Object[] {"MM", "MM", 'M', new ItemStack(BOPItemHelper.get("misc"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("crystal"), 1), new Object[] {"CC", "CC", 'C', new ItemStack(BOPItemHelper.get("misc"), 1, 4)});
GameRegistry.addRecipe(new ItemStack(Items.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.misc, 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("mud"), 1), new Object[] {"MM", "MM", 'M', BOPCItems.mudball});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 3), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 5), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 2)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 7), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 3)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 9), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 4)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 11), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 5)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 13), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 6)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("gemOre"), 1, 15), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.gems, 1, 7)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("ash"), 1), new Object[] {"AA", "AA", 'A', new ItemStack(BOPCItems.misc, 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("mudBricks"), 1), new Object[] {"MM", "MM", 'M', new ItemStack(BOPCItems.misc, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("crystal"), 1), new Object[] {"CC", "CC", 'C', new ItemStack(BOPCItems.misc, 1, 4)});
// GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("planks"), 1, 10), new Object[] {"###", "###", "###", '#', BOPBlockHelper.get("bamboo")});
GameRegistry.addRecipe(new ItemStack(Blocks.mossy_cobblestone, 1, 0), new Object[] {"MMM", "MCM", "MMM", 'M', BOPBlockHelper.get("moss"), 'C', Blocks.cobblestone});
GameRegistry.addRecipe(new ItemStack(Blocks.stonebrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', BOPBlockHelper.get("moss"), 'S', Blocks.stonebrick});
//Scythes
if (BOPConfigurationMisc.scytheCrafting)
{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheWood"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheStone"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Blocks.cobblestone, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheIron"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Items.iron_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheGold"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Items.gold_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheDiamond"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Items.diamond, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheWood"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheStone"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Blocks.cobblestone, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheIron"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Items.iron_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheGold"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Items.gold_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheDiamond"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Items.diamond, Character.valueOf('S'), "stickWood" }));
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheWood, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheStone, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Blocks.cobblestone, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheIron, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Items.iron_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheGold, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Items.gold_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheDiamond, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Items.diamond, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheWood, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheStone, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Blocks.cobblestone, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheIron, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Items.iron_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheGold, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Items.gold_ingot, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheDiamond, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), Items.diamond, Character.valueOf('S'), "stickWood" }));
//Mud Tools and Armor
if (BOPConfigurationMisc.mudTools)
{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("pickaxeMud"), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), BOPItemHelper.get("mudball"), Character.valueOf('X'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("shovelMud"), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), BOPItemHelper.get("mudball"), Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("swordMud"), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), BOPItemHelper.get("mudball"), Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("axeMud"), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), BOPItemHelper.get("mudball"), Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("hoeMud"), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), BOPItemHelper.get("mudball"), Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("helmetMud"), 1), new Object [] {"###", "# #", Character.valueOf('#'), BOPItemHelper.get("mudball")});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("chestplateMud"), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), BOPItemHelper.get("mudball")});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("leggingsMud"), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), BOPItemHelper.get("mudball")});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("bootsMud"), 1), new Object [] {"# #", "# #", Character.valueOf('#'), BOPItemHelper.get("mudball")});
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheMud"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), BOPItemHelper.get("mudball"), Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheMud"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), BOPItemHelper.get("mudball"), Character.valueOf('S'), "stickWood" }));
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.pickaxeMud, 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), BOPCItems.mudball, Character.valueOf('X'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.shovelMud, 1), new Object [] {"#", "X", "X", Character.valueOf('#'), BOPCItems.mudball, Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.swordMud, 1), new Object [] {"#", "#", "X", Character.valueOf('#'), BOPCItems.mudball, Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.axeMud, 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), BOPCItems.mudball, Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.hoeMud, 1), new Object [] {"##", " X", " X", Character.valueOf('#'), BOPCItems.mudball, Character.valueOf('X'), "stickWood"}));
GameRegistry.addRecipe(new ItemStack(BOPCItems.helmetMud, 1), new Object [] {"###", "# #", Character.valueOf('#'), BOPCItems.mudball});
GameRegistry.addRecipe(new ItemStack(BOPCItems.chestplateMud, 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), BOPCItems.mudball});
GameRegistry.addRecipe(new ItemStack(BOPCItems.leggingsMud, 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), BOPCItems.mudball});
GameRegistry.addRecipe(new ItemStack(BOPCItems.bootsMud, 1), new Object [] {"# #", "# #", Character.valueOf('#'), BOPCItems.mudball});
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheMud, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), BOPCItems.mudball, Character.valueOf('S'), "stickWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheMud, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), BOPCItems.mudball, Character.valueOf('S'), "stickWood" }));
//Amethyst Tools and Armor
if (BOPConfigurationMisc.amethystTools)
{
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("pickaxeAmethyst"), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("shovelAmethyst"), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("swordAmethyst"), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("axeAmethyst"), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("hoeAmethyst"), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("helmetAmethyst"), 1), new Object [] {"###", "# #", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("chestplateAmethyst"), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("leggingsAmethyst"), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("bootsAmethyst"), 1), new Object [] {"# #", "# #", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheAmethyst"), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('S'), Items.iron_ingot}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPItemHelper.get("scytheAmethyst"), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), new ItemStack(BOPItemHelper.get("gems"), 1, 0), Character.valueOf('S'), Items.iron_ingot}));
//TODO: FEATURE <Once Fluids Are Updated> GameRegistry.addRecipe(new ItemStack(Fluids.bopBucket.get(), 1, 0), new Object[] {"XXX", "AXA", "XAX", 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
}
GameRegistry.addRecipe(new ItemStack(BOPCItems.pickaxeAmethyst, 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPCItems.shovelAmethyst, 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPCItems.swordAmethyst, 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPCItems.axeAmethyst, 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPCItems.hoeAmethyst, 1), new Object [] {"##", " X", " X", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('X'), Items.iron_ingot});
GameRegistry.addRecipe(new ItemStack(BOPCItems.helmetAmethyst, 1), new Object [] {"###", "# #", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.chestplateAmethyst, 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.leggingsAmethyst, 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.bootsAmethyst, 1), new Object [] {"# #", "# #", Character.valueOf('#'), new ItemStack(BOPCItems.gems, 1, 0)});
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheAmethyst, 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('S'), Items.iron_ingot}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BOPCItems.scytheAmethyst, 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), new ItemStack(BOPCItems.gems, 1, 0), Character.valueOf('S'), Items.iron_ingot}));
//Flower Bands
if (BOPConfigurationMisc.flowerbandCrafting)
{
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("flowerBand"), 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("flowerBand"), 1, 1), new Object [] {"CDC", "D D", "CDC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0), Character.valueOf('D'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 5)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("flowerBand"), 1, 2), new Object [] {"CDC", "V V", "CDC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0),Character.valueOf('D'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 5), Character.valueOf('V'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 8)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("flowerBand"), 1, 3), new Object [] {"CDT", "V V", "TDC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0),Character.valueOf('D'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 5), Character.valueOf('V'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 8), Character.valueOf('T'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 6)});
}
GameRegistry.addRecipe(new ItemStack(BOPCItems.flowerBand, 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.flowerBand, 1, 1), new Object [] {"CDC", "D D", "CDC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0), Character.valueOf('D'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 5)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.flowerBand, 1, 2), new Object [] {"CDC", "V V", "CDC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0),Character.valueOf('D'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 5), Character.valueOf('V'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 8)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.flowerBand, 1, 3), new Object [] {"CDT", "V V", "TDC", Character.valueOf('C'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 0),Character.valueOf('D'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 5), Character.valueOf('V'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 8), Character.valueOf('T'), new ItemStack(BOPBlockHelper.get("flowers"), 1, 6)});
//Other
GameRegistry.addRecipe(new ItemStack(Items.wheat, 1), new Object[] {"###", '#', new ItemStack(BOPBlockHelper.get("plants"),1,6)});
if (BOPConfigurationMisc.staffCrafting)
/*if (BOPConfigurationMisc.staffCrafting)
{
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 3), 'P', new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 2), 'H', new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Blocks.end_stone, 'T', new ItemStack(BOPItemHelper.get("gems"), 1, 4), 'S', new ItemStack(BOPItemHelper.get("gems"), 1, 6)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 2), new Object[] {"EPE", "EEE", "EAE", 'E', Blocks.end_stone, 'P', new ItemStack(BOPItemHelper.get("gems"), 1, 2), 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 5)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 3), new Object[] {" N ", "ERE", "ETE", 'E', Blocks.end_stone, 'R', new ItemStack(BOPItemHelper.get("gems"), 1, 1), 'T', new ItemStack(BOPItemHelper.get("gems"), 1, 3), 'N', Items.nether_star});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Blocks.end_stone, 'T', new ItemStack(BOPCItems.gems, 1, 4), 'S', new ItemStack(BOPCItems.gems, 1, 6)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 2), new Object[] {"EPE", "EEE", "EAE", 'E', Blocks.end_stone, 'P', new ItemStack(BOPCItems.gems, 1, 2), 'A', new ItemStack(BOPCItems.gems, 1, 5)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 3), new Object[] {" N ", "ERE", "ETE", 'E', Blocks.end_stone, 'R', new ItemStack(BOPCItems.gems, 1, 1), 'T', new ItemStack(BOPCItems.gems, 1, 3), 'N', Items.nether_star});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 0), new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 4), new ItemStack(Items.nether_star, 1));
}
if (BOPConfigurationMisc.enderporterCrafting)
{
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("enderporter"), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Items.ender_eye, 'O', new ItemStack(BOPItemHelper.get("misc"), 1, 10), 'A', new ItemStack(BOPItemHelper.get("gems"), 1, 0)});
}
}*/
GameRegistry.addRecipe(new ItemStack(BOPCItems.enderporter, 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Items.ender_eye, 'O', new ItemStack(BOPCItems.misc, 1, 10), 'A', new ItemStack(BOPCItems.gems, 1, 0)});
//Dart Blower
if (BOPConfigurationMisc.dartCrafting)
{
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("dartBlower"), 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(BOPBlockHelper.get("plants"), 1, 8)});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("dart"), 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(BOPBlockHelper.get("plants"), 1, 5), Character.valueOf('R'), new ItemStack(BOPBlockHelper.get("plants"), 1, 8), Character.valueOf('F'), Items.feather});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("dart"), 1, 1), new Object[] {new ItemStack(BOPItemHelper.get("jarFilled"), 1, 1), new ItemStack(BOPItemHelper.get("dart"), 1, 0)});
}
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("biomeFinder"), 1, 0), new Object[] {" E ", "ERE", " E ", 'E', new ItemStack(Items.emerald, 1, 0), 'R', new ItemStack(Items.redstone, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.dartBlower, 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(BOPBlockHelper.get("plants"), 1, 8)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.dart, 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(BOPBlockHelper.get("plants"), 1, 5), Character.valueOf('R'), new ItemStack(BOPBlockHelper.get("plants"), 1, 8), Character.valueOf('F'), Items.feather});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.dart, 1, 1), new Object[] {new ItemStack(BOPCItems.jarFilled, 1, 1), new ItemStack(BOPCItems.dart, 1, 0)});
GameRegistry.addRecipe(new ItemStack(BOPCItems.biomeFinder, 1, 0), new Object[] {" E ", "ERE", " E ", 'E', new ItemStack(Items.emerald, 1, 0), 'R', new ItemStack(Items.redstone, 1, 0)});
GameRegistry.addRecipe(new BiomeEssenceRecipe());
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("planks"), 1, 10), new Object[] {"##", "##", '#', BOPBlockHelper.get("bamboo")});
GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("jarEmpty"), 3, 0), new Object[] {"# #", "# #", "###", '#', Blocks.glass});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 1, 10), new Object[] {new ItemStack(BOPItemHelper.get("misc"), 1, 11), new ItemStack(Items.potionitem, 1, 0), new ItemStack(BOPBlockHelper.get("flowers2"), 1, 6), new ItemStack(BOPBlockHelper.get("coral1"), 1, 11), new ItemStack(BOPBlockHelper.get("plants"), 1, 15), new ItemStack(BOPItemHelper.get("misc"), 1, 4), new ItemStack(BOPItemHelper.get("jarFilled"), 1, 0), new ItemStack(BOPItemHelper.get("food"), 1, 0), Items.sugar});
GameRegistry.addRecipe(new ItemStack(BOPCItems.jarEmpty, 3, 0), new Object[] {"# #", "# #", "###", '#', Blocks.glass});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 10), new Object[] {new ItemStack(BOPCItems.misc, 1, 11), new ItemStack(Items.potionitem, 1, 0), new ItemStack(BOPBlockHelper.get("flowers2"), 1, 6), new ItemStack(BOPBlockHelper.get("coral1"), 1, 11), new ItemStack(BOPBlockHelper.get("plants"), 1, 15), new ItemStack(BOPCItems.misc, 1, 4), new ItemStack(BOPCItems.jarFilled, 1, 0), new ItemStack(BOPCItems.food, 1, 0), Items.sugar});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("flesh"), 1, 0), new Object[] {"##", "##", '#', new ItemStack(BOPItemHelper.get("misc"), 1, 3)});
GameRegistry.addRecipe(new ItemStack(Items.rotten_flesh, 1, 0), new Object[] {"FFF", "FPF", "FFF", 'F', new ItemStack(BOPItemHelper.get("misc"), 1, 3), 'P', new ItemStack(BOPItemHelper.get("jarFilled"), 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("flesh"), 1, 0), new Object[] {"##", "##", '#', new ItemStack(BOPCItems.misc, 1, 3)});
GameRegistry.addRecipe(new ItemStack(Items.rotten_flesh, 1, 0), new Object[] {"FFF", "FPF", "FFF", 'F', new ItemStack(BOPCItems.misc, 1, 3), 'P', new ItemStack(BOPCItems.jarFilled, 1, 1)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("bamboo"), 8), new Object [] {" #", "# ", Character.valueOf('#'), new ItemStack(BOPBlockHelper.get("planks"), 1, 10)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("bamboo"), 8), new Object [] {"# ", " #", Character.valueOf('#'), new ItemStack(BOPBlockHelper.get("planks"), 1, 10)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 0), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 1)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 1), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 3)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 2), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 5)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 3), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 7)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 4), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 9)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 5), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 11)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 6), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 13)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("gems"), 9, 7), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 15)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 0), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 1)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 1), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 3)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 2), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 5)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 3), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 7)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 4), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 9)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 5), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 11)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 6), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 13)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.gems, 9, 7), new Object[] {new ItemStack(BOPBlockHelper.get("gemOre"), 1, 15)});
//Bone Segments > Bonemeal
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 3, 15), new Object[] {new ItemStack(BOPBlockHelper.get("bones"), 1, 0)});
@ -282,15 +263,15 @@ public class BOPCrafting
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 12, 15), new Object[] {new ItemStack(BOPBlockHelper.get("bones"), 1, 2)});
//Honeycombs
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("hive"), 1, 0), new Object [] {"##", "##", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("misc"), 1, 2)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("hive"), 1, 3), new Object [] {"##", "##", Character.valueOf('#'), new ItemStack(BOPItemHelper.get("food"), 1, 9)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("hive"), 1, 0), new Object [] {"##", "##", Character.valueOf('#'), new ItemStack(BOPCItems.misc, 1, 2)});
GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("hive"), 1, 3), new Object [] {"##", "##", Character.valueOf('#'), new ItemStack(BOPCItems.food, 1, 9)});
//Plants
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 2, 1), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("jarFilled"), 1, 1), new Object[] {new ItemStack(BOPBlockHelper.get("foliage"),1,7), new ItemStack(BOPItemHelper.get("jarEmpty"),1, 0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 1, 4), new Object[] {Items.bowl, new ItemStack(BOPItemHelper.get("food"), 1, 0), Items.apple, Items.melon});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 1, 5), new Object[] {Items.bowl, new ItemStack(BOPItemHelper.get("food"), 1, 2), Items.carrot, Items.potato});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItemHelper.get("food"), 1, 6), new Object[] {Items.bowl, new ItemStack(BOPBlockHelper.get("mushrooms"), 1, 0), new ItemStack(BOPBlockHelper.get("mushrooms"), 1, 1), new ItemStack(BOPBlockHelper.get("mushrooms"), 1, 2)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 2, 1), new Object[] {new ItemStack(BOPBlockHelper.get("mushrooms"),1,0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.jarFilled, 1, 1), new Object[] {new ItemStack(BOPBlockHelper.get("foliage"),1,7), new ItemStack(BOPCItems.jarEmpty,1, 0)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 4), new Object[] {Items.bowl, new ItemStack(BOPCItems.food, 1, 0), Items.apple, Items.melon});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 5), new Object[] {Items.bowl, new ItemStack(BOPCItems.food, 1, 2), Items.carrot, Items.potato});
GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 6), new Object[] {Items.bowl, new ItemStack(BOPBlockHelper.get("mushrooms"), 1, 0), new ItemStack(BOPBlockHelper.get("mushrooms"), 1, 1), new ItemStack(BOPBlockHelper.get("mushrooms"), 1, 2)});
}
private static void addSmeltingRecipes()
@ -298,7 +279,7 @@ public class BOPCrafting
GameRegistry.addSmelting(Blocks.dirt, new ItemStack(BOPBlockHelper.get("driedDirt"), 1), 0F);
GameRegistry.addSmelting(new ItemStack(BOPBlockHelper.get("plants"), 1, 12), new ItemStack(Items.dye, 1, 2), 0.2F);
GameRegistry.addSmelting(BOPItemHelper.get("mudball"), new ItemStack(BOPItemHelper.get("misc"), 1, 0), 0F);
GameRegistry.addSmelting(BOPCItems.mudball, new ItemStack(BOPCItems.misc, 1, 0), 0F);
GameRegistry.addSmelting(BOPBlockHelper.get("logs1"), new ItemStack(Items.coal, 1, 1), 15F);
GameRegistry.addSmelting(BOPBlockHelper.get("logs2"), new ItemStack(Items.coal, 1, 1), 15F);
@ -322,19 +303,19 @@ public class BOPCrafting
OreDictionary.registerOre("blockMeatRaw", new ItemStack(BOPBlockHelper.get("flesh"), 1, 0));
OreDictionary.registerOre("dyeBlue", new ItemStack(BOPItemHelper.get("misc"), 1, 5));
OreDictionary.registerOre("dyeBrown", new ItemStack(BOPItemHelper.get("misc"), 1, 6));
OreDictionary.registerOre("dyeGreen", new ItemStack(BOPItemHelper.get("misc"), 1, 7));
OreDictionary.registerOre("dyeWhite", new ItemStack(BOPItemHelper.get("misc"), 1, 8));
OreDictionary.registerOre("dyeBlack", new ItemStack(BOPItemHelper.get("misc"), 1, 9));
OreDictionary.registerOre("dyeBlue", new ItemStack(BOPCItems.misc, 1, 5));
OreDictionary.registerOre("dyeBrown", new ItemStack(BOPCItems.misc, 1, 6));
OreDictionary.registerOre("dyeGreen", new ItemStack(BOPCItems.misc, 1, 7));
OreDictionary.registerOre("dyeWhite", new ItemStack(BOPCItems.misc, 1, 8));
OreDictionary.registerOre("dyeBlack", new ItemStack(BOPCItems.misc, 1, 9));
OreDictionary.registerOre("gemRuby", new ItemStack(BOPItemHelper.get("gems"), 1, 1));
OreDictionary.registerOre("gemPeridot", new ItemStack(BOPItemHelper.get("gems"), 1, 2));
OreDictionary.registerOre("gemTopaz", new ItemStack(BOPItemHelper.get("gems"), 1, 3));
OreDictionary.registerOre("gemTanzanite", new ItemStack(BOPItemHelper.get("gems"), 1, 4));
OreDictionary.registerOre("gemMalachite", new ItemStack(BOPItemHelper.get("gems"), 1, 5));
OreDictionary.registerOre("gemSapphire", new ItemStack(BOPItemHelper.get("gems"), 1, 6));
OreDictionary.registerOre("gemAmber", new ItemStack(BOPItemHelper.get("gems"), 1, 7));
OreDictionary.registerOre("gemRuby", new ItemStack(BOPCItems.gems, 1, 1));
OreDictionary.registerOre("gemPeridot", new ItemStack(BOPCItems.gems, 1, 2));
OreDictionary.registerOre("gemTopaz", new ItemStack(BOPCItems.gems, 1, 3));
OreDictionary.registerOre("gemTanzanite", new ItemStack(BOPCItems.gems, 1, 4));
OreDictionary.registerOre("gemMalachite", new ItemStack(BOPCItems.gems, 1, 5));
OreDictionary.registerOre("gemSapphire", new ItemStack(BOPCItems.gems, 1, 6));
OreDictionary.registerOre("gemAmber", new ItemStack(BOPCItems.gems, 1, 7));
OreDictionary.registerOre("oreRuby", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 2));
OreDictionary.registerOre("oreTopaz", new ItemStack(BOPBlockHelper.get("gemOre"), 1, 6));

6
src/main/java/biomesoplenty/common/core/BOPFluids.java
View file

@ -25,7 +25,6 @@ public class BOPFluids
{
registerFluids();
registerFluidBlocks();
registerFluidItems();
}
private static void registerFluids()
@ -45,11 +44,6 @@ public class BOPFluids
spring_water.setBlock(BOPBlockHelper.get("springWater"));
honey.setBlock(BOPBlockHelper.get("honey"));
}
private static void registerFluidItems()
{
registerItem(new ItemBOPBucket().setUnlocalizedName("bopBucket"));
}
public static void registerFluid(Fluid fluid)
{

93
src/main/java/biomesoplenty/common/core/BOPItems.java
View file

@ -1,14 +1,23 @@
package biomesoplenty.common.core;
import static biomesoplenty.api.content.BOPCItems.*;
import static biomesoplenty.common.core.BOPItems.registerItem;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraftforge.common.util.EnumHelper;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.common.armor.ItemAmethystArmor;
import biomesoplenty.common.armor.ItemFlippers;
import biomesoplenty.common.armor.ItemFlowerBand;
import biomesoplenty.common.armor.ItemMuddyArmor;
import biomesoplenty.common.armor.ItemWadingBoots;
import biomesoplenty.common.items.ItemBOPAncientStaff;
import biomesoplenty.common.items.ItemBOPAxe;
import biomesoplenty.common.items.ItemBOPBiomeEssence;
import biomesoplenty.common.items.ItemBOPBucket;
import biomesoplenty.common.items.ItemBOPFood;
import biomesoplenty.common.items.ItemBOPHoe;
import biomesoplenty.common.items.ItemBOPMisc;
@ -49,51 +58,69 @@ public class BOPItems
private static void registerItems()
{
registerItem(new ItemBOPFood(0).setUnlocalizedName("food"));
registerItem(new ItemBOPSeeds(BOPBlockHelper.get("turnip"), Blocks.farmland).setUnlocalizedName("turnipSeeds"));
registerItem(new ItemBOPMisc().setUnlocalizedName("misc"));
registerItem(new ItemGems().setUnlocalizedName("gems"));
registerItem(new ItemBOPMudball().setUnlocalizedName("mudball"));
food = registerItem(new ItemBOPFood(0).setUnlocalizedName("food"));
turnipSeeds = registerItem(new ItemBOPSeeds(BOPBlockHelper.get("turnip"), Blocks.farmland).setUnlocalizedName("turnipSeeds"));
misc = registerItem(new ItemBOPMisc().setUnlocalizedName("misc"));
gems = registerItem(new ItemGems().setUnlocalizedName("gems"));
mudball = registerItem(new ItemBOPMudball().setUnlocalizedName("mudball"));
registerItem(new ItemJarEmpty().setUnlocalizedName("jarEmpty"));
registerItem(new ItemJarFilled().setUnlocalizedName("jarFilled"));
jarEmpty = registerItem(new ItemJarEmpty().setUnlocalizedName("jarEmpty"));
jarFilled = registerItem(new ItemJarFilled().setUnlocalizedName("jarFilled"));
registerItem(new ItemDartBlower().setUnlocalizedName("dartBlower"));
registerItem(new ItemDart().setUnlocalizedName("dart"));
dartBlower = registerItem(new ItemDartBlower().setUnlocalizedName("dartBlower"));
dart = registerItem(new ItemDart().setUnlocalizedName("dart"));
registerItem(new ItemBOPAncientStaff().setUnlocalizedName("ancientStaff"));
registerItem(new ItemEnderporter().setUnlocalizedName("enderporter"));
ancientStaff = registerItem(new ItemBOPAncientStaff().setUnlocalizedName("ancientStaff"));
enderporter = registerItem(new ItemEnderporter().setUnlocalizedName("enderporter"));
registerItem(new ItemBOPRecord("wanderer").setUnlocalizedName("record_wanderer"));
registerItem(new ItemBOPRecord("corruption").setUnlocalizedName("record_corruption"));
bopBucket = registerItem(new ItemBOPBucket().setUnlocalizedName("bopBucket"));
record_wanderer = registerItem(new ItemBOPRecord("wanderer").setUnlocalizedName("record_wanderer"));
record_corruption = registerItem(new ItemBOPRecord("corruption").setUnlocalizedName("record_corruption"));
//registerItem(new ItemBiomeBook().setUnlocalizedName("biomeBook"));
registerItem(new ItemBiomeFinder().setUnlocalizedName("biomeFinder"));
registerItem(new ItemBOPBiomeEssence().setUnlocalizedName("biomeEssence"));
biomeFinder = registerItem(new ItemBiomeFinder().setUnlocalizedName("biomeFinder"));
biomeEssence = registerItem(new ItemBOPBiomeEssence().setUnlocalizedName("biomeEssence"));
registerItem(new ItemBOPSword(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("swordMud"));
registerItem(new ItemBOPSpade(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("shovelMud"));
registerItem(new ItemBOPPickaxe(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("pickaxeMud"));
registerItem(new ItemBOPAxe(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("axeMud"));
registerItem(new ItemBOPHoe(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("hoeMud"));
swordMud = registerItem(new ItemBOPSword(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("swordMud"));
shovelMud = registerItem(new ItemBOPSpade(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("shovelMud"));
pickaxeMud = registerItem(new ItemBOPPickaxe(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("pickaxeMud"));
axeMud = registerItem(new ItemBOPAxe(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("axeMud"));
hoeMud = registerItem(new ItemBOPHoe(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("hoeMud"));
registerItem(new ItemBOPSword(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("swordAmethyst"));
registerItem(new ItemBOPSpade(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("shovelAmethyst"));
registerItem(new ItemBOPPickaxe(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("pickaxeAmethyst"));
registerItem(new ItemBOPAxe(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("axeAmethyst"));
registerItem(new ItemBOPHoe(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("hoeAmethyst"));
swordAmethyst = registerItem(new ItemBOPSword(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("swordAmethyst"));
shovelAmethyst = registerItem(new ItemBOPSpade(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("shovelAmethyst"));
pickaxeAmethyst = registerItem(new ItemBOPPickaxe(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("pickaxeAmethyst"));
axeAmethyst = registerItem(new ItemBOPAxe(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("axeAmethyst"));
hoeAmethyst = registerItem(new ItemBOPHoe(BOPItemHelper.toolMaterialAmethyst, 1).setUnlocalizedName("hoeAmethyst"));
registerItem(new ItemBOPScythe(ToolMaterial.WOOD, 0).setUnlocalizedName("scytheWood"));
registerItem(new ItemBOPScythe(ToolMaterial.STONE, 1).setUnlocalizedName("scytheStone"));
registerItem(new ItemBOPScythe(ToolMaterial.IRON, 2).setUnlocalizedName("scytheIron"));
registerItem(new ItemBOPScythe(ToolMaterial.GOLD, 3).setUnlocalizedName("scytheGold"));
registerItem(new ItemBOPScythe(ToolMaterial.EMERALD, 4).setUnlocalizedName("scytheDiamond"));
registerItem(new ItemBOPScythe(BOPItemHelper.toolMaterialMud, 5).setUnlocalizedName("scytheMud"));
registerItem(new ItemBOPScythe(BOPItemHelper.toolMaterialAmethyst, 6).setUnlocalizedName("scytheAmethyst"));
scytheWood = registerItem(new ItemBOPScythe(ToolMaterial.WOOD, 0).setUnlocalizedName("scytheWood"));
scytheStone = registerItem(new ItemBOPScythe(ToolMaterial.STONE, 1).setUnlocalizedName("scytheStone"));
scytheIron = registerItem(new ItemBOPScythe(ToolMaterial.IRON, 2).setUnlocalizedName("scytheIron"));
scytheGold = registerItem(new ItemBOPScythe(ToolMaterial.GOLD, 3).setUnlocalizedName("scytheGold"));
scytheDiamond = registerItem(new ItemBOPScythe(ToolMaterial.EMERALD, 4).setUnlocalizedName("scytheDiamond"));
scytheMud = registerItem(new ItemBOPScythe(BOPItemHelper.toolMaterialMud, 5).setUnlocalizedName("scytheMud"));
scytheAmethyst = registerItem(new ItemBOPScythe(BOPItemHelper.toolMaterialAmethyst, 6).setUnlocalizedName("scytheAmethyst"));
helmetMud = registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0).setUnlocalizedName("helmetMud"));
chestplateMud = registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1).setUnlocalizedName("chestplateMud"));
leggingsMud = registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2).setUnlocalizedName("leggingsMud"));
bootsMud = registerItem(new ItemMuddyArmor(BOPItemHelper.armorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3).setUnlocalizedName("bootsMud"));
helmetAmethyst = registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0).setUnlocalizedName("helmetAmethyst"));
chestplateAmethyst = registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1).setUnlocalizedName("chestplateAmethyst"));
leggingsAmethyst = registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2).setUnlocalizedName("leggingsAmethyst"));
bootsAmethyst = registerItem(new ItemAmethystArmor(BOPItemHelper.armorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3).setUnlocalizedName("bootsAmethyst"));
flowerBand = registerItem(new ItemFlowerBand(BOPItemHelper.armorMaterialUnprotective, BiomesOPlenty.proxy.addArmor("flowerBand"), 0).setUnlocalizedName("flowerBand"));
flippers = registerItem(new ItemFlippers(BOPItemHelper.armorMaterialUnprotective, BiomesOPlenty.proxy.addArmor("flippers"), 3).setUnlocalizedName("flippers"));
wadingBoots = registerItem(new ItemWadingBoots(BOPItemHelper.armorMaterialUnprotective, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3).setUnlocalizedName("wadingBoots"));
}
public static void registerItem(Item item)
public static Item registerItem(Item item)
{
GameRegistry.registerItem(item, item.getUnlocalizedName().replace("item.", ""));
return item;
}
}

17
src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java
View file

@ -2,6 +2,7 @@ package biomesoplenty.common.core;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import biomesoplenty.common.entities.projectiles.dispenser.DispenserBehaviourDart;
import biomesoplenty.common.entities.projectiles.dispenser.DispenserBehaviourMudball;
@ -33,8 +34,8 @@ public class BOPVanillaCompat
private static void registerDispenserBehaviours()
{
BlockDispenser.dispenseBehaviorRegistry.putObject(BOPItemHelper.get("mudball"), new DispenserBehaviourMudball());
BlockDispenser.dispenseBehaviorRegistry.putObject(BOPItemHelper.get("dart"), new DispenserBehaviourDart());
BlockDispenser.dispenseBehaviorRegistry.putObject(BOPCItems.mudball, new DispenserBehaviourMudball());
BlockDispenser.dispenseBehaviorRegistry.putObject(BOPCItems.dart, new DispenserBehaviourDart());
}
private static void addDungeonLoot()
@ -51,7 +52,7 @@ public class BOPVanillaCompat
if (BOPConfigurationMisc.dungeonLoot == true)
{
mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("misc"), 1, 1), 2, 8, 25));
mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(BOPCItems.misc, 1, 1), 2, 8, 25));
mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlockHelper.get("plants"), 1, 5), 4, 6, 15));
strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlockHelper.get("flowers"), 1, 3), 1, 4, 25));
@ -61,12 +62,12 @@ public class BOPVanillaCompat
strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlockHelper.get("flowers"), 1, 2), 1, 4, 25));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPBlockHelper.get("plants"), 1, 5), 2, 6, 25));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("misc"), 1, 1), 2, 8, 25));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("wadingBoots"), 1, 0), 1, 1, 5));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("flippers"), 1, 0), 1, 1, 5));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPCItems.misc, 1, 1), 2, 8, 25));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPCItems.wadingBoots, 1, 0), 1, 1, 5));
village.addItem(new WeightedRandomChestContent(new ItemStack(BOPCItems.flippers, 1, 0), 1, 1, 5));
bonusChest.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("wadingBoots"), 1, 0), 1, 1, 5));
bonusChest.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("flippers"), 1, 0), 1, 1, 5));
bonusChest.addItem(new WeightedRandomChestContent(new ItemStack(BOPCItems.wadingBoots, 1, 0), 1, 1, 5));
bonusChest.addItem(new WeightedRandomChestContent(new ItemStack(BOPCItems.flippers, 1, 0), 1, 1, 5));
}
}

11
src/main/java/biomesoplenty/common/entities/EntityGlob.java
View file

@ -1,7 +1,5 @@
package biomesoplenty.common.entities;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.IMob;
@ -15,6 +13,9 @@ import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class EntityGlob extends EntityLiving implements IMob
{
@ -272,16 +273,14 @@ public class EntityGlob extends EntityLiving implements IMob
if (rand.nextInt(1000) == 0)
{
this.entityDropItem(new ItemStack(BOPItemHelper.get("bopDiscMud")), 0.0F);
this.entityDropItem(new ItemStack(BOPCItems.record_corruption), 0.0F);
}
for (int var4 = 0; var4 < var3; ++var4)
{
this.entityDropItem(new ItemStack(BOPItemHelper.get("mudball"), 1, 1), 0.0F);
this.entityDropItem(new ItemStack(BOPCItems.mudball, 1, 1), 0.0F);
}
//TODO: dropItem()
this.dropItem(Items.slime_ball, 1);
}

5
src/main/java/biomesoplenty/common/entities/EntityPhantom.java
View file

@ -4,14 +4,13 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.BOPPotionHelper;
import biomesoplenty.api.content.BOPCItems;
public class EntityPhantom extends EntityMob
{
@ -95,7 +94,7 @@ public class EntityPhantom extends EntityMob
if (par1 && (this.rand.nextInt(3) == 0 || this.rand.nextInt(1 + par2) > 0))
{
this.entityDropItem(new ItemStack(BOPItemHelper.get("misc"), 1, 10), 1);
this.entityDropItem(new ItemStack(BOPCItems.misc, 1, 10), 1);
}
}

5
src/main/java/biomesoplenty/common/entities/EntityPixie.java
View file

@ -1,13 +1,12 @@
package biomesoplenty.common.entities;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class EntityPixie extends EntityFlyingCreature
{
@ -86,7 +85,7 @@ public class EntityPixie extends EntityFlyingCreature
for (int var4 = 0; var4 < var3; ++var4)
{
this.entityDropItem(new ItemStack(BOPItemHelper.get("misc"), 1, 11), 0.0F);
this.entityDropItem(new ItemStack(BOPCItems.misc, 1, 11), 0.0F);
}
}

3
src/main/java/biomesoplenty/common/entities/EntityWasp.java
View file

@ -1,11 +1,8 @@
package biomesoplenty.common.entities;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;

5
src/main/java/biomesoplenty/common/eventhandler/entity/DyeEventHandler.java
View file

@ -1,14 +1,13 @@
package biomesoplenty.common.eventhandler.entity;
import biomesoplenty.api.BOPItemHelper;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@ -25,7 +24,7 @@ public class DyeEventHandler
{
int itemDamage = itemstack.getItemDamage();
if (itemstack.getItem() == BOPItemHelper.get("misc") && (itemDamage == 5 || itemDamage == 6 || itemDamage == 7 || itemDamage == 8 || itemDamage == 9))
if (itemstack.getItem() == BOPCItems.misc && (itemDamage == 5 || itemDamage == 6 || itemDamage == 7 || itemDamage == 8 || itemDamage == 9))
{
int dyeMeta = convertToDyeMeta(itemDamage);
//TODO: getBlockFromDye()

5
src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java
View file

@ -6,6 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class FlippersEventHandler
@ -21,7 +22,7 @@ public class FlippersEventHandler
if (entity.isInWater())
{
if (itemstack != null && itemstack.getItem() == BOPItemHelper.get("flippers"))
if (itemstack != null && itemstack.getItem() == BOPCItems.flippers)
{
entity.motionX *= 1.125D;
entity.motionY *= 1.1D;
@ -38,7 +39,7 @@ public class FlippersEventHandler
if (player.isInWater() && !player.capabilities.isFlying)
{
if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPItemHelper.get("flippers"))
if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPCItems.flippers)
{
player.motionX *= 1.125D;
player.motionY *= 1.1D;

10
src/main/java/biomesoplenty/common/eventhandler/entity/TemptEventHandler.java
View file

@ -10,8 +10,8 @@ import net.minecraft.entity.passive.EntityPig;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.entities.ai.EntityAITemptArmor;
import biomesoplenty.common.helpers.BOPReflectionHelper;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class TemptEventHandler
@ -29,22 +29,22 @@ public class TemptEventHandler
if (entity instanceof EntityChicken)
{
tasks.addTask(3, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPItemHelper.get("flowerBand"), 0, false));
tasks.addTask(3, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPCItems.flowerBand, 0, false));
}
if (entity instanceof EntitySheep)
{
tasks.addTask(3, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPItemHelper.get("flowerBand"), 1, false));
tasks.addTask(3, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPCItems.flowerBand, 1, false));
}
if (entity instanceof EntityPig)
{
tasks.addTask(4, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPItemHelper.get("flowerBand"), 2, false));
tasks.addTask(4, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPCItems.flowerBand, 2, false));
}
if (entity instanceof EntityCow)
{
tasks.addTask(3, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPItemHelper.get("flowerBand"), 3, false));
tasks.addTask(3, new EntityAITemptArmor((EntityCreature)entity, 1F, BOPCItems.flowerBand, 3, false));
}
}
}

1
src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java
View file

@ -5,7 +5,6 @@ import net.minecraft.block.BlockCrops;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenCactus;
import net.minecraftforge.event.entity.player.BonemealEvent;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.blocks.BlockBOPColorizedSapling;

3
src/main/java/biomesoplenty/common/eventhandler/misc/BucketEventHandler.java
View file

@ -8,6 +8,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.core.BOPFluids;
import biomesoplenty.common.items.ItemBOPBucket;
import cpw.mods.fml.common.eventhandler.Event.Result;
@ -18,7 +19,7 @@ public class BucketEventHandler
@SubscribeEvent
public void onBucketFill(FillBucketEvent event)
{
ItemBOPBucket bopBucket = (ItemBOPBucket)BOPItemHelper.get("bopBucket");
ItemBOPBucket bopBucket = (ItemBOPBucket)BOPCItems.bopBucket;
ItemStack bopBucketStack = new ItemStack(bopBucket);
World world = event.world;

12
src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java
View file

@ -1,14 +1,16 @@
package biomesoplenty.common.handlers;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import cpw.mods.fml.common.IFuelHandler;
import java.util.HashMap;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.Pair;
import java.util.HashMap;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.common.IFuelHandler;
public class FurnaceFuelHandler implements IFuelHandler
{
@ -43,7 +45,7 @@ public class FurnaceFuelHandler implements IFuelHandler
addFuel(BOPBlockHelper.get("hellBarkStairs"), 300);
addFuel(BOPBlockHelper.get("mahoganyStairs"), 300);
addFuel(BOPItemHelper.get("misc"), 1, 400);
addFuel(BOPCItems.misc, 1, 400);
}
private static void addFuel(Item item, int metadata, int value)

3
src/main/java/biomesoplenty/common/helpers/CreativeTabsBOP.java
View file

@ -4,6 +4,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class CreativeTabsBOP extends CreativeTabs
{
@ -15,7 +16,7 @@ public class CreativeTabsBOP extends CreativeTabs
@Override
public ItemStack getIconItemStack()
{
return new ItemStack(BOPItemHelper.get("food"), 1, 7);
return new ItemStack(BOPCItems.food, 1, 7);
}
@Override

11
src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java
View file

@ -1,10 +1,11 @@
package biomesoplenty.common.integration;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import cpw.mods.fml.common.event.FMLInterModComms;
public class TreecapitatorIntegration
{
@ -23,8 +24,8 @@ public class TreecapitatorIntegration
NBTTagCompound tpModCfg = new NBTTagCompound();
tpModCfg.setString("modID", "BiomesOPlenty");
tpModCfg.setString("axeIDList", BOPItemHelper.getUniqueName(BOPItemHelper.get("axeAmethyst")) + "; " +
BOPItemHelper.getUniqueName(BOPItemHelper.get("axeMud")));
tpModCfg.setString("axeIDList", BOPItemHelper.getUniqueName(BOPCItems.axeAmethyst) + "; " +
BOPItemHelper.getUniqueName(BOPCItems.axeMud));
NBTTagList treeList = new NBTTagList();

12
src/main/java/biomesoplenty/common/items/ItemBOPAncientStaff.java
View file

@ -1,15 +1,15 @@
package biomesoplenty.common.items;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemBOPAncientStaff extends Item
{
@ -20,7 +20,7 @@ public class ItemBOPAncientStaff extends Item
public ItemBOPAncientStaff()
{
this.maxStackSize = 1;
this.setHasSubtypes(true);
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}

5
src/main/java/biomesoplenty/common/items/ItemBOPAxe.java
View file

@ -5,7 +5,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemBOPAxe extends ItemAxe
{
@ -18,6 +18,7 @@ public class ItemBOPAxe extends ItemAxe
this.textureID = texture;
this.setHarvestLevel("axe", 4);
this.setHasSubtypes(true);
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
@ -25,7 +26,7 @@ public class ItemBOPAxe extends ItemAxe
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith)
{
if (textureID == 1 && itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (textureID == 1 && itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
return true;
else
return false;

4
src/main/java/biomesoplenty/common/items/ItemBOPHoe.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemBOPHoe extends ItemHoe
{
@ -22,7 +22,7 @@ public class ItemBOPHoe extends ItemHoe
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith)
{
if (textureID == 1 && itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (textureID == 1 && itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
return true;
else
return false;

4
src/main/java/biomesoplenty/common/items/ItemBOPPickaxe.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemBOPPickaxe extends ItemPickaxe
{
@ -24,7 +24,7 @@ public class ItemBOPPickaxe extends ItemPickaxe
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith)
{
if (textureID == 1 && itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (textureID == 1 && itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
{
return true;
}

4
src/main/java/biomesoplenty/common/items/ItemBOPScythe.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.common.core.BOPItems;
import biomesoplenty.api.content.BOPCItems;
public class ItemBOPScythe extends Item
{
@ -319,7 +319,7 @@ public class ItemBOPScythe extends Item
{
return true;
}
if (textureID == 6 && itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (textureID == 6 && itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
{
return true;
}

4
src/main/java/biomesoplenty/common/items/ItemBOPSpade.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemBOPSpade extends ItemSpade
{
@ -24,7 +24,7 @@ public class ItemBOPSpade extends ItemSpade
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith)
{
if (textureID == 1 && itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (textureID == 1 && itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
return true;
else
return false;

4
src/main/java/biomesoplenty/common/items/ItemBOPSword.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class ItemBOPSword extends ItemSword
{
@ -22,7 +22,7 @@ public class ItemBOPSword extends ItemSword
@Override
public boolean getIsRepairable(ItemStack itemToRepair, ItemStack itemToRepairWith)
{
if (textureID == 1 && itemToRepairWith.getItem() == BOPItemHelper.get("misc") && itemToRepairWith.getItemDamage() == 2)
if (textureID == 1 && itemToRepairWith.getItem() == BOPCItems.misc && itemToRepairWith.getItemDamage() == 2)
return true;
else
return false;

13
src/main/java/biomesoplenty/common/items/ItemDartBlower.java
View file

@ -6,7 +6,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.entities.projectiles.EntityDart;
import biomesoplenty.common.entities.projectiles.EntityDart.DartType;
@ -39,8 +39,7 @@ public class ItemDartBlower extends Item
{
boolean flag = par3EntityPlayer.capabilities.isCreativeMode;
//TODO: hasItem()
if (flag || par3EntityPlayer.inventory.hasItem(BOPItemHelper.get("dart")))
if (flag || par3EntityPlayer.inventory.hasItem(BOPCItems.dart))
{
EntityDart entityDart = new EntityDart(world, par3EntityPlayer, 1.0F);
@ -48,26 +47,26 @@ public class ItemDartBlower extends Item
world.playSoundAtEntity(par3EntityPlayer, "random.bow", 1.0F, 2.0F / (1.0F * 0.4F + 1.2F) + 1.0F * 0.5F);
int slot = -1;
if (par3EntityPlayer.inventory.hasItemStack(new ItemStack(BOPItemHelper.get("dart"), 1, 1)))
if (par3EntityPlayer.inventory.hasItemStack(new ItemStack(BOPCItems.dart, 1, 1)))
{
entityDart.setDartType(DartType.POISON);
for (int k = 0; k < par3EntityPlayer.inventory.mainInventory.length; ++k)
{
if (par3EntityPlayer.inventory.mainInventory[k] != null && par3EntityPlayer.inventory.mainInventory[k].getItem() == BOPItemHelper.get("dart") && par3EntityPlayer.inventory.mainInventory[k].getItemDamage() == 1)
if (par3EntityPlayer.inventory.mainInventory[k] != null && par3EntityPlayer.inventory.mainInventory[k].getItem() == BOPCItems.dart && par3EntityPlayer.inventory.mainInventory[k].getItemDamage() == 1)
{
slot = k;
break;
}
}
}
else if (par3EntityPlayer.inventory.hasItemStack(new ItemStack(BOPItemHelper.get("dart"), 1, 0)))
else if (par3EntityPlayer.inventory.hasItemStack(new ItemStack(BOPCItems.dart, 1, 0)))
{
entityDart.setDartType(DartType.NORMAL);
for (int k = 0; k < par3EntityPlayer.inventory.mainInventory.length; ++k)
{
if (par3EntityPlayer.inventory.mainInventory[k] != null && par3EntityPlayer.inventory.mainInventory[k].getItem() == BOPItemHelper.get("dart") && par3EntityPlayer.inventory.mainInventory[k].getItemDamage() == 0)
if (par3EntityPlayer.inventory.mainInventory[k] != null && par3EntityPlayer.inventory.mainInventory[k].getItem() == BOPCItems.dart && par3EntityPlayer.inventory.mainInventory[k].getItemDamage() == 0)
{
slot = k;
break;

6
src/main/java/biomesoplenty/common/items/ItemJarEmpty.java
View file

@ -4,7 +4,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MovingObjectPosition;
@ -13,6 +12,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.entities.EntityPixie;
public class ItemJarEmpty extends Item
@ -90,7 +90,7 @@ public class ItemJarEmpty extends Item
if (par2EntityPlayer.inventory.getFirstEmptyStack() >= 0)
{
EntityItem entityitem = new EntityItem(par2EntityPlayer.worldObj, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, new ItemStack(BOPItemHelper.get("jarFilled"), 1, 2));
EntityItem entityitem = new EntityItem(par2EntityPlayer.worldObj, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, new ItemStack(BOPCItems.jarFilled, 1, 2));
if (!par2EntityPlayer.worldObj.isRemote)
{
par2EntityPlayer.worldObj.spawnEntityInWorld(entityitem);
@ -104,7 +104,7 @@ public class ItemJarEmpty extends Item
else
{
//TODO: player.dropPlayerItem(ItemStack itemStack)?
par2EntityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(BOPItemHelper.get("jarFilled"), 1, 2), false);
par2EntityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(BOPCItems.jarFilled, 1, 2), false);
}
return true;

4
src/main/java/biomesoplenty/common/network/packet/PacketBiomePosition.java
View file

@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
import biomesoplenty.common.network.AbstractPacket;
public class PacketBiomePosition extends AbstractPacket
@ -49,7 +49,7 @@ public class PacketBiomePosition extends AbstractPacket
ItemStack currentItem = player.getCurrentEquippedItem();
if (currentItem.getItem() == BOPItemHelper.get("biomeFinder"))
if (currentItem.getItem() == BOPCItems.biomeFinder)
{
if (!currentItem.hasTagCompound()) currentItem.setTagCompound(new NBTTagCompound());

5
src/main/java/biomesoplenty/common/recipes/BiomeEssenceRecipe.java
View file

@ -6,6 +6,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import biomesoplenty.api.BOPItemHelper;
import biomesoplenty.api.content.BOPCItems;
public class BiomeEssenceRecipe implements IRecipe
{
@ -25,8 +26,8 @@ public class BiomeEssenceRecipe implements IRecipe
if (itemstack != null)
{
if (itemstack.getItem() == BOPItemHelper.get("biomeFinder")) biomeRadar = itemstack.copy();
else if (itemstack.getItem() == BOPItemHelper.get("biomeEssence")) biomeEssence = itemstack.copy();
if (itemstack.getItem() == BOPCItems.biomeFinder) biomeRadar = itemstack.copy();
else if (itemstack.getItem() == BOPCItems.biomeEssence) biomeEssence = itemstack.copy();
}
}
}