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

Ported to 1.7

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/modules/BC.java
+3 -3
View File
@@ -5,8 +5,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraftforge.common.ForgeDirection;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.config.TunnelType;
import appeng.api.features.IP2PTunnelRegistry;
@@ -207,7 +207,7 @@ public class BC implements IIntegrationModule, IBC
}
@Override
public Icon getFacadeTexture()
public IIcon getFacadeTexture()
{
try
{
integration/modules/BS.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.integration.modules;
import net.mcft.copy.betterstorage.api.ICrateStorage;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.integration.IIntegrationModule;
import appeng.integration.abstraction.IBS;
integration/modules/FMP.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
if ( part instanceof CableBusPart )
{
CableBusPart cbp = (CableBusPart) part;
cbp.convertFromTile( world.getBlockTileEntity( pos.x, pos.y, pos.z ) );
cbp.convertFromTile( world.getTileEntity( pos.x, pos.y, pos.z ) );
}
return part;
integration/modules/FZ.java
+2 -2
View File
@@ -114,7 +114,7 @@ public class FZ implements IFZ, IIntegrationModule
else
item.set( te, input == null ? null : input.copy() );
te.onInventoryChanged();
te.markDirty();
}
catch (IllegalArgumentException e)
{
@@ -134,7 +134,7 @@ public class FZ implements IFZ, IIntegrationModule
else
setItemCount.invoke( te, max );
te.onInventoryChanged();
te.markDirty();
}
catch (IllegalAccessException e)
{
integration/modules/GT.java
+1 -1
View File
@@ -3,7 +3,7 @@ package appeng.integration.modules;
import gregtechmod.api.interfaces.IDigitalChest;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.storage.IMEInventory;
import appeng.integration.IIntegrationModule;
integration/modules/TE.java
+3 -3
View File
@@ -4,7 +4,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.integration.IIntegrationModule;
import appeng.integration.abstraction.ITE;
@@ -42,8 +42,8 @@ public class TE implements IIntegrationModule, ITE
{
NBTTagCompound toSend = new NBTTagCompound();
toSend.setInteger( "energy", 3200 );
toSend.setCompoundTag( "input", new NBTTagCompound() );
toSend.setCompoundTag( "primaryOutput", new NBTTagCompound() );
toSend.setTag( "input", new NBTTagCompound() );
toSend.setTag( "primaryOutput", new NBTTagCompound() );
in.writeToNBT( toSend.getCompoundTag( "input" ) );
out.writeToNBT( toSend.getCompoundTag( "primaryOutput" ) );
integration/modules/helpers/BCPipeHandler.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.StorageChannel;
integration/modules/helpers/BCPipeInventory.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.config.Actionable;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IMEInventory;
integration/modules/helpers/BSCrate.java
+1 -1
View File
@@ -2,7 +2,7 @@ package appeng.integration.modules.helpers;
import net.mcft.copy.betterstorage.api.ICrateStorage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.config.Actionable;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IMEInventory;
integration/modules/helpers/BSCrateHandler.java
+1 -1
View File
@@ -2,7 +2,7 @@ package appeng.integration.modules.helpers;
import net.mcft.copy.betterstorage.api.ICrateStorage;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.StorageChannel;
integration/modules/helpers/BSCrateStorageAdaptor.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.Iterator;
import net.mcft.copy.betterstorage.api.ICrateStorage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.config.FuzzyMode;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
integration/modules/helpers/BaseBCperdition.java
-24
View File
@@ -1,24 +0,0 @@
package appeng.integration.modules.helpers;
import appeng.tile.events.AETileEventHandler;
import appeng.tile.events.TileEventType;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import cpw.mods.fml.common.Optional.Method;
public abstract class BaseBCperdition extends AETileEventHandler
{
public BaseBCperdition() {
super( TileEventType.TICK, TileEventType.WORLD_NBT );
}
@Method(modid = "BuildCraftAPI|power")
public abstract PowerReceiver getPowerReceiver();
public abstract double useEnergy(float f, float requred, boolean b);
public abstract void addEnergy(float failed);
public abstract void configure(int i, int j, float f, int k);
}
integration/modules/helpers/FactorizationHandler.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.StorageChannel;
integration/modules/helpers/GregTechHandler.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.StorageChannel;
integration/modules/helpers/MFRDSUHandler.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.StorageChannel;