- GasInventoryHandler dump fix.

Author: KasumiNova

src/main/java/github/kasuminova/mmce/client/renderer/ControllerModelRenderManager.java

@@ -80,6 +80,9 @@ public void checkControllerState() {
         alive.clear();
     }
 
+    /**
+     * TODO: Prevents precision overflow due to oversize coordinates.
+     */
     public void draw() {
         GlStateManager.pushMatrix();
         GlStateManager.translate(-TileEntityRendererDispatcher.staticPlayerX, -TileEntityRendererDispatcher.staticPlayerY, -TileEntityRendererDispatcher.staticPlayerZ);

src/main/java/github/kasuminova/mmce/common/tile/MEGasInputBus.java

@@ -10,7 +10,6 @@
 import com.mekeng.github.common.me.data.impl.AEGasStack;
 import com.mekeng.github.common.me.inventory.impl.GasInventory;
 import github.kasuminova.mmce.common.tile.base.MEGasBus;
-import github.kasuminova.mmce.common.util.GasInventoryHandler;
 import github.kasuminova.mmce.common.util.IExtendedGasHandler;
 import hellfirepvp.modularmachinery.common.crafting.ComponentType;
 import hellfirepvp.modularmachinery.common.lib.ComponentTypesMM;
@@ -26,7 +25,7 @@
 import java.util.Objects;
 
 public class MEGasInputBus extends MEGasBus {
-    private final GasInventoryHandler config = new GasInventoryHandler(MEGasBus.TANK_SLOT_AMOUNT, this);
+    private final GasInventory config = new GasInventory(MEGasBus.TANK_SLOT_AMOUNT, this);
 
     @Override
     public ItemStack getVisualItemStack() {
@@ -188,7 +187,7 @@ public ComponentType getComponentType() {
 
             @Override
             public IExtendedGasHandler getContainerProvider() {
-                return tanks;
+                return handler;
             }
         };
     }

src/main/java/github/kasuminova/mmce/common/tile/MEGasOutputBus.java

@@ -43,7 +43,7 @@ public ComponentType getComponentType() {
 
             @Override
             public IExtendedGasHandler getContainerProvider() {
-                return tanks;
+                return handler;
             }
         };
     }

src/main/java/github/kasuminova/mmce/common/tile/base/MEGasBus.java

@@ -45,13 +45,15 @@ public abstract class MEGasBus extends MEMachineComponent implements
     protected final IGasStorageChannel channel = AEApi.instance().storage().getStorageChannel(IGasStorageChannel.class);
     protected final ConfigManager cm = new ConfigManager(this);
     protected final UpgradeInventory upgrades;
-    protected final GasInventoryHandler tanks;
+    protected final GasInventory tanks;
+    protected final GasInventoryHandler handler;
     protected boolean[] changedSlots;
     protected int fullCheckCounter = 5;
     protected boolean inTick = false;
 
     public MEGasBus() {
-        this.tanks = new GasInventoryHandler(TANK_SLOT_AMOUNT, TANK_DEFAULT_CAPACITY, this);
+        this.tanks = new GasInventory(TANK_SLOT_AMOUNT, TANK_DEFAULT_CAPACITY, this);
+        this.handler = new GasInventoryHandler(tanks);
         this.upgrades = new StackUpgradeInventory(proxy.getMachineRepresentation(), this, 5);
         this.changedSlots = new boolean[TANK_SLOT_AMOUNT];
     }
@@ -83,7 +85,7 @@ public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFa
     public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
         Capability<IGasHandler> cap = Capabilities.GAS_HANDLER_CAPABILITY;
         if (capability == cap) {
-            return cap.cast(tanks);
+            return cap.cast(handler);
         }
         return super.getCapability(capability, facing);
     }

src/main/java/github/kasuminova/mmce/common/util/GasInventoryHandler.java

@@ -1,134 +1,24 @@
 package github.kasuminova.mmce.common.util;
 
