From 96ba092c5372026432ef3bd1e6340cf441d592c2 Mon Sep 17 00:00:00 2001 From: fewizz Date: Sat, 11 Jul 2015 13:49:12 +0300 Subject: [PATCH] Ooops O_o --- .../tombenpotter/emt/ElectroMagicTools.java | 2 +- .../emt/common/util/EntityEventHandler.java | 28 +++++++++++++++++++ .../emt/common/util/RenderPlayerHandler.java | 18 ------------ 3 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java delete mode 100644 src/main/java/tombenpotter/emt/common/util/RenderPlayerHandler.java diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 8f440a9..18a8c99 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -52,7 +52,6 @@ public class ElectroMagicTools { ElectroMagicTools.logger.info(localize("console.EMT.preInit.begin")); ConfigHandler.init(event.getSuggestedConfigurationFile()); - MinecraftForge.EVENT_BUS.register(new RenderPlayerHandler()); FMLCommonHandler.instance().bus().register(new EventHandlerEMT()); Registry.register(); EssentiasOutputs.addPrimalOutputs(); @@ -68,6 +67,7 @@ public class ElectroMagicTools { ElectroMagicTools.logger.info(localize("console.EMT.init.loadProxies")); proxy.load(); ElectroMagicTools.logger.info(localize("console.EMT.init.mobDrops")); + MinecraftForge.EVENT_BUS.register(new EntityEventHandler()); ElectroMagicTools.logger.info(localize("console.EMT.init.dungeon")); DungeonChestGenerator.generateLoot(); diff --git a/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java b/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java new file mode 100644 index 0000000..6f9be4f --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java @@ -0,0 +1,28 @@ +package tombenpotter.emt.common.util; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import thaumcraft.common.entities.monster.EntityTaintChicken; +import tombenpotter.emt.common.items.ItemRegistry; + +public class EntityEventHandler { + + @SubscribeEvent + public void onEntityLivingDrops(LivingDropsEvent event) { + + if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { + if (event.entityLiving instanceof EntityCreeper) { + EntityCreeper creeper = (EntityCreeper) event.entityLiving; + if (creeper.getPowered()) { + event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 1, 6), 1); + } + } + if (event.entityLiving instanceof EntityTaintChicken) { + event.entityLiving.entityDropItem(new ItemStack(ItemRegistry.itemEMTItems, 1, 14), 1); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/util/RenderPlayerHandler.java b/src/main/java/tombenpotter/emt/common/util/RenderPlayerHandler.java deleted file mode 100644 index 0b0c0ea..0000000 --- a/src/main/java/tombenpotter/emt/common/util/RenderPlayerHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package tombenpotter.emt.common.util; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.client.event.RenderPlayerEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - - -public class RenderPlayerHandler { - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void PlayerRend(RenderPlayerEvent.Pre event){ - //System.out.println("vse norm"); - - } -}