From 9cfd40dadfcb8ed7633d907d6c5c686deb38530f Mon Sep 17 00:00:00 2001 From: Adubbz Date: Mon, 27 Jan 2014 20:55:05 +1100 Subject: [PATCH] Changed biome scrolls to biome essence, made it spawn in various structures --- .../biomesoplenty/common/core/BOPItems.java | 4 +- .../common/core/BOPVanillaCompat.java | 30 +++++++++++++ .../common/items/ItemBOPBiomeEssence.java | 42 ++++++++++++++++++ .../common/items/ItemBOPBiomeScroll.java | 26 ----------- .../assets/biomesoplenty/lang/en_US.lang | 2 +- .../textures/items/biomeessence.png | Bin 0 -> 246 bytes .../textures/items/biomescroll.png | Bin 287 -> 0 bytes 7 files changed, 75 insertions(+), 29 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java delete mode 100644 src/main/java/biomesoplenty/common/items/ItemBOPBiomeScroll.java create mode 100644 src/main/resources/assets/biomesoplenty/textures/items/biomeessence.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/items/biomescroll.png diff --git a/src/main/java/biomesoplenty/common/core/BOPItems.java b/src/main/java/biomesoplenty/common/core/BOPItems.java index 7f15e4029..b3cd56f86 100644 --- a/src/main/java/biomesoplenty/common/core/BOPItems.java +++ b/src/main/java/biomesoplenty/common/core/BOPItems.java @@ -8,7 +8,7 @@ import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.api.BOPItemHelper; import biomesoplenty.common.items.ItemBOPAncientStaff; import biomesoplenty.common.items.ItemBOPAxe; -import biomesoplenty.common.items.ItemBOPBiomeScroll; +import biomesoplenty.common.items.ItemBOPBiomeEssence; import biomesoplenty.common.items.ItemBOPFood; import biomesoplenty.common.items.ItemBOPHoe; import biomesoplenty.common.items.ItemBOPMisc; @@ -69,7 +69,7 @@ public class BOPItems //registerItem(new ItemBiomeBook().setUnlocalizedName("biomeBook")); registerItem(new ItemBiomeFinder().setUnlocalizedName("biomeFinder")); - registerItem(new ItemBOPBiomeScroll().setUnlocalizedName("biomeScroll")); + registerItem(new ItemBOPBiomeEssence().setUnlocalizedName("biomeEssence")); registerItem(new ItemBOPSword(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("swordMud")); registerItem(new ItemBOPSpade(BOPItemHelper.toolMaterialMud, 0).setUnlocalizedName("shovelMud")); diff --git a/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java b/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java index d5716886f..41bb979e3 100644 --- a/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java +++ b/src/main/java/biomesoplenty/common/core/BOPVanillaCompat.java @@ -2,9 +2,11 @@ package biomesoplenty.common.core; import java.util.HashMap; import java.util.Map.Entry; +import java.util.Random; import net.minecraft.block.BlockDispenser; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.ChestGenHooks; @@ -20,6 +22,8 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora; public class BOPVanillaCompat { + private static Random random = new Random(); + public static void init() { registerDispenserBehaviours(); @@ -61,6 +65,32 @@ public class BOPVanillaCompat village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("misc"), 1, 1), 2, 8, 25)); village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("wadingBoots"), 1, 0), 1, 1, 5)); village.addItem(new WeightedRandomChestContent(new ItemStack(BOPItemHelper.get("flippers"), 1, 0), 1, 1, 5)); + + ItemStack biomeEssence = new ItemStack(BOPItemHelper.get("biomeEssence")); + + biomeEssence.setTagCompound(new NBTTagCompound()); + + BiomeGenBase essenceBiome = null; + + while (essenceBiome == null) + { + BiomeGenBase tempBiome = BiomeGenBase.func_150568_d(random.nextInt(BiomeGenBase.func_150565_n().length - 1)); + + if (tempBiome != null) + { + essenceBiome = tempBiome; + } + } + + biomeEssence.getTagCompound().setString("biome", essenceBiome.biomeName); + + desertTemple.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); + dungeon.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); + jungleTemple.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); + mineshaft.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); + strongholdCorridor.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); + strongholdCrossing.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); + strongholdLibrary.addItem(new WeightedRandomChestContent(biomeEssence, 1, 1, 3)); } } diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java b/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java new file mode 100644 index 000000000..8794aac7d --- /dev/null +++ b/src/main/java/biomesoplenty/common/items/ItemBOPBiomeEssence.java @@ -0,0 +1,42 @@ +package biomesoplenty.common.items; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import biomesoplenty.BiomesOPlenty; + +public class ItemBOPBiomeEssence extends Item +{ + public ItemBOPBiomeEssence() + { + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + public void registerIcons(IIconRegister iconRegister) + { + itemIcon = iconRegister.registerIcon("biomesoplenty:biomeessence"); + } + + @Override + public void addInformation(ItemStack itemStack, EntityPlayer player, List infoList, boolean advancedItemTooltips) + { + if (itemStack.hasTagCompound()) + { + if (itemStack.getTagCompound().hasKey("biome")) infoList.add(itemStack.getTagCompound().getString("biome")); + } + } + + @Override + public boolean hasEffect(ItemStack itemStack, int pass) + { + return true; + } +} diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPBiomeScroll.java b/src/main/java/biomesoplenty/common/items/ItemBOPBiomeScroll.java deleted file mode 100644 index 5a0587cdb..000000000 --- a/src/main/java/biomesoplenty/common/items/ItemBOPBiomeScroll.java +++ /dev/null @@ -1,26 +0,0 @@ -package biomesoplenty.common.items; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import biomesoplenty.BiomesOPlenty; - -public class ItemBOPBiomeScroll extends Item -{ - public ItemBOPBiomeScroll() - { - this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); - } - - @Override - public void registerIcons(IIconRegister iconRegister) - { - itemIcon = iconRegister.registerIcon("biomesoplenty:biomescroll"); - } - - @Override - public boolean hasEffect(ItemStack itemStack, int pass) - { - return true; - } -} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index f6f3effc1..00601acd8 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -389,7 +389,7 @@ item.flippers.name=Flippers item.biomeBook.name=Book O' Biomes item.biomeFinder.name=Biome Radar -item.biomeScroll.name=Biome Scroll +item.biomeEssence.name=Biome Essence item.bopBucket.amethyst_empty.name=Amethyst Bucket item.bopBucket.amethyst_spring_water.name=Spring Water Amethyst Bucket diff --git a/src/main/resources/assets/biomesoplenty/textures/items/biomeessence.png b/src/main/resources/assets/biomesoplenty/textures/items/biomeessence.png new file mode 100644 index 0000000000000000000000000000000000000000..e5abea58d16c90d98e234b60c05c7c36d5295c69 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsH(`* z#WBRf|7>3%SAzkMbM@4F|E2a$H#_Q}v7^-fQFGFq+L_un;%Z*h_xNFK!_Y!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA{&S zi(`m||K14)d0P}jTy|D}dljmEL+)FWljyB3-XIp=9W&P_vrT!Ew8_tiaq;`c`?iz5 zua3R=ccUJ|^p)H1OyI?{~Jd$>~gM>^&J4E4H{eIR-9L2%owl^kBN|+1EMz%4Z_@e&Z3?c(>#sdAd1~#s e?9Y9R?~IEd{QVhq{aifInGBw;elF{r5}E+x8fohQ