From d02ea93141d3ef154d8b7e3c4c93309ce2f35d9f Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 23 May 2013 11:20:06 -0400 Subject: [PATCH] More work on kelp --- .../biomesoplenty/api/BlockReferences.java | 2 +- .../biomesoplenty/blocks/BlockBOPCoral.java | 2 +- .../biomesoplenty/configuration/BOPBlocks.java | 2 +- .../biomesoplenty/items/ItemBOPCoral.java | 2 +- .../mods/BiomesOPlenty/textures/blocks/kelp.png | Bin 0 -> 368 bytes .../BiomesOPlenty/textures/blocks/seaweed.png | Bin 588 -> 0 bytes 6 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/kelp.png delete mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/seaweed.png 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 0000000000000000000000000000000000000000..fa041f6da3d8111acfa2b73537da981a02df3593 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvVnk zx;Tbd`1ejc&3nj!$0e9ETxDGVqmZhDw1FG@_ zW?A;apzp{qvE#8;d_0FtjY- ztjuMYSS54($c5I%cU+?3J`>lw&SewfDcio7?WfBVbFt-@Pb;@GCh47NOv>gxaD?;6 zo%n_>)k<|C&JSHD{jYnatTuJiSX1#YoK-dd;6Ap}AM)9Exex9xZ%Is%y8-k!gQu&X J%Q~loCIFF@ievx) literal 0 HcmV?d00001 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 3a43c506a1baeeb12e5e79f5c7f61f7a85b99ddd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmV-S0<-;zP)N2bPDNB8 zb~7$DE-^4L^m3s900GEJL_t(IPi>LeE~HTuh5v`3&6Mt-21+Tk3nD0`l&Q=^Uvx_( zVs6};xiUY5L+*=|~YpTd78G6~w zn_?yE1dd0f<9<$BuO`J5XzG1fu`!4~Z%F&ytdbhldiV~91(;@hY}?JW1TPb+ikLbv zJ`1s0XxQ$P=95uPfR@uSNhXs{=z2xTF)m0&<~;hf^Tn78h84&(SH=zV$=Tt zhheT~6oAl0LcF_?0s%=HNc#7qTJRpklz^+Cjz)6nblPE&S*8Sry>`A`3-#+gI!ul@ z@5`^vUcCwrhyU|WSAhVB0t7X4VN}>J!g|)aRWjR&>lQl1v)C!svu$5jV3-H1U-~Uo zGa>sEG~z>w3UYu&^S0FZxfS5i{B5ZSdAc+E~9u3-}A$1c&0y#4x a;(P*s32@#151qaM0000