diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java index 244a268..f640b1f 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; import thaumcraft.api.aspects.Aspect; import java.util.List; @@ -20,6 +21,14 @@ import java.util.List; * Created by HellFirePvP @ 15.12.2015 14:57 */ public class EventHandlerRedirect { + public static void preNodeRender(TileEntity tile) { + //postNodeRender(tile); + System.out.print(""); + } + + public static void postNodeRender(TileEntity tile) { + System.out.print(""); + } public static int getAdditionalVisDiscount(EntityPlayer player, Aspect aspect, int currentTotalDiscount) { if(player.isPotionActive(RegisteredPotions.VIS_DISCOUNT)) { diff --git a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java index b208cc1..5d2b357 100644 --- a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java +++ b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java @@ -2,18 +2,10 @@ package makeo.gadomancy.coremod; import cpw.mods.fml.common.asm.transformers.AccessTransformer; -import net.minecraft.entity.player.EntityPlayer; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.InsnNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.VarInsnNode; -import thaumcraft.api.aspects.Aspect; +import org.objectweb.asm.tree.*; import java.io.IOException; @@ -29,13 +21,14 @@ public class GadomancyTransformer extends AccessTransformer { public static final String NAME_ENCHANTMENT_HELPER = "net.minecraft.enchantment.EnchantmentHelper"; public static final String NAME_WANDMANAGER = "thaumcraft.common.items.wands.WandManager"; + public static final String NAME_NODE_RENDERER = "thaumcraft.client.renderers.tile.TileNodeRenderer"; public GadomancyTransformer() throws IOException {} @Override public byte[] transform(String name, String transformedName, byte[] bytes) { boolean needsTransform = name.equalsIgnoreCase(NAME_ENCHANTMENT_HELPER) || - name.equalsIgnoreCase(NAME_WANDMANAGER); + name.equalsIgnoreCase(NAME_WANDMANAGER) || name.equalsIgnoreCase(NAME_NODE_RENDERER); if(!needsTransform) return super.transform(name, transformedName, bytes); ClassNode node = new ClassNode(); @@ -76,6 +69,29 @@ public class GadomancyTransformer extends AccessTransformer { mn.instructions.insertBefore(mn.instructions.get(mn.instructions.size() - 5), updateTotal); } } + } else if(name.equalsIgnoreCase(NAME_NODE_RENDERER)) { + for(MethodNode mn : node.methods) { + if(mn.name.equals("renderTileEntityAt")) { + InsnList setBefore = new InsnList(); + setBefore.add(new VarInsnNode(Opcodes.ALOAD, 1)); + setBefore.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "makeo/gadomancy/common/events/EventHandlerRedirect", + "preNodeRender", "(Lnet/minecraft/tileentity/TileEntity;)V", false)); + + mn.instructions.insertBefore(mn.instructions.get(0), setBefore); + + InsnList setAfter = new InsnList(); + setBefore.add(new VarInsnNode(Opcodes.ALOAD, 1)); + setBefore.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "makeo/gadomancy/common/events/EventHandlerRedirect", + "postNodeRender", "(Lnet/minecraft/tileentity/TileEntity;)V", false)); + + for(int i = 0; i < mn.instructions.size(); i++) { + AbstractInsnNode insnNode = mn.instructions.get(i); + if(insnNode.getOpcode() == Opcodes.RETURN) { + mn.instructions.insertBefore(insnNode, setAfter); + } + } + } + } } ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);