diff --git a/src/main/java/com/enderio/core/common/mixins/early/MixinEntityArrow_UpdateEvent.java b/src/main/java/com/enderio/core/common/mixins/early/MixinEntityArrow_UpdateEvent.java new file mode 100644 index 0000000..68fc2dd --- /dev/null +++ b/src/main/java/com/enderio/core/common/mixins/early/MixinEntityArrow_UpdateEvent.java @@ -0,0 +1,22 @@ +package com.enderio.core.common.mixins.early; + +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraftforge.common.MinecraftForge; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.enderio.core.common.event.ArrowUpdateEvent; + +@Mixin(EntityArrow.class) +public class MixinEntityArrow_UpdateEvent { + + @Inject( + method = "onUpdate", + at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;onUpdate()V", shift = At.Shift.AFTER)) + private void fireUpdateEvent(CallbackInfo ci) { + MinecraftForge.EVENT_BUS.post(new ArrowUpdateEvent((EntityArrow) (Object) this)); + } +} diff --git a/src/main/java/com/enderio/core/common/transform/EnderCoreMethods.java b/src/main/java/com/enderio/core/common/transform/EnderCoreMethods.java index 2417711..801a466 100644 --- a/src/main/java/com/enderio/core/common/transform/EnderCoreMethods.java +++ b/src/main/java/com/enderio/core/common/transform/EnderCoreMethods.java @@ -1,17 +1,14 @@ package com.enderio.core.common.transform; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerFurnace; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.MinecraftForge; import com.enderio.core.common.config.ConfigHandler; -import com.enderio.core.common.event.ArrowUpdateEvent; public class EnderCoreMethods { @@ -19,10 +16,6 @@ public class EnderCoreMethods { return ConfigHandler.anvilMaxLevel; } - public static void onArrowUpdate(EntityArrow entity) { - MinecraftForge.EVENT_BUS.post(new ArrowUpdateEvent(entity)); - } - // mostly copied from ContainerFurnace public static ItemStack transferStackInSlot(ContainerFurnace inv, EntityPlayer p_82846_1_, int p_82846_2_) { ItemStack itemstack = null; diff --git a/src/main/java/com/enderio/core/common/transform/EnderCorePlugin.java b/src/main/java/com/enderio/core/common/transform/EnderCorePlugin.java index 9a1e0bb..c92048d 100644 --- a/src/main/java/com/enderio/core/common/transform/EnderCorePlugin.java +++ b/src/main/java/com/enderio/core/common/transform/EnderCorePlugin.java @@ -54,6 +54,7 @@ public class EnderCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { final List mixins = new ArrayList<>(); mixins.add("MixinItem_EnchantabilityEvent"); mixins.add("MixinItemStack_RarityEvent"); + mixins.add("MixinEntityArrow_UpdateEvent"); return mixins; } } diff --git a/src/main/java/com/enderio/core/common/transform/EnderCoreTransformer.java b/src/main/java/com/enderio/core/common/transform/EnderCoreTransformer.java index c4cf865..2526fda 100644 --- a/src/main/java/com/enderio/core/common/transform/EnderCoreTransformer.java +++ b/src/main/java/com/enderio/core/common/transform/EnderCoreTransformer.java @@ -13,7 +13,6 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.InsnList; import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.IntInsnNode; import org.objectweb.asm.tree.MethodInsnNode; @@ -53,10 +52,6 @@ public class EnderCoreTransformer implements IClassTransformer { abstract void transform(Iterator methods); } - private static final String worldTypeClass = "net.minecraft.world.WorldType"; - private static final ObfSafeName voidFogMethod = new ObfSafeName("hasVoidParticles", "func_76564_j"); - private static final String voidFogMethodSig = "(Lnet/minecraft/world/WorldType;Z)Z"; - private static final String anvilContainerClass = "net.minecraft.inventory.ContainerRepair"; private static final ObfSafeName anvilContainerMethod = new ObfSafeName("updateRepairOutput", "func_82848_d"); @@ -65,21 +60,6 @@ public class EnderCoreTransformer implements IClassTransformer { "drawGuiContainerForegroundLayer", "func_146979_b"); - private static final String enchantHelperClass = "net.minecraft.enchantment.EnchantmentHelper"; - private static final String enchantHelperMethodSig = "(Lnet/minecraft/item/ItemStack;I)I"; - private static final ObfSafeName buildEnchantListMethod = new ObfSafeName("buildEnchantmentList", "func_77513_b"); - private static final ObfSafeName calcEnchantabilityMethod = new ObfSafeName( - "calcItemStackEnchantability", - "func_77514_a"); - - private static final String itemStackClass = "net.minecraft.item.ItemStack"; - private static final ObfSafeName itemStackMethod = new ObfSafeName("getRarity", "func_77953_t"); - private static final String itemStackMethodSig = "(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/EnumRarity;"; - - private static final String entityArrowClass = "net.minecraft.entity.projectile.EntityArrow"; - private static final ObfSafeName entityArrowMethod = new ObfSafeName("onUpdate", "func_70071_h_"); - private static final String entityArrowMethodSig = "(Lnet/minecraft/entity/projectile/EntityArrow;)V"; - private static final String containerFurnaceClass = "net.minecraft.inventory.ContainerFurnace"; private static final ObfSafeName containerFurnaceMethod = new ObfSafeName("transferStackInSlot", "func_82846_b"); private static final String containerFurnaceMethodSig = "(Lnet/minecraft/inventory/ContainerFurnace;Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;"; @@ -115,37 +95,6 @@ public class EnderCoreTransformer implements IClassTransformer { } }); } - // ArrowUpdate Event - else if (transformedName.equals(entityArrowClass)) { - basicClass = transform(basicClass, entityArrowClass, entityArrowMethod, new Transform() { - - @Override - void transform(Iterator methods) { - while (methods.hasNext()) { - MethodNode m = methods.next(); - if (entityArrowMethod.equals(m.name)) { - for (int i = 0; i < m.instructions.size(); i++) { - AbstractInsnNode next = m.instructions.get(i); - if (next instanceof MethodInsnNode) { - InsnList toAdd = new InsnList(); - toAdd.add(new VarInsnNode(ALOAD, 0)); - toAdd.add( - new MethodInsnNode( - INVOKESTATIC, - "com/enderio/core/common/transform/EnderCoreMethods", - "onArrowUpdate", - entityArrowMethodSig, - false)); - m.instructions.insert(next, toAdd); - break; - } - } - break; - } - } - } - }); - } // Furnace Shift Click Fix else if (transformedName.equals(containerFurnaceClass)) { basicClass = transform(basicClass, containerFurnaceClass, containerFurnaceMethod, new Transform() {