lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Yes, I nerfed the Green Grove.)

Browse source
This commit is contained in:
WayofTime 2014-11-19 18:48:26 -05:00
parent dbe51d7f7b
commit 90aeaac6e2
3 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,5 +1,5 @@
# #
#Fri Nov 14 20:13:59 EST 2014 #Tue Nov 18 15:51:47 EST 2014
mod_name=BloodMagic mod_name=BloodMagic
forge_version=10.13.2.1232 forge_version=10.13.2.1232
ccc_version=1.0.4.29 ccc_version=1.0.4.29
@ -8,5 +8,5 @@ nei_version=1.0.3.64
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=1.2.1-Beta mod_version=1.2.1-Beta
minetweaker_version=Dev-1.7.10-3.0.9B minetweaker_version=Dev-1.7.10-3.0.9B
build_number=2
mc_version=1.7.10 mc_version=1.7.10
build_number=3

39
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java
View file

@ -1,13 +1,7 @@
package WayofTime.alchemicalWizardry.common.items; package WayofTime.alchemicalWizardry.common.items;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import java.util.List;
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 net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -22,7 +16,17 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent; import net.minecraft.util.IChatComponent;
import net.minecraft.world.World; 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 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))); 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) 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; return false;
@ -259,9 +271,6 @@ public class ItemRitualDiviner extends EnergyItems
IChatComponent chatmessagecomponent = new ChatComponentText("Current Ritual: " + Rituals.getNameOfRitual(this.getCurrentRitual(par1ItemStack))); IChatComponent chatmessagecomponent = new ChatComponentText("Current Ritual: " + Rituals.getNameOfRitual(this.getCurrentRitual(par1ItemStack)));
par3EntityPlayer.addChatComponentMessage(chatmessagecomponent); par3EntityPlayer.addChatComponentMessage(chatmessagecomponent);
} }
}else if(!par3EntityPlayer.isSwingInProgress)
{
this.cycleDirection(par1ItemStack);
} }
return par1ItemStack; return par1ItemStack;
@ -362,7 +371,7 @@ public class ItemRitualDiviner extends EnergyItems
itemStack.stackTagCompound.setInteger("direction", direction); itemStack.stackTagCompound.setInteger("direction", direction);
} }
public void cycleDirection(ItemStack itemStack) public int cycleDirection(ItemStack itemStack)
{ {
int direction = this.getDirection(itemStack); int direction = this.getDirection(itemStack);
@ -375,6 +384,8 @@ public class ItemRitualDiviner extends EnergyItems
} }
this.setDirection(itemStack, direction); this.setDirection(itemStack, direction);
return direction;
} }
public String getNameForDirection(int direction) public String getNameForDirection(int direction)

4
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
View file

@ -192,7 +192,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (block instanceof IPlantable) if (block instanceof IPlantable)
{ {
if (par2World.rand.nextInt(20) == 0) if (par2World.rand.nextInt(50) == 0)
{ {
block.updateTick(par2World, ix, iy, iz, par2World.rand); block.updateTick(par2World, ix, iy, iz, par2World.rand);
} }
@ -272,7 +272,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (block instanceof IPlantable) if (block instanceof IPlantable)
{ {
if (world.rand.nextInt(10) == 0) if (world.rand.nextInt(100) == 0)
{ {
block.updateTick(world, ix, iy, iz, world.rand); block.updateTick(world, ix, iy, iz, world.rand);
} }