From 9b97f207ca35a4229811ddaf246b246784869836 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 28 Sep 2013 18:53:14 -0400 Subject: [PATCH] Added a Sacred Oak sapling --- common/biomesoplenty/api/BlockReferences.java | 1 + .../blocks/BlockBOPColorizedSapling.java | 8 ++++---- .../configuration/BOPVanillaCompat.java | 3 +++ .../itemblocks/ItemBlockColorizedSapling.java | 2 +- resources/assets/biomesoplenty/lang/en_US.lang | 1 + .../textures/blocks/sapling_sacredoak.png | Bin 0 -> 697 bytes 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 resources/assets/biomesoplenty/textures/blocks/sapling_sacredoak.png diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index ac1e86637..f3bce590c 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -91,6 +91,7 @@ public class BlockReferences { redwoodSapling (Blocks.colorizedSaplings, 3), willowSapling (Blocks.colorizedSaplings, 4), pineSapling (Blocks.colorizedSaplings, 5), + sacredoakSapling (Blocks.colorizedSaplings, 6), mapleSapling (Blocks.saplings, 11), orangeAutumnSapling (Blocks.saplings, 8), pinkCherrySapling (Blocks.saplings, 10), diff --git a/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java b/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java index 9a1dd2afb..e0f1f7db6 100644 --- a/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java +++ b/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java @@ -13,9 +13,9 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.ForgeDirection; import biomesoplenty.BiomesOPlenty; -import biomesoplenty.worldgen.WorldGenNetherBush; import biomesoplenty.worldgen.tree.WorldGenAcacia; import biomesoplenty.worldgen.tree.WorldGenMangrove; +import biomesoplenty.worldgen.tree.WorldGenMassiveTree; import biomesoplenty.worldgen.tree.WorldGenPalmTree1; import biomesoplenty.worldgen.tree.WorldGenPalmTree3; import biomesoplenty.worldgen.tree.WorldGenPineTree; @@ -26,7 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPColorizedSapling extends BlockSapling { - private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine", "sacredoak"}; private Icon[] textures; private static final int TYPES = 15; @@ -163,8 +163,8 @@ public class BlockBOPColorizedSapling extends BlockSapling obj = new WorldGenPineTree(); break; - case 6: // Hellbark - obj = new WorldGenNetherBush(); + case 6: // Sacred Oak + obj = new WorldGenMassiveTree(false); break; } } diff --git a/common/biomesoplenty/configuration/BOPVanillaCompat.java b/common/biomesoplenty/configuration/BOPVanillaCompat.java index d0d105980..749bf1a46 100644 --- a/common/biomesoplenty/configuration/BOPVanillaCompat.java +++ b/common/biomesoplenty/configuration/BOPVanillaCompat.java @@ -47,6 +47,7 @@ public class BOPVanillaCompat { dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 15), 1, 2, 5)); dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(), 1, 0), 1, 1, 15)); dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(), 1, 0), 1, 1, 10)); + dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25)); mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 3, 10)); @@ -70,9 +71,11 @@ public class BOPVanillaCompat { desertTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(),1,0), 1, 1, 20)); desertTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(),1,0), 1, 1, 15)); + desertTemple.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); jungleTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(),1,0), 1, 1, 20)); jungleTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(),1,0), 1, 1, 15)); + jungleTemple.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); village.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 2, 6, 25)); village.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25)); diff --git a/common/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java b/common/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java index 856c7e5ed..d8f65e0cd 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java +++ b/common/biomesoplenty/itemblocks/ItemBlockColorizedSapling.java @@ -7,7 +7,7 @@ import net.minecraft.util.Icon; public class ItemBlockColorizedSapling extends ItemBlock { - private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine", "sacredoak"}; public ItemBlockColorizedSapling(int par1) { diff --git a/resources/assets/biomesoplenty/lang/en_US.lang b/resources/assets/biomesoplenty/lang/en_US.lang index db3378063..4ef0ea961 100644 --- a/resources/assets/biomesoplenty/lang/en_US.lang +++ b/resources/assets/biomesoplenty/lang/en_US.lang @@ -103,6 +103,7 @@ tile.bop.colorizedSaplings.palmSapling.name=Palm Sapling tile.bop.colorizedSaplings.redwoodSapling.name=Redwood Sapling tile.bop.colorizedSaplings.willowSapling.name=Willow Sapling tile.bop.colorizedSaplings.pineSapling.name=Pine Sapling +tile.bop.colorizedSaplings.sacredoakSapling.name=Sacred Oak Sapling tile.bop.willow.name=Willow tile.bop.ivy.name=Ivy diff --git a/resources/assets/biomesoplenty/textures/blocks/sapling_sacredoak.png b/resources/assets/biomesoplenty/textures/blocks/sapling_sacredoak.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab3077d648635eb04fd4739394e6508308a4e37 GIT binary patch literal 697 zcmV;q0!ICbP)N2bPDNB8 zb~7$DE-^7j^FlWO00K2hL_t(IPi<3MPZMDf-EF&opxi7JxwNsh_6DV}lr+6#wLmHD zLbNSac~FcmMq;Xj`TIrEh->vCbZsar)-Ght}s(C;3Uv;^2^=Jd` z_BCr1CGf2*Zil{CL~h`yjFHE2iD@YF{iP^I_m|=Oye4LHM9Tw$?lR$UI21}eUz>-T z^@*W9Mo3hQY{jK3V<{p?z@o^BA&29wB-*L^?;JiIt^sZ0cijMlv>};!6h^$O;E;MZuk$4`pCu9z%~h ztL&U{8|+9$Gw)YG151DQPep+6)R`Tv6ix!-%3 zc$OBzRxKtYQ5l=`ZiQtmv$3VXEH>e)r=)v5Jq2TVLb~ydIBzDpJD>GWBzVSG*~m-_ f!M}}8?