-import com.mekeng.github.common.me.inventory.IGasInventoryHost;
-import com.mekeng.github.common.me.inventory.impl.GasInventory;
-import mekanism.api.gas.Gas;
+import com.mekeng.github.common.me.inventory.IGasInventory;
+import com.mekeng.github.common.me.inventory.impl.GasInvHandler;
 import mekanism.api.gas.GasStack;
-import mekanism.api.gas.GasTank;
-import mekanism.api.gas.GasTankInfo;
 import net.minecraft.util.EnumFacing;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+public class GasInventoryHandler extends GasInvHandler implements IExtendedGasHandler {
 
-public class GasInventoryHandler extends GasInventory implements IExtendedGasHandler {
-
-    public GasInventoryHandler(final int size, final int cap, @Nullable final IGasInventoryHost host) {
-        super(size, cap, host);
-    }
-
-    public GasInventoryHandler(final int size, @Nullable final IGasInventoryHost host) {
-        super(size, host);
-    }
-
-    public GasInventoryHandler(final int size, final int cap) {
-        super(size, cap);
-    }
-
-    public GasInventoryHandler(final int size) {
-        super(size);
-    }
-
-    @Override
-    public GasStack drawGas(final GasStack toDraw, final boolean doTransfer) {
-        if (toDraw == null || toDraw.amount <= 0) {
-            return null;
-        }
-
-        GasStack ret = null;
-        for (final GasTank tank : getTanks()) {
-            if (!tank.canDraw(toDraw.getGas())) {
-                continue;
-            }
-
-            if (ret == null) {
-                ret = tank.draw(toDraw.amount, doTransfer);
-                if (ret.amount >= toDraw.amount) {
-                    return ret;
-                }
-                continue;
-            }
-
-            GasStack drawn = tank.draw(toDraw.amount - ret.amount, doTransfer);
-            if (drawn != null) {
-                ret.amount += drawn.amount;
-                if (ret.amount >= toDraw.amount) {
-                    return ret;
-                }
-            }
-        }
-
-        return ret;
+    public GasInventoryHandler(final IGasInventory inv) {
+        super(inv);
     }
 
     @Override
-    public int receiveGas(final EnumFacing side, final GasStack stack, final boolean doTransfer) {
-        if (stack.amount <= 0) {
-            return 0;
-        }
-
-        int received = 0;
-        for (final GasTank tank : getTanks()) {
-            if (tank.canReceive(stack.getGas())) {
-                received += tank.receive(stack, doTransfer);
-                if (stack.amount <= received) {
-                    return received;
-                }
-            }
-        }
-
-        return received;
+    public synchronized int receiveGas(final EnumFacing side, final GasStack stack, final boolean doTransfer) {
+        return super.receiveGas(side, stack, doTransfer);
     }
 
     @Override
-    public GasStack drawGas(final EnumFacing side, final int amount, final boolean doTransfer) {
-        if (amount <= 0) {
-            return null;
-        }
-
-        GasStack ret = null;
-        for (final GasTank tank : getTanks()) {
-            if (ret == null) {
-                ret = tank.draw(amount, doTransfer);
-                continue;
-            }
-            if (!tank.canDraw(ret.getGas())) {
-                continue;
-            }
-            if (ret.amount < Integer.MAX_VALUE) {
-                GasStack drawn = tank.draw(Math.min(amount - ret.amount, Integer.MAX_VALUE - ret.amount), doTransfer);
-                if (drawn != null) {
-                    ret.amount += drawn.amount;
-                }
-            }
-        }
-
-        return ret;
+    public synchronized GasStack drawGas(final GasStack toDraw, final boolean doTransfer) {
+        return drawGas(null, toDraw, doTransfer);
     }
 
-    @Override
-    public boolean canReceiveGas(final EnumFacing side, final Gas type) {
-        for (final GasTank tank : getTanks()) {
-            if (tank.canReceive(type)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean canDrawGas(final EnumFacing side, final Gas type) {
-        for (final GasTank tank : getTanks()) {
-            if (tank.canDraw(type)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Nonnull
-    @Override
-    public GasTankInfo[] getTankInfo() {
-        return getTanks();
-    }
 }