diff options
Diffstat (limited to 'src/main/java/gregtech/api')
5 files changed, 33 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java index f62b6f306d..86ef944a71 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java @@ -179,6 +179,10 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase< return GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList()); } + public long getMaxInputEu() { + return getMaxInputVoltage() * getMaxInputAmps(); + } + @Override public void clearHatches() { super.clearHatches(); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java index 8f4739fec1..f1ccdd04e4 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java @@ -10,6 +10,13 @@ import net.minecraft.nbt.NBTTagCompound; * Handles texture changes internally. No special calls are necessary other than updateTexture in add***ToMachineList. */ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTank { + + public enum ConnectionType { + CABLE, + WIRELESS, + LASER + } + /** * Uses new texture changing methods to avoid limitations of byte as texture index... */ @@ -150,6 +157,14 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan return maxAmperesIn(); } + /** Get the type of connection this hatch allows + * + * @return Connection type + */ + public ConnectionType getConnectionType() { + return ConnectionType.CABLE; + } + @Override public final byte getUpdateData() { return (byte) (actualTexture & 0x7F); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java index 140a81f766..41b898b582 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java @@ -97,6 +97,11 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D } @Override + public ConnectionType getConnectionType() { + return ConnectionType.WIRELESS; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Wireless_Dynamo(mName, mTier, new String[] {""}, mTextures); } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java index ee1af3281b..218f15c8c0 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java @@ -101,6 +101,11 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En } @Override + public ConnectionType getConnectionType() { + return ConnectionType.WIRELESS; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Wireless_Hatch(mName, mTier, new String[] {""}, mTextures); } diff --git a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java index 01ecb47633..8fbb79faff 100644 --- a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java +++ b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java @@ -57,6 +57,10 @@ public class GT_ExoticEnergyInputHelper { return false; } + public static long getTotalEuMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) { + return getMaxWorkingInputAmpsMulti(hatches) * getMaxInputVoltageMulti(hatches); + } + public static long getMaxInputVoltageMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) { long rVoltage = 0; for (GT_MetaTileEntity_Hatch tHatch : hatches) |