From 5bacb015e58ef32c5791a970887435d801eca8fd Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Thu, 1 May 2014 21:50:04 -0500 Subject: [PATCH] Ported, but did not enable GT 1.7 --- integration/modules/dead/GT.java | 8 ++++---- integration/modules/helpers/dead/GregTechHandler.java | 7 ++++--- .../modules/helpers/dead/GregTechQuantumChest.java | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/integration/modules/dead/GT.java b/integration/modules/dead/GT.java index feff1f78d..f977b6855 100644 --- a/integration/modules/dead/GT.java +++ b/integration/modules/dead/GT.java @@ -1,6 +1,6 @@ -package appeng.integration.modules.dead; +package appeng.integration.modules; -import gregtechmod.api.interfaces.IDigitalChest; +import gregtech.api.interfaces.tileentity.IDigitalChest; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -8,8 +8,8 @@ import appeng.api.AEApi; import appeng.api.storage.IMEInventory; import appeng.integration.IIntegrationModule; import appeng.integration.abstraction.IGT; -import appeng.integration.modules.helpers.dead.GregTechHandler; -import appeng.integration.modules.helpers.dead.GregTechQuantumChest; +import appeng.integration.modules.helpers.GregTechHandler; +import appeng.integration.modules.helpers.GregTechQuantumChest; import appeng.util.InventoryAdaptor; public class GT implements IGT, IIntegrationModule diff --git a/integration/modules/helpers/dead/GregTechHandler.java b/integration/modules/helpers/dead/GregTechHandler.java index baf990cac..d9e7dea48 100644 --- a/integration/modules/helpers/dead/GregTechHandler.java +++ b/integration/modules/helpers/dead/GregTechHandler.java @@ -1,7 +1,8 @@ -package appeng.integration.modules.helpers.dead; +package appeng.integration.modules.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IMEInventory; import appeng.api.storage.StorageChannel; @@ -17,9 +18,9 @@ public class GregTechHandler implements IExternalStorageHandler } @Override - public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel chan) + public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src) { - if ( chan == StorageChannel.ITEMS ) + if ( channel == StorageChannel.ITEMS ) return GT.instance.getQuantumChest( te ); return null; } diff --git a/integration/modules/helpers/dead/GregTechQuantumChest.java b/integration/modules/helpers/dead/GregTechQuantumChest.java index f321417a7..14635e72b 100644 --- a/integration/modules/helpers/dead/GregTechQuantumChest.java +++ b/integration/modules/helpers/dead/GregTechQuantumChest.java @@ -1,6 +1,6 @@ -package appeng.integration.modules.helpers.dead; +package appeng.integration.modules.helpers; -import gregtechmod.api.interfaces.IDigitalChest; +import gregtech.api.interfaces.tileentity.IDigitalChest; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import appeng.api.config.Actionable; @@ -24,7 +24,7 @@ public class GregTechQuantumChest extends MEIInventoryWrapper private ItemStack getType() { ItemStack[] array = qc.getStoredItemData(); - if ( array.length > 0 && array[0].itemID > 0 ) + if ( array.length > 0 && array[0].getItem() != null ) return array[0]; return null; }