Most of the 1.8 Port.

This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
@@ -19,7 +19,7 @@
package appeng.tile.powersink;
public abstract class AEBasePoweredTile extends MekJoules
public abstract class AEBasePoweredTile extends AERootPoweredTile // extends MekJoules
{
}
@@ -22,8 +22,7 @@ package appeng.tile.powersink;
import java.util.EnumSet;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraft.util.EnumFacing;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -46,14 +45,14 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe
protected AccessRestriction internalPowerFlow = AccessRestriction.READ_WRITE;
// the current power buffer.
protected double internalCurrentPower = 0;
private EnumSet<ForgeDirection> internalPowerSides = EnumSet.allOf( ForgeDirection.class );
private EnumSet<EnumFacing> internalPowerSides = EnumSet.allOf( EnumFacing.class );
protected EnumSet<ForgeDirection> getPowerSides()
protected EnumSet<EnumFacing> getPowerSides()
{
return this.internalPowerSides.clone();
}
protected void setPowerSides( EnumSet<ForgeDirection> sides )
protected void setPowerSides( EnumSet<EnumFacing> sides )
{
this.internalPowerSides = sides;
// trigger re-calc!
+1 -3
View File
@@ -22,11 +22,9 @@ package appeng.tile.powersink;
import java.util.EnumSet;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import ic2.api.energy.tile.IEnergySink;
import appeng.api.config.PowerUnits;
import appeng.api.util.ForgeDirection;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;
import appeng.integration.abstraction.IIC2;
@@ -19,11 +19,9 @@
package appeng.tile.powersink;
import net.minecraftforge.common.util.ForgeDirection;
import mekanism.api.energy.IStrictEnergyAcceptor;
import appeng.api.config.PowerUnits;
import appeng.api.util.ForgeDirection;
import appeng.transformer.annotations.Integration.Interface;
@@ -19,11 +19,9 @@
package appeng.tile.powersink;
import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyReceiver;
import appeng.api.config.PowerUnits;
import appeng.api.util.ForgeDirection;
import appeng.transformer.annotations.Integration.Interface;
@@ -21,12 +21,10 @@ package appeng.tile.powersink;
import appeng.transformer.annotations.Integration;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import Reika.RotaryCraft.API.Interfaces.Transducerable;
import Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver;
import appeng.api.config.PowerUnits;
import appeng.api.util.ForgeDirection;
import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType;
import appeng.transformer.annotations.Integration.Interface;
@@ -28,13 +28,13 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I
{
@Override
public final boolean canConnect(ForgeDirection direction)
public final boolean canConnect(AEPartLocation direction)
{
return internalCanAcceptPower && getPowerSides().contains( direction );
}
@Override
public final float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive)
public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive)
{
float accepted = 0;
double receivedPower = receive.getWatts();
@@ -56,7 +56,7 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I
}
@Override
public final float getRequest(ForgeDirection direction)
public final float getRequest(AEPartLocation direction)
{
return (float) getExternalPowerDemand( PowerUnits.KJ );
}
@@ -68,13 +68,13 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I
}
@Override
public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide)
public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide)
{
return null; // cannot be dis-charged
}
@Override
public final float getProvide(ForgeDirection direction)
public final float getProvide(AEPartLocation direction)
{
return 0;
}