mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-16 01:54:59 +00:00
Implement new version of InterfaceWireless based on InterfaceTerminal
This commit is contained in:
7 files changed
+1015
-877
No files matched your search
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev')
|
||||
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-263-GTNH-pre:dev')
|
||||
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-266-GTNH-pre:dev')
|
||||
api('curse.maven:cofh-core-69162:2388751')
|
||||
api('com.github.GTNewHorizons:waila:1.6.0:dev')
|
||||
api("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.0:dev")
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -18,6 +18,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.glodblock.github.FluidCraft;
|
||||
import com.glodblock.github.client.gui.container.ContainerLevelMaintainer;
|
||||
@@ -218,6 +219,7 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
|
||||
public boolean drawSlot0(Slot slot) {
|
||||
if (slot instanceof SlotFake) {
|
||||
IAEItemStack stack = ((SlotFluidConvertingFake) slot).getAeStack();
|
||||
GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||
super.func_146977_a(new SlotSingleItem(slot));
|
||||
if (stack == null) return true;
|
||||
IAEItemStack fake = stack.copy();
|
||||
@@ -226,6 +228,8 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
|
||||
} else {
|
||||
fake.setStackSize(0);
|
||||
}
|
||||
this.zLevel = 0f;
|
||||
GL11.glTranslatef(0.0f, 0.0f, 200.0f);
|
||||
stackSizeRenderer.setAeStack(fake);
|
||||
stackSizeRenderer.renderItemOverlayIntoGUI(
|
||||
fontRendererObj,
|
||||
@@ -233,6 +237,7 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
|
||||
fake.getItemStack(),
|
||||
slot.xDisplayPosition,
|
||||
slot.yDisplayPosition);
|
||||
GL11.glTranslatef(0.0f, 0.0f, -200.0f);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -322,7 +327,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
|
||||
originalBlockPos.z,
|
||||
originalBlockPos.getDimension(),
|
||||
originalBlockPos.getSide()));
|
||||
// InventoryHandler.switchGui(originalGui);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+6
-366
@@ -1,59 +1,23 @@
|
||||
package com.glodblock.github.client.gui.container;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.glodblock.github.client.gui.container.base.FCBaseContainer;
|
||||
import com.glodblock.github.inventory.item.IWirelessTerminal;
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import appeng.api.networking.IGrid;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.networking.security.IActionHost;
|
||||
import appeng.api.util.DimensionalCoord;
|
||||
import appeng.core.sync.network.NetworkHandler;
|
||||
import appeng.core.sync.packets.PacketCompressedNBT;
|
||||
import appeng.helpers.IInterfaceTerminalSupport;
|
||||
import appeng.helpers.InterfaceTerminalSupportedClassProvider;
|
||||
import appeng.container.implementations.ContainerInterfaceTerminal;
|
||||
import appeng.helpers.InventoryAction;
|
||||
import appeng.items.misc.ItemEncodedPattern;
|
||||
import appeng.parts.AEBasePart;
|
||||
import appeng.tile.inventory.AppEngInternalInventory;
|
||||
import appeng.util.InventoryAdaptor;
|
||||
import appeng.util.Platform;
|
||||
import appeng.util.inv.AdaptorIInventory;
|
||||
import appeng.util.inv.AdaptorPlayerHand;
|
||||
import appeng.util.inv.ItemSlot;
|
||||
import appeng.util.inv.WrapperInvSlot;
|
||||
|
||||
public class ContainerInterfaceWireless extends FCBaseContainer {
|
||||
|
||||
/**
|
||||
* this stuff is all server side
|
||||
*/
|
||||
private static long autoBase = Long.MIN_VALUE;
|
||||
|
||||
private final Multimap<IInterfaceTerminalSupport, InvTracker> supportedInterfaces = HashMultimap.create();
|
||||
private final Map<Long, InvTracker> byId = new HashMap<>();
|
||||
private IGrid grid;
|
||||
private NBTTagCompound data = new NBTTagCompound();
|
||||
ContainerInterfaceTerminal delegateContainer;
|
||||
|
||||
public ContainerInterfaceWireless(final InventoryPlayer ip, final IWirelessTerminal monitorable) {
|
||||
super(ip, monitorable);
|
||||
if (Platform.isServer()) {
|
||||
this.grid = monitorable.getActionableNode().getGrid();
|
||||
}
|
||||
|
||||
delegateContainer = new ContainerInterfaceTerminal(ip, monitorable);
|
||||
|
||||
this.bindPlayerInventory(ip, 14, 0);
|
||||
}
|
||||
@@ -65,340 +29,16 @@ public class ContainerInterfaceWireless extends FCBaseContainer {
|
||||
}
|
||||
super.detectAndSendChanges();
|
||||
|
||||
if (this.grid == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
int total = 0;
|
||||
boolean missing = false;
|
||||
|
||||
final IActionHost host = this.getActionHost();
|
||||
if (host != null) {
|
||||
final IGridNode agn = host.getActionableNode();
|
||||
if (agn != null && agn.isActive()) {
|
||||
Set<Class<? extends IInterfaceTerminalSupport>> supportedClasses = InterfaceTerminalSupportedClassProvider
|
||||
.getSupportedClasses();
|
||||
if (supportedClasses == null) {
|
||||
return;
|
||||
}
|
||||
for (var clz : supportedClasses) {
|
||||
for (final IGridNode gn : this.grid.getMachines(clz)) {
|
||||
final IInterfaceTerminalSupport interfaceTerminalSupport = (IInterfaceTerminalSupport) gn
|
||||
.getMachine();
|
||||
if (!gn.isActive() || !interfaceTerminalSupport.shouldDisplay()) continue;
|
||||
|
||||
final Collection<InvTracker> t = supportedInterfaces.get(interfaceTerminalSupport);
|
||||
final String name = interfaceTerminalSupport.getName();
|
||||
missing = t.isEmpty() || t.stream().anyMatch(it -> !it.unlocalizedName.equals(name));
|
||||
total += interfaceTerminalSupport.getPatternsConfigurations().length;
|
||||
if (missing) break;
|
||||
}
|
||||
// we can stop if any is missing. The value of `total` is not important if `missing == true`
|
||||
if (missing) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (total != this.supportedInterfaces.size() || missing) {
|
||||
this.regenList(this.data);
|
||||
} else {
|
||||
for (final ContainerInterfaceWireless.InvTracker inv : supportedInterfaces.values()) {
|
||||
for (int x = 0; x < inv.client.getSizeInventory(); x++) {
|
||||
if (this.isDifferent(inv.server.getStackInSlot(inv.offset + x), inv.client.getStackInSlot(x))) {
|
||||
this.addItems(this.data, inv, x, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!this.data.hasNoTags()) {
|
||||
try {
|
||||
NetworkHandler.instance
|
||||
.sendTo(new PacketCompressedNBT(this.data), (EntityPlayerMP) this.getPlayerInv().player);
|
||||
} catch (final IOException ignored) {}
|
||||
|
||||
this.data = new NBTTagCompound();
|
||||
}
|
||||
delegateContainer.detectAndSendChanges();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doAction(final EntityPlayerMP player, final InventoryAction action, final int slot, final long id) {
|
||||
final ContainerInterfaceWireless.InvTracker inv = this.byId.get(id);
|
||||
if (inv != null) {
|
||||
final ItemStack is = inv.server.getStackInSlot(slot + inv.offset);
|
||||
final boolean hasItemInHand = player.inventory.getItemStack() != null;
|
||||
|
||||
final InventoryAdaptor playerHand = new AdaptorPlayerHand(player);
|
||||
|
||||
final WrapperInvSlot slotInv = new ContainerInterfaceWireless.PatternInvSlot(inv.server);
|
||||
|
||||
final IInventory theSlot = slotInv.getWrapper(slot + inv.offset);
|
||||
final InventoryAdaptor interfaceSlot = new AdaptorIInventory(theSlot);
|
||||
|
||||
IInventory interfaceHandler = inv.server;
|
||||
boolean canInsert = true;
|
||||
|
||||
switch (action) {
|
||||
case PICKUP_OR_SET_DOWN -> {
|
||||
if (hasItemInHand) {
|
||||
for (int s = 0; s < interfaceHandler.getSizeInventory(); s++) {
|
||||
if (Platform.isSameItemPrecise(
|
||||
interfaceHandler.getStackInSlot(s),
|
||||
player.inventory.getItemStack())) {
|
||||
canInsert = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (canInsert) {
|
||||
ItemStack inSlot = theSlot.getStackInSlot(0);
|
||||
if (inSlot == null) {
|
||||
player.inventory.setItemStack(interfaceSlot.addItems(player.inventory.getItemStack()));
|
||||
} else {
|
||||
inSlot = inSlot.copy();
|
||||
final ItemStack inHand = player.inventory.getItemStack().copy();
|
||||
|
||||
theSlot.setInventorySlotContents(0, null);
|
||||
player.inventory.setItemStack(null);
|
||||
|
||||
player.inventory.setItemStack(interfaceSlot.addItems(inHand.copy()));
|
||||
|
||||
if (player.inventory.getItemStack() == null) {
|
||||
player.inventory.setItemStack(inSlot);
|
||||
} else {
|
||||
player.inventory.setItemStack(inHand);
|
||||
theSlot.setInventorySlotContents(0, inSlot);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
final IInventory mySlot = slotInv.getWrapper(slot + inv.offset);
|
||||
mySlot.setInventorySlotContents(0, playerHand.addItems(mySlot.getStackInSlot(0)));
|
||||
}
|
||||
}
|
||||
case SPLIT_OR_PLACE_SINGLE -> {
|
||||
if (hasItemInHand) {
|
||||
for (int s = 0; s < interfaceHandler.getSizeInventory(); s++) {
|
||||
if (Platform.isSameItemPrecise(
|
||||
interfaceHandler.getStackInSlot(s),
|
||||
player.inventory.getItemStack())) {
|
||||
canInsert = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (canInsert) {
|
||||
ItemStack extra = playerHand.removeItems(1, null, null);
|
||||
if (extra != null && !interfaceSlot.containsItems()) {
|
||||
extra = interfaceSlot.addItems(extra);
|
||||
}
|
||||
if (extra != null) {
|
||||
playerHand.addItems(extra);
|
||||
}
|
||||
}
|
||||
} else if (is != null) {
|
||||
ItemStack extra = interfaceSlot.removeItems((is.stackSize + 1) / 2, null, null);
|
||||
if (extra != null) {
|
||||
extra = playerHand.addItems(extra);
|
||||
}
|
||||
if (extra != null) {
|
||||
interfaceSlot.addItems(extra);
|
||||
}
|
||||
}
|
||||
}
|
||||
case SHIFT_CLICK -> {
|
||||
final IInventory mySlot = slotInv.getWrapper(slot + inv.offset);
|
||||
final InventoryAdaptor playerInv = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN);
|
||||
mySlot.setInventorySlotContents(0, mergeToPlayerInventory(playerInv, mySlot.getStackInSlot(0)));
|
||||
}
|
||||
case MOVE_REGION -> {
|
||||
final InventoryAdaptor playerInvAd = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN);
|
||||
for (int x = 0; x < inv.client.getSizeInventory(); x++) {
|
||||
inv.server.setInventorySlotContents(
|
||||
x + inv.offset,
|
||||
mergeToPlayerInventory(playerInvAd, inv.server.getStackInSlot(x + inv.offset)));
|
||||
}
|
||||
}
|
||||
case CREATIVE_DUPLICATE -> {
|
||||
if (player.capabilities.isCreativeMode && !hasItemInHand) {
|
||||
player.inventory.setItemStack(is == null ? null : is.copy());
|
||||
}
|
||||
}
|
||||
default -> {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.updateHeld(player);
|
||||
}
|
||||
}
|
||||
|
||||
private ItemStack mergeToPlayerInventory(InventoryAdaptor playerInv, ItemStack stack) {
|
||||
if (stack == null) return null;
|
||||
for (ItemSlot slot : playerInv) {
|
||||
if (Platform.isSameItemPrecise(slot.getItemStack(), stack)) {
|
||||
if (slot.getItemStack().stackSize < slot.getItemStack().getMaxStackSize()) {
|
||||
++slot.getItemStack().stackSize;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
return playerInv.addItems(stack);
|
||||
}
|
||||
|
||||
private void regenList(final NBTTagCompound data) {
|
||||
this.byId.clear();
|
||||
this.supportedInterfaces.clear();
|
||||
|
||||
final IActionHost host = this.getActionHost();
|
||||
if (host != null) {
|
||||
final IGridNode agn = host.getActionableNode();
|
||||
if (agn != null && agn.isActive()) {
|
||||
Set<Class<? extends IInterfaceTerminalSupport>> supportedClasses = InterfaceTerminalSupportedClassProvider
|
||||
.getSupportedClasses();
|
||||
if (supportedClasses == null) {
|
||||
return;
|
||||
}
|
||||
for (var clz : supportedClasses) {
|
||||
for (final IGridNode gn : this.grid.getMachines(clz)) {
|
||||
final IInterfaceTerminalSupport terminalSupport = (IInterfaceTerminalSupport) gn.getMachine();
|
||||
if (!gn.isActive() || !terminalSupport.shouldDisplay()) continue;
|
||||
|
||||
final var configurations = terminalSupport.getPatternsConfigurations();
|
||||
|
||||
for (int i = 0; i < configurations.length; ++i) {
|
||||
this.supportedInterfaces.put(
|
||||
terminalSupport,
|
||||
new ContainerInterfaceWireless.InvTracker(terminalSupport, configurations[i], i));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
data.setBoolean("clear", true);
|
||||
|
||||
for (final ContainerInterfaceWireless.InvTracker inv : this.supportedInterfaces.values()) {
|
||||
this.byId.put(inv.which, inv);
|
||||
this.addItems(data, inv, 0, inv.client.getSizeInventory());
|
||||
}
|
||||
delegateContainer.doAction(player, action, slot, id);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isWirelessTerminal() {
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean isDifferent(final ItemStack a, final ItemStack b) {
|
||||
if (a == null && b == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (a == null || b == null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !ItemStack.areItemStacksEqual(a, b);
|
||||
}
|
||||
|
||||
private void addItems(final NBTTagCompound data, final ContainerInterfaceWireless.InvTracker inv, final int offset,
|
||||
final int length) {
|
||||
final String name = '=' + Long.toString(inv.which, Character.MAX_RADIX);
|
||||
final NBTTagCompound tag = data.getCompoundTag(name);
|
||||
|
||||
if (tag.hasNoTags()) {
|
||||
tag.setLong("sortBy", inv.sortBy);
|
||||
tag.setString("un", inv.unlocalizedName);
|
||||
tag.setInteger("x", inv.X);
|
||||
tag.setInteger("y", inv.Y);
|
||||
tag.setInteger("z", inv.Z);
|
||||
tag.setInteger("dim", inv.dim);
|
||||
tag.setInteger("side", inv.side.ordinal());
|
||||
tag.setInteger("size", inv.client.getSizeInventory());
|
||||
}
|
||||
|
||||
for (int x = 0; x < length; x++) {
|
||||
final NBTTagCompound itemNBT = new NBTTagCompound();
|
||||
|
||||
final ItemStack is = inv.server.getStackInSlot(x + offset + inv.offset);
|
||||
|
||||
// "update" client side.
|
||||
inv.client.setInventorySlotContents(offset + x, is == null ? null : is.copy());
|
||||
|
||||
if (is != null) {
|
||||
is.writeToNBT(itemNBT);
|
||||
}
|
||||
|
||||
tag.setTag(Integer.toString(x + offset), itemNBT);
|
||||
}
|
||||
|
||||
data.setTag(name, tag);
|
||||
}
|
||||
|
||||
private static class InvTracker {
|
||||
|
||||
private final long sortBy;
|
||||
private final long which = autoBase++;
|
||||
private final String unlocalizedName;
|
||||
private final IInventory client;
|
||||
private final IInventory server;
|
||||
private final int offset;
|
||||
private final int X;
|
||||
private final int Y;
|
||||
private final int Z;
|
||||
private final int dim;
|
||||
private final ForgeDirection side;
|
||||
|
||||
public InvTracker(final DimensionalCoord coord, long sortValue, final IInventory patterns,
|
||||
final String unlocalizedName, int offset, int size, ForgeDirection side) {
|
||||
this(
|
||||
coord.x,
|
||||
coord.y,
|
||||
coord.z,
|
||||
coord.getDimension(),
|
||||
sortValue,
|
||||
patterns,
|
||||
unlocalizedName,
|
||||
offset,
|
||||
size,
|
||||
side);
|
||||
}
|
||||
|
||||
public InvTracker(int x, int y, int z, int dim, long sortValue, final IInventory patterns,
|
||||
final String unlocalizedName, int offset, int size, ForgeDirection side) {
|
||||
this.server = patterns;
|
||||
this.client = new AppEngInternalInventory(null, size);
|
||||
this.unlocalizedName = unlocalizedName;
|
||||
this.sortBy = sortValue + offset << 16;
|
||||
this.offset = offset;
|
||||
this.X = x;
|
||||
this.Y = y;
|
||||
this.Z = z;
|
||||
this.dim = dim;
|
||||
this.side = side;
|
||||
}
|
||||
|
||||
public InvTracker(IInterfaceTerminalSupport terminalSupport,
|
||||
IInterfaceTerminalSupport.PatternsConfiguration configuration, int index) {
|
||||
this(
|
||||
terminalSupport.getLocation(),
|
||||
terminalSupport.getSortValue(),
|
||||
terminalSupport.getPatterns(index),
|
||||
terminalSupport.getName(),
|
||||
configuration.offset,
|
||||
configuration.size,
|
||||
terminalSupport instanceof AEBasePart ? ((AEBasePart) terminalSupport).getSide()
|
||||
: ForgeDirection.UNKNOWN);
|
||||
}
|
||||
}
|
||||
|
||||
private static class PatternInvSlot extends WrapperInvSlot {
|
||||
|
||||
public PatternInvSlot(final IInventory inv) {
|
||||
super(inv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(final ItemStack itemstack) {
|
||||
return itemstack != null && itemstack.getItem() instanceof ItemEncodedPattern;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@ import com.glodblock.github.coremod.transform.DualityInterfaceTransformer;
|
||||
import com.glodblock.github.coremod.transform.ExternalStorageRegistryTransformer;
|
||||
import com.glodblock.github.coremod.transform.GuiCraftingTransformer;
|
||||
import com.glodblock.github.coremod.transform.NEITransformer;
|
||||
import com.glodblock.github.coremod.transform.PacketCompressedNBTTransformer;
|
||||
|
||||
public class FCClassTransformer implements IClassTransformer {
|
||||
|
||||
@@ -26,7 +25,6 @@ public class FCClassTransformer implements IClassTransformer {
|
||||
case "appeng.client.gui.implementations.GuiCraftingCPU", "appeng.client.gui.implementations.GuiCraftConfirm", "net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm", "appeng.client.gui.widgets.GuiCraftingTree" -> tform = GuiCraftingTransformer.INSTANCE;
|
||||
case "appeng.integration.modules.NEI" -> tform = NEITransformer.INSTANCE;
|
||||
case "appeng.core.features.registries.ExternalStorageRegistry" -> tform = ExternalStorageRegistryTransformer.INSTANCE;
|
||||
case "appeng.core.sync.packets.PacketCompressedNBT" -> tform = PacketCompressedNBTTransformer.INSTANCE;
|
||||
default -> {
|
||||
return code;
|
||||
}
|
||||
|
||||
@@ -1,19 +1,9 @@
|
||||
package com.glodblock.github.coremod.hooker;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import com.glodblock.github.client.gui.GuiInterfaceWireless;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class CoreModHooksClient {
|
||||
|
||||
public static void clientPacketData(NBTTagCompound data) {
|
||||
GuiScreen gs = Minecraft.getMinecraft().currentScreen;
|
||||
if (gs instanceof GuiInterfaceWireless terminal) terminal.postUpdate(data);
|
||||
}
|
||||
}
|
||||
-61
@@ -1,61 +0,0 @@
|
||||
package com.glodblock.github.coremod.transform;
|
||||
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
import com.glodblock.github.coremod.FCClassTransformer;
|
||||
|
||||
public class PacketCompressedNBTTransformer extends FCClassTransformer.ClassMapper {
|
||||
|
||||
public static final PacketCompressedNBTTransformer INSTANCE = new PacketCompressedNBTTransformer();
|
||||
|
||||
private PacketCompressedNBTTransformer() {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ClassVisitor getClassMapper(ClassVisitor downstream) {
|
||||
return new TransformPacketCompressedNBT(Opcodes.ASM5, downstream);
|
||||
}
|
||||
|
||||
private static class TransformPacketCompressedNBT extends ClassVisitor {
|
||||
|
||||
TransformPacketCompressedNBT(int api, ClassVisitor cv) {
|
||||
super(api, cv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
|
||||
if (name.equals("clientPacketData")) {
|
||||
return new TransformClientPacketData(api, super.visitMethod(access, name, desc, signature, exceptions));
|
||||
}
|
||||
return super.visitMethod(access, name, desc, signature, exceptions);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private static class TransformClientPacketData extends MethodVisitor {
|
||||
|
||||
TransformClientPacketData(int api, MethodVisitor mv) {
|
||||
super(api, mv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitInsn(int opcode) {
|
||||
super.visitVarInsn(Opcodes.ALOAD, 0);
|
||||
super.visitFieldInsn(
|
||||
Opcodes.GETFIELD,
|
||||
"appeng/core/sync/packets/PacketCompressedNBT",
|
||||
"in",
|
||||
"Lnet/minecraft/nbt/NBTTagCompound;");
|
||||
super.visitMethodInsn(
|
||||
Opcodes.INVOKESTATIC,
|
||||
"com/glodblock/github/coremod/hooker/CoreModHooksClient",
|
||||
"clientPacketData",
|
||||
"(Lnet/minecraft/nbt/NBTTagCompound;)V",
|
||||
false);
|
||||
super.visitInsn(opcode);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user