Renamed Apatite to Malachite
|
@ -138,8 +138,8 @@ public class BlockReferences {
|
||||||
topazBlock (Blocks.amethystOre, 7),
|
topazBlock (Blocks.amethystOre, 7),
|
||||||
tanzaniteOre (Blocks.amethystOre, 8),
|
tanzaniteOre (Blocks.amethystOre, 8),
|
||||||
tanzaniteBlock (Blocks.amethystOre, 9),
|
tanzaniteBlock (Blocks.amethystOre, 9),
|
||||||
apatiteOre (Blocks.amethystOre, 10),
|
malachiteOre (Blocks.amethystOre, 10),
|
||||||
apatiteBlock (Blocks.amethystOre, 11),
|
malachiteBlock (Blocks.amethystOre, 11),
|
||||||
sapphireOre (Blocks.amethystOre, 12),
|
sapphireOre (Blocks.amethystOre, 12),
|
||||||
sapphireBlock (Blocks.amethystOre, 13),
|
sapphireBlock (Blocks.amethystOre, 13),
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ public class BlockAltar extends Block
|
||||||
public static Icon altarFrame;
|
public static Icon altarFrame;
|
||||||
public static Icon altarFrameTop;
|
public static Icon altarFrameTop;
|
||||||
|
|
||||||
public static Icon frameApatite;
|
public static Icon frameMalachite;
|
||||||
public static Icon framePeridot;
|
public static Icon framePeridot;
|
||||||
public static Icon frameRuby;
|
public static Icon frameRuby;
|
||||||
public static Icon frameSapphire;
|
public static Icon frameSapphire;
|
||||||
|
@ -50,7 +50,7 @@ public class BlockAltar extends Block
|
||||||
altarFrame = iconRegister.registerIcon("biomesoplenty:altarframe");
|
altarFrame = iconRegister.registerIcon("biomesoplenty:altarframe");
|
||||||
altarFrameTop = iconRegister.registerIcon("biomesoplenty:altarframetop");
|
altarFrameTop = iconRegister.registerIcon("biomesoplenty:altarframetop");
|
||||||
|
|
||||||
frameApatite = iconRegister.registerIcon("biomesoplenty:frameapatite");
|
frameMalachite = iconRegister.registerIcon("biomesoplenty:framemalachite");
|
||||||
framePeridot = iconRegister.registerIcon("biomesoplenty:frameperidot");
|
framePeridot = iconRegister.registerIcon("biomesoplenty:frameperidot");
|
||||||
frameRuby = iconRegister.registerIcon("biomesoplenty:frameruby");
|
frameRuby = iconRegister.registerIcon("biomesoplenty:frameruby");
|
||||||
frameSapphire = iconRegister.registerIcon("biomesoplenty:framesapphire");
|
frameSapphire = iconRegister.registerIcon("biomesoplenty:framesapphire");
|
||||||
|
|
|
@ -17,7 +17,7 @@ import biomesoplenty.api.Items;
|
||||||
|
|
||||||
public class BlockBOPAmethyst extends Block
|
public class BlockBOPAmethyst extends Block
|
||||||
{
|
{
|
||||||
public static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "apatiteore", "apatiteblock", "sapphireore", "sapphireblock"};
|
public static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "malachiteore", "malachiteblock", "sapphireore", "sapphireblock"};
|
||||||
private Icon[] textures;
|
private Icon[] textures;
|
||||||
|
|
||||||
public BlockBOPAmethyst(int par1, Material par2Material)
|
public BlockBOPAmethyst(int par1, Material par2Material)
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class AltarRenderer implements ISimpleBlockRenderingHandler
|
||||||
|
|
||||||
if (tileentityaltar.getPresent(14))
|
if (tileentityaltar.getPresent(14))
|
||||||
{
|
{
|
||||||
renderAltarSlotFaces(renderer, block, BlockAltar.frameApatite, world, x, y, z);
|
renderAltarSlotFaces(renderer, block, BlockAltar.frameMalachite, world, x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tileentityaltar.getPresent(15))
|
if (tileentityaltar.getPresent(15))
|
||||||
|
|
|
@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class ItemBOP extends Item
|
public class ItemBOP extends Item
|
||||||
{
|
{
|
||||||
private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ruby", "peridot", "topaz", "tanzanite", "apatite", "sapphire", "ghastlysoul"};
|
private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ruby", "peridot", "topaz", "tanzanite", "malachite", "sapphire", "ghastlysoul"};
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
private Icon[] textures;
|
private Icon[] textures;
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemBOPAmethyst extends ItemBlock
|
public class ItemBOPAmethyst extends ItemBlock
|
||||||
{
|
{
|
||||||
private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "apatiteore", "apatiteblock", "sapphireore", "sapphireblock"};
|
private static final String[] types = new String[] {"amethystore", "amethystblock", "rubyore", "rubyblock", "peridotore", "peridotblock", "topazore", "topazblock", "tanzaniteore", "tanzaniteblock", "malachiteore", "malachiteblock", "sapphireore", "sapphireblock"};
|
||||||
|
|
||||||
public ItemBOPAmethyst(int par1)
|
public ItemBOPAmethyst(int par1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||||
|
|
||||||
public class TileEntityAltar extends TileEntity
|
public class TileEntityAltar extends TileEntity
|
||||||
{
|
{
|
||||||
private boolean apatitePresent = false;
|
private boolean malachitePresent = false;
|
||||||
private boolean peridotPresent = false;
|
private boolean peridotPresent = false;
|
||||||
private boolean rubyPresent = false;
|
private boolean rubyPresent = false;
|
||||||
private boolean sapphirePresent = false;
|
private boolean sapphirePresent = false;
|
||||||
|
@ -19,7 +19,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
public void readFromNBT(NBTTagCompound nbt)
|
public void readFromNBT(NBTTagCompound nbt)
|
||||||
{
|
{
|
||||||
super.readFromNBT(nbt);
|
super.readFromNBT(nbt);
|
||||||
this.apatitePresent = nbt.getBoolean("apatitePresent");
|
this.malachitePresent = nbt.getBoolean("malachitePresent");
|
||||||
this.peridotPresent = nbt.getBoolean("peridotPresent");
|
this.peridotPresent = nbt.getBoolean("peridotPresent");
|
||||||
this.rubyPresent = nbt.getBoolean("rubyPresent");
|
this.rubyPresent = nbt.getBoolean("rubyPresent");
|
||||||
this.sapphirePresent = nbt.getBoolean("sapphirePresent");
|
this.sapphirePresent = nbt.getBoolean("sapphirePresent");
|
||||||
|
@ -31,7 +31,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
public void writeToNBT(NBTTagCompound nbt)
|
public void writeToNBT(NBTTagCompound nbt)
|
||||||
{
|
{
|
||||||
super.writeToNBT(nbt);
|
super.writeToNBT(nbt);
|
||||||
nbt.setBoolean("apatitePresent", apatitePresent);
|
nbt.setBoolean("malachitePresent", malachitePresent);
|
||||||
nbt.setBoolean("peridotPresent", peridotPresent);
|
nbt.setBoolean("peridotPresent", peridotPresent);
|
||||||
nbt.setBoolean("rubyPresent", rubyPresent);
|
nbt.setBoolean("rubyPresent", rubyPresent);
|
||||||
nbt.setBoolean("sapphirePresent", sapphirePresent);
|
nbt.setBoolean("sapphirePresent", sapphirePresent);
|
||||||
|
@ -44,7 +44,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
{
|
{
|
||||||
NBTTagCompound nbt = new NBTTagCompound();
|
NBTTagCompound nbt = new NBTTagCompound();
|
||||||
|
|
||||||
nbt.setBoolean("apatitePresent", apatitePresent);
|
nbt.setBoolean("malachitePresent", malachitePresent);
|
||||||
nbt.setBoolean("peridotPresent", peridotPresent);
|
nbt.setBoolean("peridotPresent", peridotPresent);
|
||||||
nbt.setBoolean("rubyPresent", rubyPresent);
|
nbt.setBoolean("rubyPresent", rubyPresent);
|
||||||
nbt.setBoolean("sapphirePresent", sapphirePresent);
|
nbt.setBoolean("sapphirePresent", sapphirePresent);
|
||||||
|
@ -59,7 +59,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
{
|
{
|
||||||
if (packet.actionType == 0)
|
if (packet.actionType == 0)
|
||||||
{
|
{
|
||||||
this.apatitePresent = packet.data.getBoolean("apatitePresent");
|
this.malachitePresent = packet.data.getBoolean("malachitePresent");
|
||||||
this.peridotPresent = packet.data.getBoolean("peridotPresent");
|
this.peridotPresent = packet.data.getBoolean("peridotPresent");
|
||||||
this.rubyPresent = packet.data.getBoolean("rubyPresent");
|
this.rubyPresent = packet.data.getBoolean("rubyPresent");
|
||||||
this.sapphirePresent = packet.data.getBoolean("sapphirePresent");
|
this.sapphirePresent = packet.data.getBoolean("sapphirePresent");
|
||||||
|
@ -90,7 +90,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
}
|
}
|
||||||
else if (presentGem == 14)
|
else if (presentGem == 14)
|
||||||
{
|
{
|
||||||
apatitePresent = state;
|
malachitePresent = state;
|
||||||
}
|
}
|
||||||
else if (presentGem == 15)
|
else if (presentGem == 15)
|
||||||
{
|
{
|
||||||
|
@ -118,7 +118,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
}
|
}
|
||||||
else if (presentGem == 14)
|
else if (presentGem == 14)
|
||||||
{
|
{
|
||||||
return apatitePresent;
|
return malachitePresent;
|
||||||
}
|
}
|
||||||
else if (presentGem == 15)
|
else if (presentGem == 15)
|
||||||
{
|
{
|
||||||
|
@ -132,7 +132,7 @@ public class TileEntityAltar extends TileEntity
|
||||||
|
|
||||||
public boolean getAllPresent()
|
public boolean getAllPresent()
|
||||||
{
|
{
|
||||||
if (rubyPresent && peridotPresent && topazPresent && tanzanitePresent && apatitePresent && sapphirePresent)
|
if (rubyPresent && peridotPresent && topazPresent && tanzanitePresent && malachitePresent && sapphirePresent)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,8 +149,8 @@ tile.bop.amethystOre.topazore.name=Topaz Ore
|
||||||
tile.bop.amethystOre.topazblock.name=Block of Topaz
|
tile.bop.amethystOre.topazblock.name=Block of Topaz
|
||||||
tile.bop.amethystOre.tanzaniteore.name=Tanzanite Ore
|
tile.bop.amethystOre.tanzaniteore.name=Tanzanite Ore
|
||||||
tile.bop.amethystOre.tanzaniteblock.name=Block of Tanzanite
|
tile.bop.amethystOre.tanzaniteblock.name=Block of Tanzanite
|
||||||
tile.bop.amethystOre.apatiteore.name=Apatite Ore
|
tile.bop.amethystOre.malachiteore.name=Malachite Ore
|
||||||
tile.bop.amethystOre.apatiteblock.name=Block of Apatite
|
tile.bop.amethystOre.malachiteblock.name=Block of Malachite
|
||||||
tile.bop.amethystOre.sapphireore.name=Sapphire Ore
|
tile.bop.amethystOre.sapphireore.name=Sapphire Ore
|
||||||
tile.bop.amethystOre.sapphireblock.name=Block of Sapphire
|
tile.bop.amethystOre.sapphireblock.name=Block of Sapphire
|
||||||
|
|
||||||
|
@ -322,7 +322,7 @@ item.bop.miscItems.ruby.name=Ruby
|
||||||
item.bop.miscItems.peridot.name=Peridot
|
item.bop.miscItems.peridot.name=Peridot
|
||||||
item.bop.miscItems.topaz.name=Topaz
|
item.bop.miscItems.topaz.name=Topaz
|
||||||
item.bop.miscItems.tanzanite.name=Tanzanite
|
item.bop.miscItems.tanzanite.name=Tanzanite
|
||||||
item.bop.miscItems.apatite.name=Apatite
|
item.bop.miscItems.malachite.name=Malachite
|
||||||
item.bop.miscItems.sapphire.name=Sapphire
|
item.bop.miscItems.sapphire.name=Sapphire
|
||||||
item.bop.miscItems.ghastlysoul.name=Ghastly Soul
|
item.bop.miscItems.ghastlysoul.name=Ghastly Soul
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
BIN
resources/assets/biomesoplenty/textures/blocks/lilypadgreen.png
Normal file
After Width: | Height: | Size: 282 B |
BIN
resources/assets/biomesoplenty/textures/blocks/lilypadteal.png
Normal file
After Width: | Height: | Size: 266 B |
BIN
resources/assets/biomesoplenty/textures/blocks/lilypadyellow.png
Normal file
After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 696 B After Width: | Height: | Size: 696 B |
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 455 B |
Before Width: | Height: | Size: 510 B After Width: | Height: | Size: 510 B |