diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-20 22:47:09 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-20 22:47:09 +0200 |
| commit | 57efa552e75780b97616aaa5c9492b1000cc534c (patch) | |
| tree | 575466996802e1c4b84f4e92843ac4ded6b22848 /src/main/java/gregtech/api/interfaces/tileentity | |
| parent | 70c116c3dfb14f77680155a02dbd53d763987703 (diff) | |
| parent | 49e6015068d67147993c688bd4e42be7c96a4f6b (diff) | |
| download | GT5-Unofficial-57efa552e75780b97616aaa5c9492b1000cc534c.tar.gz GT5-Unofficial-57efa552e75780b97616aaa5c9492b1000cc534c.tar.bz2 GT5-Unofficial-57efa552e75780b97616aaa5c9492b1000cc534c.zip | |
Merge pull request #253 from JonnyNova/tf_squash
Replace GT_Values.T/F with java primitive boolean values
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/tileentity')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java index 9bb3fec13e..f6758f2cd9 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java @@ -1,7 +1,5 @@ package gregtech.api.interfaces.tileentity; -import static gregtech.api.enums.GT_Values.F; -import static gregtech.api.enums.GT_Values.T; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_Utility; import ic2.api.energy.tile.IEnergySink; @@ -37,7 +35,7 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW /** Utility for the Network */ public static class Util { - private static boolean RF_ENERGY = F, IC_ENERGY = F, CHECK_ALL = T; + private static boolean RF_ENERGY = false, IC_ENERGY = false, CHECK_ALL = true; public static int RF_PER_EU = 4; private static void checkAvailabilities() { @@ -45,14 +43,14 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW try { Class tClass = cofh.api.energy.IEnergyReceiver.class; tClass.getCanonicalName(); - RF_ENERGY = T; + RF_ENERGY = true; } catch(Throwable e) {/**/} try { Class tClass = ic2.api.energy.tile.IEnergySink.class; tClass.getCanonicalName(); - IC_ENERGY = T; + IC_ENERGY = true; } catch(Throwable e) {/**/} - CHECK_ALL = F; + CHECK_ALL = false; } } @@ -77,7 +75,7 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW while (aSecondary > rUsedSecondary && ((IEnergySink)tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink)tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aPrimary, aPrimary) < aPrimary) rUsedSecondary++; } } else if (RF_ENERGY && aEnergyType == SubTag.ENERGY_REDSTONE_FLUX && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver)tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) { - rUsedSecondary+=((IEnergyReceiver)tTileEntity).receiveEnergy(ForgeDirection.getOrientation(j), (int)aSecondary, F); + rUsedSecondary+=((IEnergyReceiver)tTileEntity).receiveEnergy(ForgeDirection.getOrientation(j), (int)aSecondary, false); } } return rUsedSecondary; |