From 90aeaac6e2158898c1b1a18535a9cef0e1ab592b Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 19 Nov 2014 18:48:26 -0500 Subject: [PATCH] (Yes, I nerfed the Green Grove.) --- build.properties | 4 +- .../common/items/ItemRitualDiviner.java | 39 ++++++++++++------- .../common/items/sigil/SigilOfGrowth.java | 4 +- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/build.properties b/build.properties index 6147e4e9..73163925 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Fri Nov 14 20:13:59 EST 2014 +#Tue Nov 18 15:51:47 EST 2014 mod_name=BloodMagic forge_version=10.13.2.1232 ccc_version=1.0.4.29 @@ -8,5 +8,5 @@ nei_version=1.0.3.64 package_group=com.wayoftime.bloodmagic mod_version=1.2.1-Beta minetweaker_version=Dev-1.7.10-3.0.9B -build_number=2 mc_version=1.7.10 +build_number=3 diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 22305f9a..ecd66773 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -1,13 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -22,7 +16,17 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.world.World; -import java.util.List; +import org.lwjgl.input.Keyboard; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.rituals.IRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemRitualDiviner extends EnergyItems { @@ -59,7 +63,7 @@ public class ItemRitualDiviner extends EnergyItems par3List.add("Ritual tuned to face: " + this.getNameForDirection(this.getDirection(par1ItemStack))); - boolean sneaking = true; + boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); if(sneaking) { @@ -237,6 +241,14 @@ public class ItemRitualDiviner extends EnergyItems } } } + }else if(!(par3World.getBlock(par4, par5, par6) instanceof IRitualStone)) + { + if(par3World.isRemote) + { + return false; + } + this.cycleDirection(par1ItemStack); + par2EntityPlayer.addChatComponentMessage(new ChatComponentText("Ritual tuned to face: " + this.getNameForDirection(this.getDirection(par1ItemStack)))); } return false; @@ -259,9 +271,6 @@ public class ItemRitualDiviner extends EnergyItems IChatComponent chatmessagecomponent = new ChatComponentText("Current Ritual: " + Rituals.getNameOfRitual(this.getCurrentRitual(par1ItemStack))); par3EntityPlayer.addChatComponentMessage(chatmessagecomponent); } - }else if(!par3EntityPlayer.isSwingInProgress) - { - this.cycleDirection(par1ItemStack); } return par1ItemStack; @@ -362,7 +371,7 @@ public class ItemRitualDiviner extends EnergyItems itemStack.stackTagCompound.setInteger("direction", direction); } - public void cycleDirection(ItemStack itemStack) + public int cycleDirection(ItemStack itemStack) { int direction = this.getDirection(itemStack); @@ -375,6 +384,8 @@ public class ItemRitualDiviner extends EnergyItems } this.setDirection(itemStack, direction); + + return direction; } public String getNameForDirection(int direction) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java index 1873bc31..d4cf0ed4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -192,7 +192,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade if (block instanceof IPlantable) { - if (par2World.rand.nextInt(20) == 0) + if (par2World.rand.nextInt(50) == 0) { block.updateTick(par2World, ix, iy, iz, par2World.rand); } @@ -272,7 +272,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade if (block instanceof IPlantable) { - if (world.rand.nextInt(10) == 0) + if (world.rand.nextInt(100) == 0) { block.updateTick(world, ix, iy, iz, world.rand); }