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

1.7.10 moving forward to v1.1.0!

Browse source
This commit is contained in:
WayofTime 2014-07-15 19:23:57 -04:00
parent 1778cfa737
commit a92efa364d
51 changed files with 849 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

14
1.7.2/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
View file

@ -25,10 +25,7 @@ import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjecti
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Type;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
public class AlchemicalWizardryEventHooks
{
@ -36,6 +33,15 @@ public class AlchemicalWizardryEventHooks
public static Map<String,Boolean> playerBoostStepHeight = new HashMap();
public static List<String> playersWith1Step = new ArrayList();
@SubscribeEvent
public void onPlayerRespawnEvent(PlayerRespawnEvent event)
{
if(AlchemicalWizardry.respawnWithLowerHealth)
{
event.player.setHealth(6);
}
}
@SubscribeEvent
public void onLivingJumpEvent(LivingJumpEvent event)
{

3
1.7.2/main/java/WayofTime/alchemicalWizardry/common/harvest/BloodMagicHarvestHandler.java
View file

@ -14,13 +14,11 @@ import WayofTime.alchemicalWizardry.api.harvest.IHarvestHandler;
public class BloodMagicHarvestHandler implements IHarvestHandler
{
@Override
public boolean canHandleBlock(Block block)
{
return block == Blocks.wheat || block == Blocks.carrots || block == Blocks.potatoes || block == Blocks.nether_wart;
}
@Override
public int getHarvestMeta(Block block)
{
if(block == Blocks.wheat)
@ -105,7 +103,6 @@ public class BloodMagicHarvestHandler implements IHarvestHandler
return false;
}
@Override
public IPlantable getSeedItem(Block block)
{
if(block == Blocks.wheat)

15
1.7.2/main/java/WayofTime/alchemicalWizardry/common/harvest/GourdHarvestHandler.java
View file

@ -14,18 +14,11 @@ import WayofTime.alchemicalWizardry.api.harvest.IHarvestHandler;
public class GourdHarvestHandler implements IHarvestHandler
{
@Override
public boolean canHandleBlock(Block block)
{
return block == Blocks.melon_block || block == Blocks.pumpkin;
}
@Override
public int getHarvestMeta(Block block)
{
return 0;
}
@Override
public boolean harvestAndPlant(World world, int xCoord, int yCoord, int zCoord, Block block, int meta)
{
@ -47,12 +40,6 @@ public class GourdHarvestHandler implements IHarvestHandler
world.spawnEntityInWorld(itemEnt);
}
return false;
}
@Override
public IPlantable getSeedItem(Block block)
{
return null;
return true;
}
}