diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 9e56ea2be..652c6fda6 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -110,7 +110,7 @@ public class BlockReferences { giantFlowerRed (Blocks.petals, 0), giantFlowerYellow (Blocks.petals, 1), - seaweed (Blocks.coral, 0), + kelp (Blocks.coral, 0), toadstool (Blocks.mushrooms, 0), portobello (Blocks.mushrooms, 1), diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java b/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java index a55163722..76c6613c3 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPCoral.java @@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPCoral extends BlockFlower { - private static final String[] coral = new String[] {"seaweed"}; + private static final String[] coral = new String[] {"kelp"}; private Icon[] textures; protected BlockBOPCoral(int blockID, Material material) diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index 30bbe003d..53a6f0aca 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -325,7 +325,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.mushrooms.get(),1,2), "Blue Milk Cap"); LanguageRegistry.addName(new ItemStack(Blocks.mushrooms.get(),1,3), "Glowshroom"); - LanguageRegistry.addName(new ItemStack(Blocks.coral.get(),1,0), "Seaweed"); + LanguageRegistry.addName(new ItemStack(Blocks.coral.get(),1,0), "Kelp"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,6), "Fir Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,3), "Redwood Sapling"); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPCoral.java b/src/minecraft/biomesoplenty/items/ItemBOPCoral.java index 3b520ed32..6869332f7 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPCoral.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPCoral.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; public class ItemBOPCoral extends ItemBlock { - private static final String[] coral = new String[] {"coral"}; + private static final String[] coral = new String[] {"kelp"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/kelp.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/kelp.png new file mode 100644 index 000000000..fa041f6da Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/kelp.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/seaweed.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/seaweed.png deleted file mode 100644 index 3a43c506a..000000000 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/seaweed.png and /dev/null differ