diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 9a3c96227..d02d4147a 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -138,8 +138,8 @@ public class BlockReferences { topazBlock (Blocks.amethystOre, 7), tanzaniteOre (Blocks.amethystOre, 8), tanzaniteBlock (Blocks.amethystOre, 9), - apatiteOre (Blocks.amethystOre, 10), - apatiteBlock (Blocks.amethystOre, 11), + malachiteOre (Blocks.amethystOre, 10), + malachiteBlock (Blocks.amethystOre, 11), sapphireOre (Blocks.amethystOre, 12), sapphireBlock (Blocks.amethystOre, 13), diff --git a/common/biomesoplenty/blocks/BlockAltar.java b/common/biomesoplenty/blocks/BlockAltar.java index ef5726a79..36977ec96 100644 --- a/common/biomesoplenty/blocks/BlockAltar.java +++ b/common/biomesoplenty/blocks/BlockAltar.java @@ -28,7 +28,7 @@ public class BlockAltar extends Block public static Icon altarFrame; public static Icon altarFrameTop; - public static Icon frameApatite; + public static Icon frameMalachite; public static Icon framePeridot; public static Icon frameRuby; public static Icon frameSapphire; @@ -50,7 +50,7 @@ public class BlockAltar extends Block altarFrame = iconRegister.registerIcon("biomesoplenty:altarframe"); altarFrameTop = iconRegister.registerIcon("biomesoplenty:altarframetop"); - frameApatite = iconRegister.registerIcon("biomesoplenty:frameapatite"); + frameMalachite = iconRegister.registerIcon("biomesoplenty:framemalachite"); framePeridot = iconRegister.registerIcon("biomesoplenty:frameperidot"); frameRuby = iconRegister.registerIcon("biomesoplenty:frameruby"); frameSapphire = iconRegister.registerIcon("biomesoplenty:framesapphire"); diff --git a/common/biomesoplenty/blocks/BlockBOPAmethyst.java b/common/biomesoplenty/blocks/BlockBOPAmethyst.java index 5eba2fb10..5d09046fa 100644 --- a/common/biomesoplenty/blocks/BlockBOPAmethyst.java +++ b/common/biomesoplenty/blocks/BlockBOPAmethyst.java @@ -17,7 +17,7 @@ import biomesoplenty.api.Items; 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; public BlockBOPAmethyst(int par1, Material par2Material) diff --git a/common/biomesoplenty/blocks/renderers/AltarRenderer.java b/common/biomesoplenty/blocks/renderers/AltarRenderer.java index e481657d4..51622ab83 100644 --- a/common/biomesoplenty/blocks/renderers/AltarRenderer.java +++ b/common/biomesoplenty/blocks/renderers/AltarRenderer.java @@ -52,7 +52,7 @@ public class AltarRenderer implements ISimpleBlockRenderingHandler 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)) diff --git a/common/biomesoplenty/items/ItemBOP.java b/common/biomesoplenty/items/ItemBOP.java index 45799f177..69c703f38 100644 --- a/common/biomesoplenty/items/ItemBOP.java +++ b/common/biomesoplenty/items/ItemBOP.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; 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) private Icon[] textures; diff --git a/common/biomesoplenty/items/ItemBOPAmethyst.java b/common/biomesoplenty/items/ItemBOPAmethyst.java index ed1e8b836..91212aff9 100644 --- a/common/biomesoplenty/items/ItemBOPAmethyst.java +++ b/common/biomesoplenty/items/ItemBOPAmethyst.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; 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) { diff --git a/common/biomesoplenty/tileentities/TileEntityAltar.java b/common/biomesoplenty/tileentities/TileEntityAltar.java index fdc056f1e..f0c17715f 100644 --- a/common/biomesoplenty/tileentities/TileEntityAltar.java +++ b/common/biomesoplenty/tileentities/TileEntityAltar.java @@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity; public class TileEntityAltar extends TileEntity { - private boolean apatitePresent = false; + private boolean malachitePresent = false; private boolean peridotPresent = false; private boolean rubyPresent = false; private boolean sapphirePresent = false; @@ -19,7 +19,7 @@ public class TileEntityAltar extends TileEntity public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - this.apatitePresent = nbt.getBoolean("apatitePresent"); + this.malachitePresent = nbt.getBoolean("malachitePresent"); this.peridotPresent = nbt.getBoolean("peridotPresent"); this.rubyPresent = nbt.getBoolean("rubyPresent"); this.sapphirePresent = nbt.getBoolean("sapphirePresent"); @@ -31,7 +31,7 @@ public class TileEntityAltar extends TileEntity public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setBoolean("apatitePresent", apatitePresent); + nbt.setBoolean("malachitePresent", malachitePresent); nbt.setBoolean("peridotPresent", peridotPresent); nbt.setBoolean("rubyPresent", rubyPresent); nbt.setBoolean("sapphirePresent", sapphirePresent); @@ -44,7 +44,7 @@ public class TileEntityAltar extends TileEntity { NBTTagCompound nbt = new NBTTagCompound(); - nbt.setBoolean("apatitePresent", apatitePresent); + nbt.setBoolean("malachitePresent", malachitePresent); nbt.setBoolean("peridotPresent", peridotPresent); nbt.setBoolean("rubyPresent", rubyPresent); nbt.setBoolean("sapphirePresent", sapphirePresent); @@ -59,7 +59,7 @@ public class TileEntityAltar extends TileEntity { if (packet.actionType == 0) { - this.apatitePresent = packet.data.getBoolean("apatitePresent"); + this.malachitePresent = packet.data.getBoolean("malachitePresent"); this.peridotPresent = packet.data.getBoolean("peridotPresent"); this.rubyPresent = packet.data.getBoolean("rubyPresent"); this.sapphirePresent = packet.data.getBoolean("sapphirePresent"); @@ -90,7 +90,7 @@ public class TileEntityAltar extends TileEntity } else if (presentGem == 14) { - apatitePresent = state; + malachitePresent = state; } else if (presentGem == 15) { @@ -118,7 +118,7 @@ public class TileEntityAltar extends TileEntity } else if (presentGem == 14) { - return apatitePresent; + return malachitePresent; } else if (presentGem == 15) { @@ -132,7 +132,7 @@ public class TileEntityAltar extends TileEntity public boolean getAllPresent() { - if (rubyPresent && peridotPresent && topazPresent && tanzanitePresent && apatitePresent && sapphirePresent) + if (rubyPresent && peridotPresent && topazPresent && tanzanitePresent && malachitePresent && sapphirePresent) { return true; } diff --git a/resources/assets/biomesoplenty/lang/en_US.lang b/resources/assets/biomesoplenty/lang/en_US.lang index 426515c4c..42103a1ba 100644 --- a/resources/assets/biomesoplenty/lang/en_US.lang +++ b/resources/assets/biomesoplenty/lang/en_US.lang @@ -149,8 +149,8 @@ tile.bop.amethystOre.topazore.name=Topaz Ore tile.bop.amethystOre.topazblock.name=Block of Topaz tile.bop.amethystOre.tanzaniteore.name=Tanzanite Ore tile.bop.amethystOre.tanzaniteblock.name=Block of Tanzanite -tile.bop.amethystOre.apatiteore.name=Apatite Ore -tile.bop.amethystOre.apatiteblock.name=Block of Apatite +tile.bop.amethystOre.malachiteore.name=Malachite Ore +tile.bop.amethystOre.malachiteblock.name=Block of Malachite tile.bop.amethystOre.sapphireore.name=Sapphire Ore 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.topaz.name=Topaz 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.ghastlysoul.name=Ghastly Soul diff --git a/resources/assets/biomesoplenty/textures/blocks/frameapatite.png b/resources/assets/biomesoplenty/textures/blocks/framemalachite.png similarity index 100% rename from resources/assets/biomesoplenty/textures/blocks/frameapatite.png rename to resources/assets/biomesoplenty/textures/blocks/framemalachite.png diff --git a/resources/assets/biomesoplenty/textures/blocks/lilypadgreen.png b/resources/assets/biomesoplenty/textures/blocks/lilypadgreen.png new file mode 100644 index 000000000..78cec9cf5 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/lilypadgreen.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/lilypadteal.png b/resources/assets/biomesoplenty/textures/blocks/lilypadteal.png new file mode 100644 index 000000000..086da64f9 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/lilypadteal.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/lilypadyellow.png b/resources/assets/biomesoplenty/textures/blocks/lilypadyellow.png new file mode 100644 index 000000000..382c153ae Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/lilypadyellow.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/apatiteblock.png b/resources/assets/biomesoplenty/textures/blocks/malachiteblock.png similarity index 100% rename from resources/assets/biomesoplenty/textures/blocks/apatiteblock.png rename to resources/assets/biomesoplenty/textures/blocks/malachiteblock.png diff --git a/resources/assets/biomesoplenty/textures/blocks/apatiteore.png b/resources/assets/biomesoplenty/textures/blocks/malachiteore.png similarity index 100% rename from resources/assets/biomesoplenty/textures/blocks/apatiteore.png rename to resources/assets/biomesoplenty/textures/blocks/malachiteore.png diff --git a/resources/assets/biomesoplenty/textures/items/apatite.png b/resources/assets/biomesoplenty/textures/items/malachite.png similarity index 100% rename from resources/assets/biomesoplenty/textures/items/apatite.png rename to resources/assets/biomesoplenty/textures/items/malachite.png