Skip to content

Commit

Permalink
Lets see if i can move the events to a class.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander committed Apr 20, 2015
1 parent 18b1bd3 commit 93be8c6
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 80 deletions.
81 changes: 1 addition & 80 deletions src/main/java/com/progwml6/natura/Natura.java
Expand Up @@ -5,24 +5,14 @@
import com.progwml6.natura.worldgen.CloudWorldgen;
import com.progwml6.natura.worldgen.CropWorldGen;
import mantle.pulsar.control.PulseManager;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.player.BonemealEvent;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -71,7 +61,7 @@ public static ItemsNatura getItems()
@EventHandler
public void preInit(FMLPreInitializationEvent evt)
{
MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.register(new NaturaEvents());
PHNatura.initProps(evt.getSuggestedConfigurationFile());

pulsar.preInit(evt);
Expand All @@ -98,73 +88,4 @@ public void postInit(FMLPostInitializationEvent evt)
{
this.proxy.postInit();
}

@SubscribeEvent
public void bonemealEvent(BonemealEvent event)
{
/**if (!event.world.isRemote && !event.isCanceled() && event.getResult() != Result.ALLOW)
{
if (event.block == NContent.glowshroom)
{
if (NContent.glowshroom.fertilizeMushroom(event.world, event.pos, event.world.rand))
event.setResult(Result.ALLOW);
}
if (event.block == NContent.berryBush)
{
if (NContent.berryBush.boneFertilize(event.world, event.pos, event.world.rand))
event.setResult(Result.ALLOW);
}
if (event.block == NContent.netherBerryBush)
{
if (NContent.netherBerryBush.boneFertilize(event.world, event.pos, event.world.rand))
event.setResult(Result.ALLOW);
}
}*/
}

@SubscribeEvent
public void interactEvent(EntityInteractEvent event)
{
//if (event.target == null)
if (event.target instanceof EntityCow || event.target instanceof EntitySheep)
{
ItemStack equipped = event.entityPlayer.getCurrentEquippedItem();
EntityAnimal creature = (EntityAnimal) event.target;
if (equipped != null && equipped.getItem() == this.getItems().barley_seeds && equipped.getItemDamage() == 0 && creature.getGrowingAge() == 0 && !creature.isInLove())
{
EntityPlayer player = event.entityPlayer;
if (!player.capabilities.isCreativeMode)
{
--equipped.stackSize;

if (equipped.stackSize <= 0)
{
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
}
}

creature.setInLove(event.entityPlayer);
}
}
}

@SubscribeEvent
public void spawnEvent(EntityJoinWorldEvent event)
{
/**if (event.entity instanceof EntityCow || event.entity instanceof EntitySheep)
{
((EntityLiving) event.entity).tasks.addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.plantItem, false));
}
if (event.entity instanceof EntityChicken)
{
((EntityLiving) event.entity).tasks.addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.seeds, false));
}*/
}

@SubscribeEvent
public void chunkDataSave(ChunkDataEvent.Save event)
{
event.getData().setBoolean("Natura.Retrogen", true);
}
}
84 changes: 84 additions & 0 deletions src/main/java/com/progwml6/natura/NaturaEvents.java
@@ -0,0 +1,84 @@
package com.progwml6.natura;

import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.player.BonemealEvent;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;

public class NaturaEvents
{
@SubscribeEvent
public void bonemealEvent(BonemealEvent event)
{
/**if (!event.world.isRemote && !event.isCanceled() && event.getResult() != Result.ALLOW)
{
if (event.block == NContent.glowshroom)
{
if (NContent.glowshroom.fertilizeMushroom(event.world, event.pos, event.world.rand))
event.setResult(Result.ALLOW);
}
if (event.block == NContent.berryBush)
{
if (NContent.berryBush.boneFertilize(event.world, event.pos, event.world.rand))
event.setResult(Result.ALLOW);
}
if (event.block == NContent.netherBerryBush)
{
if (NContent.netherBerryBush.boneFertilize(event.world, event.pos, event.world.rand))
event.setResult(Result.ALLOW);
}
}*/
}

@SubscribeEvent
public void interactEvent(EntityInteractEvent event)
{
//if (event.target == null)
if (event.target instanceof EntityCow || event.target instanceof EntitySheep)
{
ItemStack equipped = event.entityPlayer.getCurrentEquippedItem();
EntityAnimal creature = (EntityAnimal) event.target;
if (equipped != null && equipped.getItem() == Natura.getItems().barley_seeds && equipped.getItemDamage() == 0 && creature.getGrowingAge() == 0 && !creature.isInLove())
{
EntityPlayer player = event.entityPlayer;
if (!player.capabilities.isCreativeMode)
{
--equipped.stackSize;

if (equipped.stackSize <= 0)
{
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
}
}

creature.setInLove(event.entityPlayer);
}
}
}

@SubscribeEvent
public void spawnEvent(EntityJoinWorldEvent event)
{
/**if (event.entity instanceof EntityCow || event.entity instanceof EntitySheep)
{
((EntityLiving) event.entity).tasks.addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.plantItem, false));
}
if (event.entity instanceof EntityChicken)
{
((EntityLiving) event.entity).tasks.addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.seeds, false));
}*/
}

@SubscribeEvent
public void chunkDataSave(ChunkDataEvent.Save event)
{
event.getData().setBoolean("Natura.Retrogen", true);
}
}

0 comments on commit 93be8c6

Please sign in to comment.