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

Formatted code

Browse Source
This commit is contained in:
yueh
2015-12-24 02:03:16 +01:00
parent e94a0cfccf
commit c9e8a6e939
216 changed files with 1196 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/powersink/IC2.java
+1 -1
View File
@@ -122,4 +122,4 @@ package appeng.tile.powersink;
// this.removeFromENet();
// this.addToENet();
// }
//}
// }
src/main/java/appeng/tile/powersink/RedstoneFlux.java
+1 -1
View File
@@ -62,4 +62,4 @@ package appeng.tile.powersink;
// {
// return this.getPowerSides().contains( from );
// }
//}
// }
src/main/java/appeng/tile/powersink/RotaryCraft.java
+1 -1
View File
@@ -182,4 +182,4 @@ package appeng.tile.powersink;
// messages.add( out );
// return messages;
// }
//}
// }
src/main/java/appeng/tile/powersink/UniversalElectricity.java
+53 -62
View File
@@ -18,66 +18,57 @@
package appeng.tile.powersink;
/*
import net.minecraftforge.common.util.ForgeDirection;
import universalelectricity.core.block.IElectrical;
import universalelectricity.core.electricity.ElectricityPack;
import appeng.api.config.PowerUnits;
public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical
{
@Override
public final boolean canConnect(AEPartLocation direction)
{
return internalCanAcceptPower && getPowerSides().contains( direction );
}
@Override
public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive)
{
float accepted = 0;
double receivedPower = receive.getWatts();
if ( doReceive )
{
accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower ));
}
else
{
double whatIWant = getExternalPowerDemand( PowerUnits.KJ );
if ( whatIWant > receivedPower )
accepted = (float) receivedPower;
else
accepted = (float) whatIWant;
}
return accepted;
}
@Override
public final float getRequest(AEPartLocation direction)
{
return (float) getExternalPowerDemand( PowerUnits.KJ );
}
@Override
public final float getVoltage()
{
return 120;
}
@Override
public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide)
{
return null; // cannot be dis-charged
}
@Override
public final float getProvide(AEPartLocation direction)
{
return 0;
}
}
*/
* import net.minecraftforge.common.util.ForgeDirection;
* import universalelectricity.core.block.IElectrical;
* import universalelectricity.core.electricity.ElectricityPack;
* import appeng.api.config.PowerUnits;
* public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical
* {
* @Override
* public final boolean canConnect(AEPartLocation direction)
* {
* return internalCanAcceptPower && getPowerSides().contains( direction );
* }
* @Override
* public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive)
* {
* float accepted = 0;
* double receivedPower = receive.getWatts();
* if ( doReceive )
* {
* accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower ));
* }
* else
* {
* double whatIWant = getExternalPowerDemand( PowerUnits.KJ );
* if ( whatIWant > receivedPower )
* accepted = (float) receivedPower;
* else
* accepted = (float) whatIWant;
* }
* return accepted;
* }
* @Override
* public final float getRequest(AEPartLocation direction)
* {
* return (float) getExternalPowerDemand( PowerUnits.KJ );
* }
* @Override
* public final float getVoltage()
* {
* return 120;
* }
* @Override
* public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide)
* {
* return null; // cannot be dis-charged
* }
* @Override
* public final float getProvide(AEPartLocation direction)
* {
* return 0;
* }
* }
*/