mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-20 12:20:00 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
f1dea5460a
commit
f106b5e766
172 files changed
+2552
-2088
No files matched your search
@@ -8,6 +8,20 @@ import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES;
|
||||
import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.objectweb.asm.tree.VarInsnNode;
|
||||
|
||||
import codechicken.lib.asm.ASMBlock;
|
||||
import codechicken.lib.asm.ASMHelper;
|
||||
import codechicken.lib.asm.ASMInit;
|
||||
@@ -22,19 +36,9 @@ import codechicken.lib.asm.ModularASMTransformer.MethodTransformer;
|
||||
import codechicken.lib.asm.ModularASMTransformer.MethodWriter;
|
||||
import codechicken.lib.asm.ObfMapping;
|
||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
||||
import java.util.Map;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.objectweb.asm.tree.VarInsnNode;
|
||||
|
||||
public class NEITransformer implements IClassTransformer {
|
||||
|
||||
static {
|
||||
ASMInit.init();
|
||||
}
|
||||
@@ -47,98 +51,114 @@ public class NEITransformer implements IClassTransformer {
|
||||
if (FMLLaunchHandler.side().isClient()) {
|
||||
// Generates method to set the placed position of a mob spawner for the item callback. More portable than
|
||||
// copying vanilla placement code
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(
|
||||
"net/minecraft/block/BlockMobSpawner",
|
||||
"func_149689_a",
|
||||
"(Lnet/minecraft/world/World;IIILnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;)V"),
|
||||
asmblocks.get("spawnerPlaced")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(
|
||||
"net/minecraft/block/BlockMobSpawner",
|
||||
"func_149689_a",
|
||||
"(Lnet/minecraft/world/World;IIILnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;)V"),
|
||||
asmblocks.get("spawnerPlaced")));
|
||||
|
||||
// Make MobSpawnerBaseLogic use getSpawnerWorld when creating new entities
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(
|
||||
"net/minecraft/tileentity/MobSpawnerBaseLogic",
|
||||
"func_98281_h",
|
||||
"()Lnet/minecraft/entity/Entity;"),
|
||||
asmblocks.get("d_spawnerWorld"),
|
||||
asmblocks.get("spawnerWorld")));
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(
|
||||
"net/minecraft/tileentity/MobSpawnerBaseLogic",
|
||||
"func_98281_h",
|
||||
"()Lnet/minecraft/entity/Entity;"),
|
||||
asmblocks.get("d_spawnerWorld"),
|
||||
asmblocks.get("spawnerWorld")));
|
||||
}
|
||||
|
||||
// Removes trailing seperators from NBTTagList/Compound.toString because OCD
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping("net/minecraft/nbt/NBTTagCompound", "toString", "()Ljava/lang/String;"),
|
||||
asmblocks.get("n_commaFix"),
|
||||
asmblocks.get("commaFix"),
|
||||
true));
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping("net/minecraft/nbt/NBTTagList", "toString", "()Ljava/lang/String;"),
|
||||
asmblocks.get("n_commaFix"),
|
||||
asmblocks.get("commaFix"),
|
||||
true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping("net/minecraft/nbt/NBTTagCompound", "toString", "()Ljava/lang/String;"),
|
||||
asmblocks.get("n_commaFix"),
|
||||
asmblocks.get("commaFix"),
|
||||
true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping("net/minecraft/nbt/NBTTagList", "toString", "()Ljava/lang/String;"),
|
||||
asmblocks.get("n_commaFix"),
|
||||
asmblocks.get("commaFix"),
|
||||
true));
|
||||
|
||||
// fix workbench container losing items on shift click output without room for the full stack
|
||||
transformer.add(
|
||||
new MethodTransformer(new ObfMapping(
|
||||
"net/minecraft/inventory/ContainerWorkbench",
|
||||
"func_82846_b",
|
||||
"(Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;")) {
|
||||
new MethodTransformer(
|
||||
new ObfMapping(
|
||||
"net/minecraft/inventory/ContainerWorkbench",
|
||||
"func_82846_b",
|
||||
"(Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;")) {
|
||||
|
||||
@Override
|
||||
public void transform(MethodNode mv) {
|
||||
ASMHelper.logger.debug("NEI: Applying workbench fix");
|
||||
InsnListSection key = findN(mv.instructions, asmblocks.get("n_workbenchFix").list)
|
||||
.get(0);
|
||||
InsnListSection key = findN(mv.instructions, asmblocks.get("n_workbenchFix").list).get(0);
|
||||
key.insertBefore(asmblocks.get("workbenchFix").rawListCopy());
|
||||
}
|
||||
});
|
||||
|
||||
// put glint alpha into the buffer correctly for exporting
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping("net/minecraft/client/renderer/entity/RenderItem", "func_77018_a", "(IIIII)V"),
|
||||
asmblocks.get("d_glintAlphaFix"),
|
||||
asmblocks.get("glintAlphaFix")));
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping("net/minecraft/client/renderer/entity/RenderItem", "func_77018_a", "(IIIII)V"),
|
||||
asmblocks.get("d_glintAlphaFix"),
|
||||
asmblocks.get("glintAlphaFix")));
|
||||
|
||||
String GuiContainer = "net/minecraft/client/gui/inventory/GuiContainer";
|
||||
// add manager field
|
||||
transformer.add(new FieldWriter(
|
||||
ACC_PUBLIC, new ObfMapping(GuiContainer, "manager", "Lcodechicken/nei/guihook/GuiContainerManager;")));
|
||||
transformer.add(
|
||||
new FieldWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "manager", "Lcodechicken/nei/guihook/GuiContainerManager;")));
|
||||
|
||||
// Fill out getManager in GuiContainerManager
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC | ACC_STATIC,
|
||||
new ObfMapping(
|
||||
"codechicken/nei/guihook/GuiContainerManager",
|
||||
"getManager",
|
||||
"(Lnet/minecraft/client/gui/inventory/GuiContainer;)Lcodechicken/nei/guihook/GuiContainerManager;"),
|
||||
asmblocks.get("m_getManager")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC | ACC_STATIC,
|
||||
new ObfMapping(
|
||||
"codechicken/nei/guihook/GuiContainerManager",
|
||||
"getManager",
|
||||
"(Lnet/minecraft/client/gui/inventory/GuiContainer;)Lcodechicken/nei/guihook/GuiContainerManager;"),
|
||||
asmblocks.get("m_getManager")));
|
||||
|
||||
// Generate load method
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146280_a", "(Lnet/minecraft/client/Minecraft;II)V"),
|
||||
asmblocks.get("m_setWorldAndResolution")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146280_a", "(Lnet/minecraft/client/Minecraft;II)V"),
|
||||
asmblocks.get("m_setWorldAndResolution")));
|
||||
|
||||
// Generate handleKeyboardInput method
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146282_l", "()V"),
|
||||
asmblocks.get("m_handleKeyboardInput")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146282_l", "()V"),
|
||||
asmblocks.get("m_handleKeyboardInput")));
|
||||
|
||||
// Generate handleKeyboardInput method
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146282_l", "()V"),
|
||||
asmblocks.get("m_handleKeyboardInput")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146282_l", "()V"),
|
||||
asmblocks.get("m_handleKeyboardInput")));
|
||||
|
||||
// Generate handleKeyboardInput method
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146282_l", "()V"),
|
||||
asmblocks.get("m_handleKeyboardInput")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146282_l", "()V"),
|
||||
asmblocks.get("m_handleKeyboardInput")));
|
||||
|
||||
// Generate handleMouseInput method
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146274_d", "()V"), asmblocks.get("m_handleMouseInput")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "func_146274_d", "()V"),
|
||||
asmblocks.get("m_handleMouseInput")));
|
||||
|
||||
addProtectedForwarder(
|
||||
new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
|
||||
@@ -155,86 +175,111 @@ public class NEITransformer implements IClassTransformer {
|
||||
"(Lnet/minecraft/client/gui/inventory/GuiContainer;Lnet/minecraft/inventory/Slot;III)V"));
|
||||
|
||||
// Inject preDraw at the start of drawScreen
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"), asmblocks.get("preDraw"), true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("preDraw"),
|
||||
true));
|
||||
|
||||
// Inject objectUnderMouse check before drawing slot highlights
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("n_objectUnderMouse"),
|
||||
asmblocks.get("objectUnderMouse"),
|
||||
false));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("n_objectUnderMouse"),
|
||||
asmblocks.get("objectUnderMouse"),
|
||||
false));
|
||||
|
||||
// Inject renderObjects after drawGuiContainerForegroundLayer
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("n_renderObjects"),
|
||||
asmblocks.get("renderObjects"),
|
||||
false));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("n_renderObjects"),
|
||||
asmblocks.get("renderObjects"),
|
||||
false));
|
||||
|
||||
// Replace default renderToolTip with delegate
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("d_renderToolTip"),
|
||||
asmblocks.get("renderTooltips")));
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
|
||||
asmblocks.get("d_renderToolTip"),
|
||||
asmblocks.get("renderTooltips")));
|
||||
|
||||
// Replace zLevel = 200 with zLevel = 500 in drawItemStack
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146982_a", "(Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"),
|
||||
asmblocks.get("d_zLevel"),
|
||||
asmblocks.get("zLevel")));
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(
|
||||
GuiContainer,
|
||||
"func_146982_a",
|
||||
"(Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"),
|
||||
asmblocks.get("d_zLevel"),
|
||||
asmblocks.get("zLevel")));
|
||||
|
||||
// Replace default renderItem with delegate and slot overlay/underlay
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146977_a", "(Lnet/minecraft/inventory/Slot;)V"),
|
||||
asmblocks.get("d_drawSlot"),
|
||||
asmblocks.get("drawSlot")));
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146977_a", "(Lnet/minecraft/inventory/Slot;)V"),
|
||||
asmblocks.get("d_drawSlot"),
|
||||
asmblocks.get("drawSlot")));
|
||||
|
||||
// Inject mouseClicked hook at the start of mouseClicked
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73864_a", "(III)V"), asmblocks.get("mouseClicked"), true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73864_a", "(III)V"),
|
||||
asmblocks.get("mouseClicked"),
|
||||
true));
|
||||
|
||||
// Replace general handleMouseClicked call with delegate
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_73864_a", "(III)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // mouseClicked
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // mouseClickMove
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146286_b", "(III)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // mouseMovedOrUp
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // keyTyped
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146983_a", "(I)Z"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // checkHotbarKeys
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_73864_a", "(III)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // mouseClicked
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // mouseClickMove
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146286_b", "(III)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // mouseMovedOrUp
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // keyTyped
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146983_a", "(I)Z"),
|
||||
asmblocks.get("d_handleMouseClick"),
|
||||
asmblocks.get("handleMouseClick"))); // checkHotbarKeys
|
||||
|
||||
// Write delegate for handleMouseClicked
|
||||
transformer.add(new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "managerHandleMouseClick", "(Lnet/minecraft/inventory/Slot;III)V"),
|
||||
asmblocks.get("m_managerHandleMouseClick")));
|
||||
transformer.add(
|
||||
new MethodWriter(
|
||||
ACC_PUBLIC,
|
||||
new ObfMapping(GuiContainer, "managerHandleMouseClick", "(Lnet/minecraft/inventory/Slot;III)V"),
|
||||
asmblocks.get("m_managerHandleMouseClick")));
|
||||
|
||||
// Inject mouseDragged hook after super call in mouseDragged
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
|
||||
asmblocks.get("n_mouseDragged"),
|
||||
asmblocks.get("mouseDragged"),
|
||||
false));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
|
||||
asmblocks.get("n_mouseDragged"),
|
||||
asmblocks.get("mouseDragged"),
|
||||
false));
|
||||
|
||||
// Inject overrideMouseUp at the start of mouseMovedOrUp
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_146286_b", "(III)V"), asmblocks.get("overrideMouseUp"), true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_146286_b", "(III)V"),
|
||||
asmblocks.get("overrideMouseUp"),
|
||||
true));
|
||||
|
||||
// Inject mouseUp at the end of main elseif chain in mouseMovedOrUp
|
||||
transformer.add(new MethodTransformer(new ObfMapping(GuiContainer, "func_146286_b", "(III)V")) {
|
||||
|
||||
@Override
|
||||
public void transform(MethodNode mv) {
|
||||
ASMHelper.logger.debug("NEI: Injecting mouseUp call");
|
||||
@@ -252,50 +297,59 @@ public class NEITransformer implements IClassTransformer {
|
||||
});
|
||||
|
||||
// Replace general handleSlotClick call with delegate
|
||||
transformer.add(new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146984_a", "(Lnet/minecraft/inventory/Slot;III)V"),
|
||||
asmblocks.get("d_handleSlotClick"),
|
||||
asmblocks.get("handleSlotClick")));
|
||||
transformer.add(
|
||||
new MethodReplacer(
|
||||
new ObfMapping(GuiContainer, "func_146984_a", "(Lnet/minecraft/inventory/Slot;III)V"),
|
||||
asmblocks.get("d_handleSlotClick"),
|
||||
asmblocks.get("handleSlotClick")));
|
||||
|
||||
// Inject lastKeyTyped at the start of keyTyped
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"), asmblocks.get("lastKeyTyped"), true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
|
||||
asmblocks.get("lastKeyTyped"),
|
||||
true));
|
||||
|
||||
// Inject updateScreen hook after super call
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73876_c", "()V"),
|
||||
asmblocks.get("n_updateScreen"),
|
||||
asmblocks.get("updateScreen"),
|
||||
false));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(GuiContainer, "func_73876_c", "()V"),
|
||||
asmblocks.get("n_updateScreen"),
|
||||
asmblocks.get("updateScreen"),
|
||||
false));
|
||||
|
||||
// Cancel tab click calls when tabs are obscured
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(
|
||||
"net/minecraft/client/gui/inventory/GuiContainerCreative",
|
||||
"func_147049_a",
|
||||
"(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
|
||||
asmblocks.get("handleTabClick"),
|
||||
true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(
|
||||
"net/minecraft/client/gui/inventory/GuiContainerCreative",
|
||||
"func_147049_a",
|
||||
"(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
|
||||
asmblocks.get("handleTabClick"),
|
||||
true));
|
||||
|
||||
// Cancel tab tooltip rendering when tabs are obscured
|
||||
transformer.add(new MethodInjector(
|
||||
new ObfMapping(
|
||||
"net/minecraft/client/gui/inventory/GuiContainerCreative",
|
||||
"func_147052_b",
|
||||
"(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
|
||||
asmblocks.get("renderTabTooltip"),
|
||||
true));
|
||||
transformer.add(
|
||||
new MethodInjector(
|
||||
new ObfMapping(
|
||||
"net/minecraft/client/gui/inventory/GuiContainerCreative",
|
||||
"func_147052_b",
|
||||
"(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
|
||||
asmblocks.get("renderTabTooltip"),
|
||||
true));
|
||||
|
||||
String[] buttons = new String[] {"CancelButton", "ConfirmButton", "PowerButton"};
|
||||
String[] this_fields = new String[] {"field_146146_o", "field_146147_o", "field_146150_o"};
|
||||
String[] buttons = new String[] { "CancelButton", "ConfirmButton", "PowerButton" };
|
||||
String[] this_fields = new String[] { "field_146146_o", "field_146147_o", "field_146150_o" };
|
||||
for (int i = 0; i < 3; i++) {
|
||||
ObfMapping m = new ObfMapping(
|
||||
"net/minecraft/client/gui/inventory/GuiBeacon$" + buttons[i], "func_146111_b", "(II)V");
|
||||
"net/minecraft/client/gui/inventory/GuiBeacon$" + buttons[i],
|
||||
"func_146111_b",
|
||||
"(II)V");
|
||||
InsnListSection l = asmblocks.get("beaconButtonObscured").list.copy();
|
||||
FieldInsnNode this_ref = ((FieldInsnNode) l.get(1));
|
||||
this_ref.owner = m.toClassloading().s_owner;
|
||||
if (ObfMapping.obfuscated) // missing srg mappings for inner outer reference fields
|
||||
this_ref.name = ObfMapping.obfMapper.mapFieldName(null, this_fields[i], null);
|
||||
this_ref.name = ObfMapping.obfMapper.mapFieldName(null, this_fields[i], null);
|
||||
transformer.add(new MethodInjector(m, l.list, true));
|
||||
}
|
||||
}
|
||||
@@ -321,8 +375,9 @@ public class NEITransformer implements IClassTransformer {
|
||||
transformer.add(new MethodWriter(ACC_PUBLIC, publicCall, forward2));
|
||||
}
|
||||
|
||||
private final ObfMapping c_GuiContainer =
|
||||
new ObfMapping("net/minecraft/client/gui/inventory/GuiContainer").toClassloading();
|
||||
private final ObfMapping c_GuiContainer = new ObfMapping("net/minecraft/client/gui/inventory/GuiContainer")
|
||||
.toClassloading();
|
||||
|
||||
/**
|
||||
* Adds super.updateScreen() to non implementing GuiContainer subclasses
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user