fix crafting status display drops

Author: GlodBlock

build.gradle

@@ -51,7 +51,7 @@ dependencies {
     deobfCompile 'curse.maven:modular-machinery-270790:2761302' // 1.11.1
     deobfCompile 'curse.maven:codechicken-lib-1-8-242818:2779848' //ccl
     deobfCompile 'curse.maven:gregtech-ce-unofficial-557242:3784798' // gt
-    deobfCompile 'curse.maven:ae2-extended-life-570458:4406629' //pae2
+    deobfCompile 'curse.maven:ae2-extended-life-570458:4429430' //pae2
     compileOnly 'curse.maven:dynamistics-383632:3056455' // dy
 }
 

src/main/java/com/glodblock/github/coremod/CoreModHooks.java

@@ -161,16 +161,22 @@ public static ItemStack displayFluid(ItemStack drop) {
         if (!drop.isEmpty() && drop.getItem() instanceof ItemFluidDrop) {
             FluidStack fluid = ItemFluidDrop.getFluidStack(drop);
             return ItemFluidPacket.newDisplayStack(fluid);
-        }
-        else return drop;
+        } else return drop;
     }
 
     public static IAEItemStack displayAEFluid(IAEItemStack drop) {
         if (!drop.getDefinition().isEmpty() && drop.getItem() instanceof ItemFluidDrop) {
             FluidStack fluid = ItemFluidDrop.getFluidStack(drop.getDefinition());
             return AEItemStack.fromItemStack(ItemFluidPacket.newDisplayStack(fluid));
-        }
-        else return drop;
+        } else return drop;
+    }
+
+    public static IAEItemStack displayAEFluidAmount(IAEItemStack drop) {
+        if (drop != null && !drop.getDefinition().isEmpty() && drop.getItem() instanceof ItemFluidDrop) {
+            FluidStack fluid = ItemFluidDrop.getFluidStack(drop.getDefinition());
+            AEItemStack stack = AEItemStack.fromItemStack(ItemFluidPacket.newDisplayStack(fluid));
+            return stack == null ? null : stack.setStackSize(drop.getStackSize());
+        } else return drop;
     }
 
     public static long getFluidSize(IAEItemStack aeStack) {
@@ -184,8 +190,7 @@ public static void storeFluidItem(CraftingCPUCluster instance) {
         Preconditions.checkState(Ae2Reflect.getCPUComplete(instance), "CPU should be complete to prevent re-insertion when dumping items");
         final IGrid g = Ae2Reflect.getGrid(instance);
 
-        if( g == null )
-        {
+        if (g == null) {
             return;
         }
 
@@ -194,8 +199,7 @@ public static void storeFluidItem(CraftingCPUCluster instance) {
         final IMEInventory<IAEFluidStack> jj = sg.getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class));
         final MECraftingInventory inventory = Ae2Reflect.getCPUInventory(instance);
 
-        for( IAEItemStack is : inventory.getItemList() )
-        {
+        for (IAEItemStack is : inventory.getItemList()) {
             Ae2Reflect.postCPUChange(instance, is, Ae2Reflect.getCPUSource(instance));
 
             if (is.getItem() instanceof ItemFluidDrop ) {
@@ -216,8 +220,7 @@ public static void storeFluidItem(CraftingCPUCluster instance) {
             }
         }
 
-        if( inventory.getItemList().isEmpty() )
-        {
+        if (inventory.getItemList().isEmpty()) {
             Ae2Reflect.setCPUInventory(instance, new MECraftingInventory());
         }
 

src/main/java/com/glodblock/github/coremod/FCClassTransformer.java

@@ -48,6 +48,9 @@ public byte[] transform(String name, String transformedName, byte[] code) {
             case "appeng.client.gui.implementations.GuiCraftConfirm":
                 tform = GuiCraftingTransformer.INSTANCE;
                 break;
+            case "appeng.client.gui.implementations.GuiCraftingStatus":
+                tform = GuiCraftingStatusTransformer.INSTANCE;
+                break;
             case "p455w0rd.wct.client.gui.GuiCraftingCPU":
             case "p455w0rd.wct.client.gui.GuiCraftConfirm":
                 tform = WCTGuiCraftingTransformer.INSTANCE;

src/main/java/com/glodblock/github/coremod/transform/GuiCraftingStatusTransformer.java

@@ -0,0 +1,57 @@
+package com.glodblock.github.coremod.transform;
+
+import com.glodblock.github.coremod.FCClassTransformer;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+public class GuiCraftingStatusTransformer extends FCClassTransformer.ClassMapper {
+
+    public static final GuiCraftingStatusTransformer INSTANCE = new GuiCraftingStatusTransformer();
+
+    private GuiCraftingStatusTransformer() {
+        // NO-OP
+    }
+
+    @Override
+    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
+        return new TransformGuiCraftingStatus(Opcodes.ASM5, downstream);
+    }
+
+    private static class TransformGuiCraftingStatus extends ClassVisitor {
+
+        TransformGuiCraftingStatus(int api, ClassVisitor cv) {
+            super(api, cv);
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+            if ("drawFG".equals(name)) {
+                return new TransformFluidIcon(api, super.visitMethod(access, name, desc, signature, exceptions));
+            }
+            return super.visitMethod(access, name, desc, signature, exceptions);
+        }
+
+    }
+
+    private static class TransformFluidIcon extends MethodVisitor {
+
+        TransformFluidIcon(int api, MethodVisitor mv) {
+            super(api, mv);
+        }
+
+        @Override
+        public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
+            super.visitMethodInsn(opcode, owner, name, desc, itf);
+            if (opcode == Opcodes.INVOKEVIRTUAL && name.equals("getCrafting")) {
+                super.visitMethodInsn(Opcodes.INVOKESTATIC,
+                        "com/glodblock/github/coremod/CoreModHooks",
+                        "displayAEFluidAmount",
+                        "(Lappeng/api/storage/data/IAEItemStack;)Lappeng/api/storage/data/IAEItemStack;",
+                        false);
+            }
+        }
+
+    }
+
+}