From 859e8f0bc529d70ddca85301c464f72839338503 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Fri, 12 Sep 2014 03:09:39 -0700 Subject: [PATCH] Everything's coming up roses! --- .../spiteful/forbidden/FMEventHandler.java | 8 - .../spiteful/forbidden/ForbiddenRecipes.java | 2 +- .../forbidden/blocks/BlockBlackFlower.java | 7 - .../forbidden/blocks/BlockRoseBush.java | 171 ++++++------------ .../forbidden/blocks/ForbiddenBlocks.java | 4 + .../spiteful/forbidden/compat/BloodMagic.java | 3 +- .../fox/spiteful/forbidden/compat/Compat.java | 2 +- .../forbidden/items/ItemTaintShovel.java | 10 +- .../assets/forbidden/lang/en_US.lang | 1 + 9 files changed, 71 insertions(+), 137 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index a8ba79e..24495e2 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java @@ -356,14 +356,6 @@ public class FMEventHandler { return null; } - @SubscribeEvent - public void onBonemeal(BonemealEvent event) { - if (event.block == ForbiddenBlocks.blackFlower) { - ((BlockBlackFlower) ForbiddenBlocks.blackFlower).spreadFlowers(event.world, event.x, event.y, event.z, randy); - event.setResult(Result.ALLOW); - } - } - @SubscribeEvent public void onSpawn(LivingSpawnEvent event) { if (event.entityLiving.worldObj.provider.dimensionId == -1 && event.entityLiving instanceof EntityPigZombie && randy.nextInt(175) == 1) diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java index f988093..f1743a4 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java @@ -38,7 +38,7 @@ public class ForbiddenRecipes { if (Config.emeraldTrans) ForbiddenResearch.recipes.put("TransEmerald", ThaumcraftApi.addCrucibleRecipe("TRANSEMERALD", new ItemStack(ForbiddenItems.resource, 4, 0), "nuggetEmerald", (new AspectList()).merge(Aspect.CRYSTAL, 2).merge(Aspect.GREED, 2))); - ForbiddenResearch.recipes.put("BlackFlower", ThaumcraftApi.addCrucibleRecipe("BLACKFLOWER", new ItemStack(ForbiddenBlocks.blackFlower, 1, 0), new ItemStack(Blocks.red_flower), (new AspectList()).merge(Aspect.DARKNESS, 5).merge(Aspect.LIFE, 5))); + ForbiddenResearch.recipes.put("BlackFlower", ThaumcraftApi.addCrucibleRecipe("BLACKFLOWER", new ItemStack(ForbiddenBlocks.roseBush, 1, 0), new ItemStack(Blocks.double_plant, 1, 4), (new AspectList()).merge(Aspect.DARKNESS, 8).merge(Aspect.LIFE, 5))); ForbiddenResearch.recipes.put("BlackInk", CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 2, 1), new Object[] { "#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.blackFlower, 1, 0) })); ForbiddenResearch.recipes.put("Crystalwell", ThaumcraftApi.addShapelessArcaneCraftingRecipe("CRYSTALWELL", new ItemStack(ForbiddenItems.crystalwell, 1, 0), (new AspectList()).add(Aspect.EARTH, 2).add(Aspect.FIRE, 2).add(Aspect.AIR, 2).add(Aspect.WATER, 2).add(Aspect.ORDER, 2).add(Aspect.ENTROPY, 2), new Object[] { ItemApi.getItem("itemInkwell", 32767), "dyeBlack", ItemApi.getItem("itemShard", 32767), ItemApi.getItem("itemShard", 32767) })); diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockBlackFlower.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockBlackFlower.java index 4f850f4..2c8f550 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockBlackFlower.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockBlackFlower.java @@ -23,16 +23,9 @@ public class BlockBlackFlower extends BlockFlower { super(1); float f = 0.2F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); - this.setTickRandomly(true); this.setCreativeTab(Forbidden.tab); } - @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - if (!world.isRemote && rand.nextInt(25) == 1) - spreadFlowers(world, x, y, z, rand); - } - public void spreadFlowers(World world, int x, int y, int z, Random rand) { int l = 10; int i1; diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockRoseBush.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockRoseBush.java index a41f8d9..ad456e6 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockRoseBush.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockRoseBush.java @@ -2,27 +2,20 @@ package fox.spiteful.forbidden.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.forbidden.Forbidden; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; +import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.List; import java.util.Random; public class BlockRoseBush extends BlockBush implements IGrowable @@ -39,6 +32,8 @@ public class BlockRoseBush extends BlockBush implements IGrowable this.setHardness(0.0F); this.setStepSound(soundTypeGrass); this.setBlockName("blackRoseBush"); + this.setCreativeTab(Forbidden.tab); + this.setTickRandomly(true); } /** @@ -46,7 +41,7 @@ public class BlockRoseBush extends BlockBush implements IGrowable */ public int getRenderType() { - return 40; + return 1; } /** @@ -68,24 +63,20 @@ public class BlockRoseBush extends BlockBush implements IGrowable /** * checks if the block can stay, if not drop as item */ - protected void checkAndDropBlock(World p_149855_1_, int p_149855_2_, int p_149855_3_, int p_149855_4_) + protected void checkAndDropBlock(World world, int x, int y, int z) { - /*if (!this.canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_)) - { - int l = p_149855_1_.getBlockMetadata(p_149855_2_, p_149855_3_, p_149855_4_); - - if (!func_149887_c(l)) - { - this.dropBlockAsItem(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_, l, 0); - - if (p_149855_1_.getBlock(p_149855_2_, p_149855_3_ + 1, p_149855_4_) == this) - { - p_149855_1_.setBlock(p_149855_2_, p_149855_3_ + 1, p_149855_4_, Blocks.air, 0, 2); - } + int meta = world.getBlockMetadata(x, y, z); + if(meta == 0){ + if(world.getBlock(x, y - 1, z) != this){ + world.setBlockToAir(x, y, z); } - - p_149855_1_.setBlock(p_149855_2_, p_149855_3_, p_149855_4_, Blocks.air, 0, 2); - }*/ + } + else if(meta == 1){ + if(world.getBlock(x, y + 1, z) != this){ + dropBlockAsItem(world, x, y, z, new ItemStack(this, 1)); + world.setBlockToAir(x, y, z); + } + } } /** @@ -94,13 +85,15 @@ public class BlockRoseBush extends BlockBush implements IGrowable public boolean canBlockStay(World world, int x, int y, int z) { if (world.getBlock(x, y, z) != this) return super.canBlockStay(world, x, y, z); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check. - int l = world.getBlockMetadata(x, y, z); - return l == 1 ? world.getBlock(x, y - 1, z) == this : world.getBlock(x, y + 1, z) == this && super.canBlockStay(world, x, y, z); + if(world.getBlockMetadata(x, y, z) == 0) + return world.getBlock(x, y - 1, z) == this; + Block block = world.getBlock(x, y - 1, z); + return block.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); } public Item getItemDropped(int metadata, Random rand, int fortune) { - if (metadata != 0) + if (metadata != 1) { return null; } @@ -116,7 +109,7 @@ public class BlockRoseBush extends BlockBush implements IGrowable @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(meta == 0) + if(meta == 1) return bottom; else return top; @@ -125,87 +118,10 @@ public class BlockRoseBush extends BlockBush implements IGrowable /** * Called when the block is placed in the world. */ - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - int l = ((MathHelper.floor_double((double) (p_149689_5_.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; - p_149689_1_.setBlock(p_149689_2_, p_149689_3_ + 1, p_149689_4_, this, 8 | l, 2); - } - - /** - * Called when the player destroys a block with an item that can harvest it. (i, j, k) are the coordinates of the - * block and l is the block's subtype/damage. - */ - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) - { - /*if (p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(p_149636_6_) || !this.func_149886_b(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, p_149636_2_)) - { - super.harvestBlock(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_); - }*/ - } - - /** - * Called when the block is attempted to be harvested - */ - public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_) - { - /*if (func_149887_c(p_149681_5_)) - { - if (p_149681_1_.getBlock(p_149681_2_, p_149681_3_ - 1, p_149681_4_) == this) - { - if (!p_149681_6_.capabilities.isCreativeMode) - { - int i1 = p_149681_1_.getBlockMetadata(p_149681_2_, p_149681_3_ - 1, p_149681_4_); - int j1 = func_149890_d(i1); - - if (j1 != 3 && j1 != 2) - { - p_149681_1_.func_147480_a(p_149681_2_, p_149681_3_ - 1, p_149681_4_, true); - } - else - { - if (!p_149681_1_.isRemote && p_149681_6_.getCurrentEquippedItem() != null && p_149681_6_.getCurrentEquippedItem().getItem() == Items.shears) - { - this.func_149886_b(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, i1, p_149681_6_); - } - - p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); - } - } - else - { - p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); - } - } - } - else if (p_149681_6_.capabilities.isCreativeMode && p_149681_1_.getBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_) == this) - { - p_149681_1_.setBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_, Blocks.air, 0, 2); - } - - super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_);*/ - } - - private boolean func_149886_b(World p_149886_1_, int p_149886_2_, int p_149886_3_, int p_149886_4_, int p_149886_5_, EntityPlayer p_149886_6_) - { - /*int i1 = func_149890_d(p_149886_5_); - - if (i1 != 3 && i1 != 2) - { - return false; - } - else - { - p_149886_6_.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1); - byte b0 = 1; - - if (i1 == 3) - { - b0 = 2; - } - - this.dropBlockAsItem(p_149886_1_, p_149886_2_, p_149886_3_, p_149886_4_, new ItemStack(Blocks.tallgrass, 2, b0));*/ - return true; - //} + world.setBlock(x, y, z, this, 1, 2); + world.setBlock(x, y + 1, z, this, 0, 2); } @SideOnly(Side.CLIENT) @@ -233,8 +149,39 @@ public class BlockRoseBush extends BlockBush implements IGrowable /* What happens when the block is bonemealed? Maybe? Fuck Obfuscation. */ public void func_149853_b(World world, Random rand, int x, int y, int z) { - //int l = this.func_149885_e(world, x, y, z); - //this.dropBlockAsItem(world, x, y, z, new ItemStack(this, 1, l)); + spreadFlowers(world, x, y, z, rand); + } + + @Override + public void updateTick(World world, int x, int y, int z, Random rand) { + if (!world.isRemote && rand.nextInt(10) <= 2) + spreadFlowers(world, x, y, z, rand); + } + + public void spreadFlowers(World world, int x, int y, int z, Random rand) { + int i1; + int j1; + int k1; + + i1 = x + rand.nextInt(3) - 1; + j1 = y + rand.nextInt(2) - rand.nextInt(2); + k1 = z + rand.nextInt(3) - 1; + + for (int l1 = 0; l1 < 8; ++l1) { + if (world.isAirBlock(i1, j1, k1) && this.canBlockStay(world, i1, j1, k1)) { + x = i1; + y = j1; + z = k1; + } + + i1 = x + rand.nextInt(3) - 1; + j1 = y + rand.nextInt(2) - rand.nextInt(2); + k1 = z + rand.nextInt(3) - 1; + } + + if (world.isAirBlock(i1, j1, k1) && this.canBlockStay(world, i1, j1, k1)) { + world.setBlock(i1, j1, k1, ForbiddenBlocks.blackFlower, 0, 2); + } } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/blocks/ForbiddenBlocks.java b/src/main/java/fox/spiteful/forbidden/blocks/ForbiddenBlocks.java index 50bc34f..94b5a2c 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/ForbiddenBlocks.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/ForbiddenBlocks.java @@ -12,6 +12,7 @@ public class ForbiddenBlocks { public static Block blackFlower; public static Block wrathCage; public static Block starBlock; + public static Block roseBush; public static void addBlocks() { arcaneCake = new BlockArcaneCake().setHardness(0.5F).setStepSound(Block.soundTypeCloth).setBlockName("ArcaneCake"); @@ -27,5 +28,8 @@ public class ForbiddenBlocks { starBlock = new BlockResource().setHardness(5.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName("forbidden:starblock").setBlockName("StarBlock"); GameRegistry.registerBlock(starBlock, "StarBlock"); OreDictionary.registerOre("blockNetherStar", new ItemStack(starBlock, 1, 0)); + + roseBush = new BlockRoseBush(); + GameRegistry.registerBlock(roseBush, "UmbralBush"); } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java index 7cf9ece..15394a0 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java +++ b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java @@ -54,7 +54,7 @@ public class BloodMagic { InfusionRecipe blood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood", new ItemStack(ForbiddenItems.wandCore, 1, 6), 2, (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 12).add(Aspect.WATER, 16), new ItemStack(masterOrb), new ItemStack[] { new ItemStack(magicales), new ItemStack(imbuedSlate), new ItemStack(imbuedSlate), new ItemStack(tennebrae), new ItemStack(sanctus), new ItemStack(aquasalus), new ItemStack(incendium), new ItemStack(terrae), new ItemStack(aether) }); (new DarkResearchItem("ROD_blood", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.WATER, 4).add(Aspect.WEAPON, 3), -5, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 3))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_blood.1"), new ResearchPage(blood_recipe), new ResearchPage("forbidden.research_page.ROD_blood.2") }).setParents(new String[] { "ROD_silverwood", "INFAUXSION" }).setAspectTriggers(new Aspect[] { Aspect.LIFE }).setConcealed().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("ROD_blood", 3); + ThaumcraftApi.addWarpToResearch("ROD_blood", 2); InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_alchemical", new ItemStack(ForbiddenItems.wandCap, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 12).add(Aspect.WATER, 6), ItemApi.getItem("itemWandCap", 1), new ItemStack[] { new ItemStack(magicales), new ItemStack(magicales), new ItemStack(magicales) }); (new DarkResearchItem("CAP_alchemical", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3), -5, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe) }).setParents(new String[] { "ROD_blood", "CAP_gold" }).setSecondary().setConcealed().registerResearchItem(); @@ -68,7 +68,6 @@ public class BloodMagic { InfusionRecipe blood_rapier = ThaumcraftApi.addInfusionCraftingRecipe("BLOODRAPIER", new ItemStack(ForbiddenItems.bloodRapier, 1, 0), 8, (new AspectList()).add(Aspect.LIFE, 18).add(Aspect.HUNGER, 32).add(Aspect.WEAPON, 8), ItemApi.getItem("itemSwordVoid", 0), new ItemStack[] { ItemApi.getItem("itemResource", 12), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.gluttonyShard, 1, 0), new ItemStack(Items.feather), ItemApi.getItem("itemResource", 6) }); (new DarkResearchItem("BLOODRAPIER", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.HUNGER, 12).add(Aspect.WEAPON, 12).add(Aspect.MAGIC, 12), -9, 8, 4, new ItemStack(ForbiddenItems.bloodRapier, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODRAPIER.1"), new ResearchPage(blood_rapier) }).setParents(new String[] { "INFAUXSION", "VOIDMETAL" }).setConcealed().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("BLOODRAPIER", 3); if (Compat.kami) { try { diff --git a/src/main/java/fox/spiteful/forbidden/compat/Compat.java b/src/main/java/fox/spiteful/forbidden/compat/Compat.java index 7d04356..1fc3573 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/Compat.java +++ b/src/main/java/fox/spiteful/forbidden/compat/Compat.java @@ -266,7 +266,7 @@ public class Compat { InfusionRecipe livingwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_livingwood", new ItemStack(ForbiddenItems.wandCore, 1, 8), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(livingLog), new ItemStack[] { new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(rune, 1, 4), new ItemStack(rune, 1, 5), new ItemStack(rune, 1, 6), new ItemStack(rune, 1, 7) }); (new DarkResearchItem("ROD_livingwood", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 4).add(Aspect.PLANT, 6), -1, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 7))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_livingwood.1"), new ResearchPage(livingwood_rod) }).setParents(new String[] { "ROD_silverwood", "INFAUXSION" }).setConcealed().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("ROD_livingwood", 3); + ThaumcraftApi.addWarpToResearch("ROD_livingwood", 2); BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 7), new ItemStack(ForbiddenItems.wandCore, 1, 8), 10000); IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6).add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), new Object[] { "NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 2) }); diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java b/src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java index 005a5dc..551712f 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java @@ -73,12 +73,10 @@ public class ItemTaintShovel extends ItemSpade implements IRepairable if(target != null && (target == ConfigBlocks.blockFluxGoo || target == ConfigBlocks.blockFluxGas)){ purified++; world.setBlockToAir(ex, wy, zee); - for(int sparkle = 0;sparkle < 3;sparkle++) { - double d1 = (double) ((float) ex + world.rand.nextFloat()); - double d2 = (double) ((float) wy + world.rand.nextFloat()); - double d0 = (double) ((float) zee + world.rand.nextFloat()); - Thaumcraft.proxy.sparkle((float) d1, (float) d2, (float) d0, 0x76FFFB); - } + float d1 = ((float) ex + world.rand.nextFloat()); + float d2 = ((float) wy + world.rand.nextFloat()); + float d0 = ((float) zee + world.rand.nextFloat()); + Thaumcraft.proxy.nodeBolt(world, (float)player.posX, (float)player.posY, (float)player.posZ, d1, d2, d0); } } } diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index 2b51d1e..a9eebb1 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/src/main/resources/assets/forbidden/lang/en_US.lang @@ -79,6 +79,7 @@ tile.ArcaneCake.name=Thaumic Cake tile.InkFlower.name=Umbral Rose tile.WrathCage.name=Wrath Cage tile.StarBlock.name=Nether Star Block +tile.blackRoseBush.name=Umbral Rose Bush # # Enchantments enchantment.cluster=Fiery Core