fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ported, but did not enable GT 1.7

Browse Source
This commit is contained in:
AlgorithmX2
2014-05-01 21:50:04 -05:00
parent 40de3da454
commit 5bacb015e5
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/modules/dead/GT.java
+4 -4
View File
@@ -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
integration/modules/helpers/dead/GregTechHandler.java
+4 -3
View File
@@ -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;
}
integration/modules/helpers/dead/GregTechQuantumChest.java
+3 -3
View File
@@ -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;
}