From 5100b89546f29adb2464e6f230b31196d711b63c Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Mon, 7 Dec 2015 23:40:27 +0100 Subject: [PATCH] - Hacky Hacky He He #2 --- .../common/events/EventHandlerEntity.java | 15 +++++---------- .../gadomancy/coremod/GadomancyTransformer.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java index 8c02b1e..0081967 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java @@ -1,39 +1,30 @@ package makeo.gadomancy.common.events; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import makeo.gadomancy.common.aura.AuraResearchManager; import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; import makeo.gadomancy.common.data.ModConfig; -import makeo.gadomancy.common.entities.EntityAuraCore; import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.familiar.FamiliarAIController; -import makeo.gadomancy.common.items.ItemAuraCore; import makeo.gadomancy.common.utils.world.TCMazeHandler; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; import thaumcraft.common.items.armor.Hover; -import java.io.File; - /** * This class is part of the Gadomancy Mod * Gadomancy is Open Source and distributed under the @@ -52,7 +43,11 @@ public class EventHandlerEntity { }*/ public static int onGetFortuneLevel(EntityLivingBase entity) { - return EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, entity.getHeldItem()); + return 400; + } + + public static int onGetEnchantmentLevel(int enchantmentId, ItemStack stack) { + return 0; } @SubscribeEvent diff --git a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java index ad6a731..549eb45 100644 --- a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java +++ b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java @@ -2,7 +2,7 @@ package makeo.gadomancy.coremod; import cpw.mods.fml.common.asm.transformers.AccessTransformer; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; @@ -43,6 +43,15 @@ public class GadomancyTransformer extends AccessTransformer { mn.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "makeo/gadomancy/common/events/EventHandlerEntity", "onGetFortuneLevel", "(Lnet/minecraft/entity/EntityLivingBase;)I", false)); mn.instructions.add(new InsnNode(Opcodes.IRETURN)); + + } else if(mn.name.equals("getEnchantmentLevel") || mn.name.equals("func_77506_a")) { + mn.instructions = new InsnList(); + + mn.instructions.add(new VarInsnNode(Opcodes.ILOAD, 0)); + mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1)); + mn.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "makeo/gadomancy/common/events/EventHandlerEntity", + "onGetEnchantmentLevel", "(ILnet/minecraft/item/ItemStack;)I", false)); + mn.instructions.add(new InsnNode(Opcodes.IRETURN)); } }