From 7d7e3b61a64346e871659dc876e037d4b39902e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8F=E3=81=81=E3=83=BC=E3=82=8A=E3=81=83?= <39122497+Quarri6343@users.noreply.github.com> Date: Mon, 5 Sep 2022 19:47:51 +0900 Subject: [PATCH] Fix other mods cannot mixin GuiContainer.java when NEI is loaded (#291) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: くぁーりぃ <39122497+Quarri6343@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/codechicken/nei/asm/NEITransformer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/codechicken/nei/asm/NEITransformer.java b/src/main/java/codechicken/nei/asm/NEITransformer.java index f7d00548..a891ac2e 100644 --- a/src/main/java/codechicken/nei/asm/NEITransformer.java +++ b/src/main/java/codechicken/nei/asm/NEITransformer.java @@ -238,9 +238,9 @@ public class NEITransformer implements IClassTransformer { @Override public void transform(MethodNode mv) { ASMHelper.logger.debug("NEI: Injecting mouseUp call"); - ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto"); - ASMBlock needleBlock = asmblocks.get("n_mouseUp"); - ASMBlock injectionBlock = asmblocks.get("mouseUp"); + ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto").copy(); + ASMBlock needleBlock = asmblocks.get("n_mouseUp").copy(); + ASMBlock injectionBlock = asmblocks.get("mouseUp").copy(); gotoBlock.mergeLabels(injectionBlock); findOnce(mv.instructions, gotoBlock.list).replace(gotoBlock.list.list);