Merge pull request #7 from Adubbz/MiscFixes

Misc fixes
This commit is contained in:
ted 2013-03-31 22:42:14 -07:00
commit e3194e06eb
5 changed files with 125 additions and 113 deletions

View file

@ -35,117 +35,125 @@ public class ItemAncientStaff extends Item
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{ {
if (par3EntityPlayer.dimension == 0) if (par3EntityPlayer.dimension == 0)
{
if (par2World.getBlockId(0, 64 - 32, 0) != mod_BiomesOPlenty.promisedPortal.blockID)
{ {
par3EntityPlayer.addChatMessage("A gateway to the Promised Land has been buried at the origin of this world.");
if (!par3EntityPlayer.worldObj.isRemote)
int var99 = 32; {
par3EntityPlayer.addChatMessage("\u00a75A gateway to the \u00a76\u00a7l\u00a7nPromised Land\u00a75 has been buried at the origin of this world.");
par2World.setBlock(-1, 62 - var99, 1, Block.whiteStone.blockID); }
par2World.setBlock(0, 62 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(1, 62 - var99, 1, Block.whiteStone.blockID); int var99 = 32;
par2World.setBlock(1, 62 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 62 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(-1, 62 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(0, 62 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(0, 62 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 62 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(1, 62 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 62 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 62 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(0, 62 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 62 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 62 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(-1, 63 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-1, 62 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 63 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-1, 62 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 63 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(0, 62 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(2, 63 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(2, 63 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(-1, 63 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(2, 63 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(0, 63 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(1, 63 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(1, 63 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(0, 63 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(2, 63 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 63 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(2, 63 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(-2, 63 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(2, 63 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(-2, 63 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 63 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-2, 63 - var99, 1, Block.whiteStone.blockID); par2World.setBlock(0, 63 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-1, 63 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-1, 64 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-2, 63 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 64 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-2, 63 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 64 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-2, 63 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(2, 64 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(2, 64 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(-1, 64 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(2, 64 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(0, 64 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(1, 64 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(1, 64 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(0, 64 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(2, 64 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 64 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(2, 64 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(-2, 64 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(2, 64 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(-2, 64 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 64 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-2, 64 - var99, 1, Block.whiteStone.blockID); par2World.setBlock(0, 64 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-1, 64 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-1, 65 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-2, 64 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 65 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-2, 64 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 65 - var99, 2, Block.whiteStone.blockID); par2World.setBlock(-2, 64 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(2, 65 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(2, 65 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(-1, 65 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(2, 65 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(0, 65 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(1, 65 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(1, 65 - var99, 2, Block.whiteStone.blockID);
par2World.setBlock(0, 65 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(2, 65 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 65 - var99, -2, Block.whiteStone.blockID); par2World.setBlock(2, 65 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(-2, 65 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(2, 65 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(-2, 65 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 65 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-2, 65 - var99, 1, Block.whiteStone.blockID); par2World.setBlock(0, 65 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-1, 65 - var99, -2, Block.whiteStone.blockID);
par2World.setBlock(-1, 66 - var99, 1, Block.whiteStone.blockID); par2World.setBlock(-2, 65 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 66 - var99, 1, Block.whiteStone.blockID); par2World.setBlock(-2, 65 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 66 - var99, 1, Block.whiteStone.blockID); par2World.setBlock(-2, 65 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(1, 66 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 66 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(-1, 66 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(0, 66 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(0, 66 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 66 - var99, -1, Block.whiteStone.blockID); par2World.setBlock(1, 66 - var99, 1, Block.whiteStone.blockID);
par2World.setBlock(-1, 66 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 66 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(0, 66 - var99, 0, Block.whiteStone.blockID); par2World.setBlock(1, 66 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 66 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(-1, 63 - var99, 1, 0); par2World.setBlock(-1, 66 - var99, -1, Block.whiteStone.blockID);
par2World.setBlock(0, 63 - var99, 1, 0); par2World.setBlock(-1, 66 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 63 - var99, 1, 0); par2World.setBlock(0, 66 - var99, 0, Block.whiteStone.blockID);
par2World.setBlock(1, 63 - var99, 0, 0);
par2World.setBlock(1, 63 - var99, -1, 0); par2World.setBlock(-1, 63 - var99, 1, 0);
par2World.setBlock(0, 63 - var99, -1, 0); par2World.setBlock(0, 63 - var99, 1, 0);
par2World.setBlock(-1, 63 - var99, -1, 0); par2World.setBlock(1, 63 - var99, 1, 0);
par2World.setBlock(-1, 63 - var99, 0, 0); par2World.setBlock(1, 63 - var99, 0, 0);
par2World.setBlock(0, 63 - var99, 0, 0); par2World.setBlock(1, 63 - var99, -1, 0);
par2World.setBlock(0, 63 - var99, -1, 0);
par2World.setBlock(-1, 64 - var99, 1, 0); par2World.setBlock(-1, 63 - var99, -1, 0);
par2World.setBlock(0, 64 - var99, 1, 0); par2World.setBlock(-1, 63 - var99, 0, 0);
par2World.setBlock(1, 64 - var99, 1, 0); par2World.setBlock(0, 63 - var99, 0, 0);
par2World.setBlock(1, 64 - var99, 0, 0);
par2World.setBlock(1, 64 - var99, -1, 0); par2World.setBlock(-1, 64 - var99, 1, 0);
par2World.setBlock(0, 64 - var99, -1, 0); par2World.setBlock(0, 64 - var99, 1, 0);
par2World.setBlock(-1, 64 - var99, -1, 0); par2World.setBlock(1, 64 - var99, 1, 0);
par2World.setBlock(-1, 64 - var99, 0, 0); par2World.setBlock(1, 64 - var99, 0, 0);
par2World.setBlock(1, 64 - var99, -1, 0);
par2World.setBlock(-1, 65 - var99, 1, 0); par2World.setBlock(0, 64 - var99, -1, 0);
par2World.setBlock(0, 65 - var99, 1, 0); par2World.setBlock(-1, 64 - var99, -1, 0);
par2World.setBlock(1, 65 - var99, 1, 0); par2World.setBlock(-1, 64 - var99, 0, 0);
par2World.setBlock(1, 65 - var99, 0, 0);
par2World.setBlock(1, 65 - var99, -1, 0); par2World.setBlock(-1, 65 - var99, 1, 0);
par2World.setBlock(0, 65 - var99, -1, 0); par2World.setBlock(0, 65 - var99, 1, 0);
par2World.setBlock(-1, 65 - var99, -1, 0); par2World.setBlock(1, 65 - var99, 1, 0);
par2World.setBlock(-1, 65 - var99, 0, 0); par2World.setBlock(1, 65 - var99, 0, 0);
par2World.setBlock(0, 65 - var99, 0, 0); par2World.setBlock(1, 65 - var99, -1, 0);
par2World.setBlock(0, 65 - var99, -1, 0);
par2World.setBlock(0, 64 - var99, 0, mod_BiomesOPlenty.promisedPortal.blockID); par2World.setBlock(-1, 65 - var99, -1, 0);
par2World.setBlock(-1, 65 - var99, 0, 0);
par2World.setBlock(-2, 64 - var99, 2, 0); par2World.setBlock(0, 65 - var99, 0, 0);
par2World.setBlock(2, 64 - var99, 2, 0);
par2World.setBlock(2, 64 - var99, -2, 0); par2World.setBlock(0, 64 - var99, 0, mod_BiomesOPlenty.promisedPortal.blockID);
par2World.setBlock(-2, 64 - var99, -2, 0);
par2World.setBlock(-2, 64 - var99, 2, 0);
par2World.setBlock(-2, 65 - var99, 2, 0); par2World.setBlock(2, 64 - var99, 2, 0);
par2World.setBlock(2, 65 - var99, 2, 0); par2World.setBlock(2, 64 - var99, -2, 0);
par2World.setBlock(2, 65 - var99, -2, 0); par2World.setBlock(-2, 64 - var99, -2, 0);
par2World.setBlock(-2, 65 - var99, -2, 0);
par2World.setBlock(-2, 65 - var99, 2, 0);
par2World.setBlock(-2, 66 - var99, 2, 0); par2World.setBlock(2, 65 - var99, 2, 0);
par2World.setBlock(2, 66 - var99, 2, 0); par2World.setBlock(2, 65 - var99, -2, 0);
par2World.setBlock(2, 66 - var99, -2, 0); par2World.setBlock(-2, 65 - var99, -2, 0);
par2World.setBlock(-2, 66 - var99, -2, 0);
par2World.setBlock(-2, 66 - var99, 2, 0);
par2World.setBlock(2, 66 - var99, 2, 0);
par2World.setBlock(2, 66 - var99, -2, 0);
par2World.setBlock(-2, 66 - var99, -2, 0);
} }
}
return par1ItemStack; return par1ItemStack;
} }
} }

View file

@ -2,9 +2,10 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemSword; import net.minecraft.item.ItemSword;
public class ItemBOPAxe extends ItemSword public class ItemBOPAxe extends ItemAxe
{ {
public int TextureID = 0; public int TextureID = 0;

View file

@ -2,9 +2,10 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemSword; import net.minecraft.item.ItemSword;
public class ItemBOPHoe extends ItemSword public class ItemBOPHoe extends ItemHoe
{ {
public int TextureID = 0; public int TextureID = 0;

View file

@ -2,9 +2,10 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemSword; import net.minecraft.item.ItemSword;
public class ItemBOPPickaxe extends ItemSword public class ItemBOPPickaxe extends ItemPickaxe
{ {
public int TextureID = 0; public int TextureID = 0;

View file

@ -2,9 +2,10 @@ package tdwp_ftw.biomesop.items;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemSword; import net.minecraft.item.ItemSword;
public class ItemBOPSpade extends ItemSword public class ItemBOPSpade extends ItemSpade
{ {
public int TextureID = 0; public int TextureID = 0;