From a72c97e66623223ce90a45275b9662cf073ce802 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Wed, 19 Oct 2016 20:57:59 +0200 Subject: [PATCH] #2438: Implemented forge energy capabilities. Removed other disabled energy units for the time being. --- .../java/appeng/api/config/PowerUnits.java | 4 +- .../client/gui/widgets/GuiImgButton.java | 2 - src/main/java/appeng/core/AEConfig.java | 7 +- .../tile/networking/TileEnergyAcceptor.java | 9 + .../tile/powersink/AERootPoweredTile.java | 47 ++++- .../tile/powersink/ForgeEnergyAdapter.java | 67 +++++++ .../tile/powersink/IExternalPowerSink.java | 15 ++ .../java/appeng/tile/powersink/MekJoules.java | 72 ------- .../appeng/tile/powersink/RedstoneFlux.java | 65 ------ .../appeng/tile/powersink/RotaryCraft.java | 185 ------------------ .../tile/powersink/UniversalElectricity.java | 74 ------- src/main/java/appeng/util/Platform.java | 10 - .../appliedenergistics2/lang/cs_CZ.lang | 4 +- .../appliedenergistics2/lang/de_DE.lang | 4 +- .../appliedenergistics2/lang/en_US.lang | 4 +- .../appliedenergistics2/lang/es_ES.lang | 4 +- .../appliedenergistics2/lang/fr_FR.lang | 4 +- .../appliedenergistics2/lang/it_IT.lang | 4 +- .../appliedenergistics2/lang/ko_KR.lang | 4 +- .../appliedenergistics2/lang/pt_BR.lang | 4 +- .../appliedenergistics2/lang/ro_RO.lang | 4 +- 21 files changed, 146 insertions(+), 447 deletions(-) create mode 100644 src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java create mode 100644 src/main/java/appeng/tile/powersink/IExternalPowerSink.java delete mode 100644 src/main/java/appeng/tile/powersink/MekJoules.java delete mode 100644 src/main/java/appeng/tile/powersink/RedstoneFlux.java delete mode 100644 src/main/java/appeng/tile/powersink/RotaryCraft.java delete mode 100644 src/main/java/appeng/tile/powersink/UniversalElectricity.java diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java index 0fe2b1e3..3111e7d9 100644 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ b/src/api/java/appeng/api/config/PowerUnits.java @@ -28,9 +28,7 @@ public enum PowerUnits { AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units - WA( "gui.appliedenergistics2.units.rotarycraft" ), // RotaryCraft - Watts - RF( "gui.appliedenergistics2.units.thermalexpansion" ), // ThermalExpansion - Redstone Flux - MK( "gui.appliedenergistics2.units.mekanism" ); // Mekanism - Joules + RF( "gui.appliedenergistics2.units.rf" ); // RF - Redstone Flux /** * unlocalized name for the power unit. diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 71335b97..00b8a9f1 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -86,8 +86,6 @@ public class GuiImgButton extends GuiButton implements ITooltip this.registerApp( 16 * 10, Settings.POWER_UNITS, PowerUnits.AE, ButtonToolTips.PowerUnits, PowerUnits.AE.unlocalizedName ); this.registerApp( 16 * 10 + 1, Settings.POWER_UNITS, PowerUnits.EU, ButtonToolTips.PowerUnits, PowerUnits.EU.unlocalizedName ); - this.registerApp( 16 * 10 + 2, Settings.POWER_UNITS, PowerUnits.MK, ButtonToolTips.PowerUnits, PowerUnits.MK.unlocalizedName ); - this.registerApp( 16 * 10 + 3, Settings.POWER_UNITS, PowerUnits.WA, ButtonToolTips.PowerUnits, PowerUnits.WA.unlocalizedName ); this.registerApp( 16 * 10 + 4, Settings.POWER_UNITS, PowerUnits.RF, ButtonToolTips.PowerUnits, PowerUnits.RF.unlocalizedName ); this.registerApp( 3, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE, ButtonToolTips.RedstoneMode, ButtonToolTips.AlwaysActive ); diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 42b4fea4..849580e3 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -115,15 +115,10 @@ public final class AEConfig extends Configuration implements IConfigurableObject FMLCommonHandler.instance().bus().register( this ); - final double DEFAULT_MEKANISM_EXCHANGE = 0.2; - - PowerUnits.MK.conversionRatio = this.get( "PowerRatios", "Mekanism", DEFAULT_MEKANISM_EXCHANGE ).getDouble( DEFAULT_MEKANISM_EXCHANGE ); final double DEFAULT_IC2_EXCHANGE = 2.0; PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE ); - final double DEFAULT_RTC_EXCHANGE = 1.0 / 11256.0; - PowerUnits.WA.conversionRatio = this.get( "PowerRatios", "RotaryCraft", DEFAULT_RTC_EXCHANGE ).getDouble( DEFAULT_RTC_EXCHANGE ); final double DEFAULT_RF_EXCHANGE = 0.5; - PowerUnits.RF.conversionRatio = this.get( "PowerRatios", "ThermalExpansion", DEFAULT_RF_EXCHANGE ).getDouble( DEFAULT_RF_EXCHANGE ); + PowerUnits.RF.conversionRatio = this.get( "PowerRatios", "Forge Energy", DEFAULT_RF_EXCHANGE ).getDouble( DEFAULT_RF_EXCHANGE ); final double usageEffective = this.get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 ); PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective ); diff --git a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java b/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java index 9d090d9f..c000c86c 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java +++ b/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java @@ -19,10 +19,13 @@ package appeng.tile.networking; +import javax.annotation.Nullable; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergyGrid; @@ -118,4 +121,10 @@ public class TileEnergyAcceptor extends AENetworkPowerTile { return this.sides; } + + @Override + public T getCapability( Capability capability, @Nullable EnumFacing facing ) + { + return super.getCapability( capability, facing ); + } } diff --git a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java index e5c8755b..646a661e 100644 --- a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java +++ b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java @@ -20,9 +20,13 @@ package appeng.tile.powersink; import java.util.EnumSet; +import javax.annotation.Nullable; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -35,9 +39,8 @@ import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; -public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowerStorage +public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowerStorage, IExternalPowerSink { - // values that determine general function, are set by inheriting classes if // needed. These should generally remain static. private double internalMaxPower = 10000; @@ -46,6 +49,12 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe // the current power buffer. private double internalCurrentPower = 0; private EnumSet internalPowerSides = EnumSet.allOf( EnumFacing.class ); + private final IEnergyStorage forgeEnergyAdapter; + + public AERootPoweredTile() + { + forgeEnergyAdapter = new ForgeEnergyAdapter( this ); + } protected EnumSet getPowerSides() { @@ -70,7 +79,8 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe this.setInternalCurrentPower( data.getDouble( "internalCurrentPower" ) ); } - protected final double getExternalPowerDemand( final PowerUnits externalUnit, final double maxPowerRequired ) + @Override + public final double getExternalPowerDemand( final PowerUnits externalUnit, final double maxPowerRequired ) { return PowerUnits.AE.convertTo( externalUnit, Math.max( 0.0, this.getFunnelPowerDemand( externalUnit.convertTo( PowerUnits.AE, maxPowerRequired ) ) ) ); } @@ -80,6 +90,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe return this.getInternalMaxPower() - this.getInternalCurrentPower(); } + @Override public final double injectExternalPower( final PowerUnits input, final double amt ) { return PowerUnits.AE.convertTo( input, this.funnelPowerIntoStorage( input.convertTo( PowerUnits.AE, amt ), Actionable.MODULATE ) ); @@ -230,4 +241,34 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe { this.internalPowerFlow = internalPowerFlow; } + + @Override + public boolean hasCapability( Capability capability, EnumFacing facing ) + { + if( capability == CapabilityEnergy.ENERGY ) + { + if( this.getPowerSides().contains( facing ) ) + { + return true; + } + } + + return super.hasCapability( capability, facing ); + } + + @SuppressWarnings( "unchecked" ) + @Override + public T getCapability( Capability capability, @Nullable EnumFacing facing ) + { + if( capability == CapabilityEnergy.ENERGY ) + { + if( this.getPowerSides().contains( facing ) ) + { + return (T) forgeEnergyAdapter; + } + } + + return super.getCapability( capability, facing ); + } + } diff --git a/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java b/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java new file mode 100644 index 00000000..53815511 --- /dev/null +++ b/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java @@ -0,0 +1,67 @@ +package appeng.tile.powersink; + + + +import net.minecraftforge.energy.IEnergyStorage; + +import appeng.api.config.PowerUnits; + + +/** + * Adapts an {@link IExternalPowerSink} to Forges {@link IEnergyStorage}. + */ +class ForgeEnergyAdapter implements IEnergyStorage +{ + + private final IExternalPowerSink sink; + + ForgeEnergyAdapter( IExternalPowerSink sink ) + { + this.sink = sink; + } + + @Override + public final int receiveEnergy( int maxReceive, boolean simulate ) + { + final int networkDemand = (int) Math.floor( sink.getExternalPowerDemand( PowerUnits.RF, maxReceive ) ); + final int used = Math.min( maxReceive, networkDemand ); + + if( !simulate ) + { + sink.injectExternalPower( PowerUnits.RF, used ); + } + + return used; + } + + @Override + public final int getEnergyStored() + { + return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAECurrentPower() ) ); + } + + @Override + public final int getMaxEnergyStored( ) + { + return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAEMaxPower() ) ); + } + + @Override + public int extractEnergy( int maxExtract, boolean simulate ) + { + return 0; + } + + @Override + public boolean canExtract() + { + return false; + } + + @Override + public boolean canReceive() + { + return true; + } + +} diff --git a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java new file mode 100644 index 00000000..cf362b72 --- /dev/null +++ b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java @@ -0,0 +1,15 @@ +package appeng.tile.powersink; + + +import appeng.api.config.PowerUnits; +import appeng.api.networking.energy.IAEPowerStorage; + + +interface IExternalPowerSink extends IAEPowerStorage +{ + + double injectExternalPower( PowerUnits input, double amt ); + + double getExternalPowerDemand( PowerUnits externalUnit, double maxPowerRequired ); + +} diff --git a/src/main/java/appeng/tile/powersink/MekJoules.java b/src/main/java/appeng/tile/powersink/MekJoules.java deleted file mode 100644 index fc7fe071..00000000 --- a/src/main/java/appeng/tile/powersink/MekJoules.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.tile.powersink; - - -//import net.minecraftforge.common.util.ForgeDirection; -// -//import mekanism.api.energy.IStrictEnergyAcceptor; -// -//import appeng.api.config.PowerUnits; -//import appeng.integration.IntegrationType; -//import appeng.transformer.annotations.Integration.Interface; -// -// -//@Interface( iname = IntegrationType.Mekanism, iface = "mekanism.api.energy.IStrictEnergyAcceptor" ) -//public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcceptor -//{ -// -// @Override -// public double getEnergy() -// { -// return 0; -// } -// -// @Override -// public void setEnergy( double energy ) -// { -// double extra = this.injectExternalPower( PowerUnits.MK, energy ); -// this.internalCurrentPower += PowerUnits.MK.convertTo( PowerUnits.AE, extra ); -// } -// -// @Override -// public double getMaxEnergy() -// { -// return this.getExternalPowerDemand( PowerUnits.MK, 100000 ); -// } -// -// @Override -// public double transferEnergyToAcceptor( ForgeDirection side, double amount ) -// { -// double demand = this.getExternalPowerDemand( PowerUnits.MK, Double.MAX_VALUE ); -// if( amount > demand ) -// { -// amount = demand; -// } -// -// double overflow = this.injectExternalPower( PowerUnits.MK, amount ); -// return amount - overflow; -// } -// -// @Override -// public boolean canReceiveEnergy( ForgeDirection side ) -// { -// return this.getPowerSides().contains( side ); -// } -// } diff --git a/src/main/java/appeng/tile/powersink/RedstoneFlux.java b/src/main/java/appeng/tile/powersink/RedstoneFlux.java deleted file mode 100644 index 730731d2..00000000 --- a/src/main/java/appeng/tile/powersink/RedstoneFlux.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.tile.powersink; - - -//import net.minecraftforge.common.util.ForgeDirection; -// -//import cofh.api.energy.IEnergyReceiver; -// -//import appeng.api.config.PowerUnits; -//import appeng.integration.IntegrationType; -//import appeng.transformer.annotations.Integration.Interface; -// -// -//@Interface( iname = IntegrationType.RF, iface = "cofh.api.energy.IEnergyReceiver" ) -//public abstract class RedstoneFlux extends RotaryCraft implements IEnergyReceiver -//{ -// @Override -// public final int receiveEnergy( ForgeDirection from, int maxReceive, boolean simulate ) -// { -// final int networkRFDemand = (int) Math.floor( this.getExternalPowerDemand( PowerUnits.RF, maxReceive ) ); -// final int usedRF = Math.min( maxReceive, networkRFDemand ); -// -// if( !simulate ) -// { -// this.injectExternalPower( PowerUnits.RF, usedRF ); -// } -// -// return usedRF; -// } -// -// @Override -// public final int getEnergyStored( ForgeDirection from ) -// { -// return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAECurrentPower() ) ); -// } -// -// @Override -// public final int getMaxEnergyStored( ForgeDirection from ) -// { -// return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAEMaxPower() ) ); -// } -// -// @Override -// public final boolean canConnectEnergy( ForgeDirection from ) -// { -// return this.getPowerSides().contains( from ); -// } -// } diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java deleted file mode 100644 index c61b5e40..00000000 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.tile.powersink; - - -//import java.util.ArrayList; -// -//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.integration.IntegrationType; -//import appeng.tile.TileEvent; -//import appeng.tile.events.TileEventType; -//import appeng.transformer.annotations.Integration.Interface; -//import appeng.transformer.annotations.Integration.InterfaceList; -//import appeng.transformer.annotations.Integration.Method; -// -// -//@InterfaceList( value = { @Interface( iname = IntegrationType.RotaryCraft, iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = IntegrationType.RotaryCraft, iface = "Reika.RotaryCraft.API.Interfaces.Transducerable" ) } ) -//public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerReceiver, Transducerable -//{ -// -// private int omega = 0; -// private int torque = 0; -// private long power = 0; -// private int alpha = 0; -// -// private long currentPower = 0; -// -// @TileEvent( TileEventType.TICK ) -// @Method( iname = IntegrationType.RotaryCraft ) -// public void Tick_RotaryCraft() -// { -// if( this.worldObj != null && !this.worldObj.isRemote && this.currentPower > 0 ) -// { -// this.injectExternalPower( PowerUnits.WA, this.currentPower ); -// this.currentPower = 0; -// } -// } -// -// @Override -// public final boolean addPower( int torque, int omega, long power, ForgeDirection side ) -// { -// this.omega = omega; -// this.torque = torque; -// this.power = power; -// -// this.currentPower += power; -// -// return true; -// -// } -// -// @Override -// public final int getOmega() -// { -// return this.omega; -// } -// -// @Override -// public final int getTorque() -// { -// return this.torque; -// } -// -// @Override -// public final long getPower() -// { -// return this.power; -// } -// -// @Override -// public final String getName() -// { -// return "AE"; -// } -// -// @Override -// public final int getIORenderAlpha() -// { -// return this.alpha; -// } -// -// @Override -// public final void setIORenderAlpha( int io ) -// { -// this.alpha = io; -// } -// -// public final boolean canReadFromBlock( int x, int y, int z ) -// { -// ForgeDirection side = ForgeDirection.UNKNOWN; -// -// if( x == this.xCoord - 1 ) -// { -// side = ForgeDirection.WEST; -// } -// else if( x == this.xCoord + 1 ) -// { -// side = ForgeDirection.EAST; -// } -// else if( z == this.zCoord - 1 ) -// { -// side = ForgeDirection.NORTH; -// } -// else if( z == this.zCoord + 1 ) -// { -// side = ForgeDirection.SOUTH; -// } -// else if( y == this.yCoord - 1 ) -// { -// side = ForgeDirection.DOWN; -// } -// else if( y == this.yCoord + 1 ) -// { -// side = ForgeDirection.UP; -// } -// -// return this.getPowerSides().contains( side ); -// } -// -// @Override -// public final boolean canReadFrom( ForgeDirection side ) -// { -// return this.getPowerSides().contains( side ); -// } -// -// @Override -// public final boolean isReceiving() -// { -// return true; -// } -// -// @Override -// public final int getMinTorque( int available ) -// { -// return 1; -// } -// -// @Override -// public final ArrayList getMessages( World world, int x, int y, int z, int side ) -// { -// String out; -// if( this.power >= 1000000000 ) -// { -// out = String.format( "Receiving %.3f GW @ %d rad/s.", this.power / 1000000000.0D, this.omega ); -// } -// else if( this.power >= 1000000 ) -// { -// out = String.format( "Receiving %.3f MW @ %d rad/s.", this.power / 1000000.0D, this.omega ); -// } -// else if( this.power >= 1000 ) -// { -// out = String.format( "Receiving %.3f kW @ %d rad/s.", this.power / 1000.0D, this.omega ); -// } -// else -// { -// out = String.format( "Receiving %d W @ %d rad/s.", this.power, this.omega ); -// } -// -// ArrayList messages = new ArrayList( 1 ); -// messages.add( out ); -// return messages; -// } -// } diff --git a/src/main/java/appeng/tile/powersink/UniversalElectricity.java b/src/main/java/appeng/tile/powersink/UniversalElectricity.java deleted file mode 100644 index 3a586b65..00000000 --- a/src/main/java/appeng/tile/powersink/UniversalElectricity.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -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; - * } - * } - */ \ No newline at end of file diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 844b0948..866e108c 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -193,16 +193,6 @@ public class Platform final String[] preFixes = { "k", "M", "G", "T", "P", "T", "P", "E", "Z", "Y" }; String unitName = displayUnits.name(); - if( displayUnits == PowerUnits.WA ) - { - unitName = "J"; - } - - if( displayUnits == PowerUnits.MK ) - { - unitName = "J"; - } - String level = ""; int offset = 0; while( p > 1000 && offset < preFixes.length ) diff --git a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang index d91cbfe4..092a18a8 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/cs_CZ.lang @@ -280,9 +280,7 @@ gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=Ne: Vidět budou pouz gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Jednotky energie -gui.appliedenergistics2.units.mekanism=Jouly -gui.appliedenergistics2.units.rotarycraft=Watty -gui.appliedenergistics2.units.thermalexpansion=Ruditový Flux +gui.appliedenergistics2.units.rf=Ruditový Flux gui.appliedenergistics2.White=Bílá gui.appliedenergistics2.Orange=Oranžová diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang index 9903c656..cb7820a8 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/de_DE.lang @@ -327,9 +327,7 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Anfragbare Items: %s // Units gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Energy Units -gui.appliedenergistics2.units.mekanism=Joules -gui.appliedenergistics2.units.rotarycraft=Watt -gui.appliedenergistics2.units.thermalexpansion=Redstone Flux +gui.appliedenergistics2.units.rf=Redstone Flux // Colors gui.appliedenergistics2.White=Weiß diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang index 7af222dd..7585fd16 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang @@ -329,9 +329,7 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Items Requestable: %s // Units gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Energy Units -gui.appliedenergistics2.units.mekanism=Joules -gui.appliedenergistics2.units.rotarycraft=Watts -gui.appliedenergistics2.units.thermalexpansion=Redstone Flux +gui.appliedenergistics2.units.rf=Redstone Flux // Colors gui.appliedenergistics2.White=White diff --git a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang index 78dd0492..5e002582 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/es_ES.lang @@ -264,9 +264,7 @@ gui.tooltips.appliedenergistics2.TerminalStyle_Small=Terminal Centrada Pequeña gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Energy Units -gui.appliedenergistics2.units.mekanism=Joules -gui.appliedenergistics2.units.rotarycraft=Watts -gui.appliedenergistics2.units.thermalexpansion=Redstone Flux +gui.appliedenergistics2.units.rf=Redstone Flux gui.appliedenergistics2.White=Blanco gui.appliedenergistics2.Orange=Naranja diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang index a976271c..958878a2 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang @@ -324,9 +324,7 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Eléments recherchable: %s // Units gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Energy Units -gui.appliedenergistics2.units.mekanism=Joules -gui.appliedenergistics2.units.rotarycraft=Watts -gui.appliedenergistics2.units.thermalexpansion=Redstone Flux +gui.appliedenergistics2.units.rf=Redstone Flux // Colors gui.appliedenergistics2.White=Blanc diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang index a5aa312f..e64cec37 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang @@ -307,9 +307,7 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Oggetti richiedibili: %s // Units gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Energy Units -gui.appliedenergistics2.units.mekanism=Joules -gui.appliedenergistics2.units.rotarycraft=Watts -gui.appliedenergistics2.units.thermalexpansion=Redstone Flux +gui.appliedenergistics2.units.rf=Redstone Flux // Colors gui.appliedenergistics2.White=Bianco diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang index dea21627..1ef48080 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang @@ -290,9 +290,7 @@ gui.tooltips.appliedenergistics2.ReportInaccessibleItemsNo=No: Only extractable gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=에너지 단위(EU) -gui.appliedenergistics2.units.mekanism=줄(J) -gui.appliedenergistics2.units.rotarycraft=와트(W) -gui.appliedenergistics2.units.thermalexpansion=레드스톤 유율(RF) +gui.appliedenergistics2.units.rf=레드스톤 유율(RF) gui.appliedenergistics2.White=하양 gui.appliedenergistics2.Orange=주황 diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang index 573f6fb6..81f52eaa 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang @@ -329,9 +329,7 @@ gui.tooltips.appliedenergistics2.ItemsRequestable=Items Solicitáveis: %s // Units gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Energy Units -gui.appliedenergistics2.units.mekanism=Joules -gui.appliedenergistics2.units.rotarycraft=Watts -gui.appliedenergistics2.units.thermalexpansion=Redstone Flux +gui.appliedenergistics2.units.rf=Redstone Flux // Cores gui.appliedenergistics2.White=Branco diff --git a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang index ea49de38..c8b1ec7b 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ro_RO.lang @@ -192,9 +192,7 @@ gui.tooltips.appliedenergistics2.TerminalStyle=Stil de Terminalgui.tooltips.appl gui.appliedenergistics2.units.appliedenergstics=AE gui.appliedenergistics2.units.ic2=Unități de Energie -gui.appliedenergistics2.units.universalelectricity=Kilo Jouli -gui.appliedenergistics2.units.rotarycraft=Wați -gui.appliedenergistics2.units.thermalexpansion=Flux de Piatră-Roşie +gui.appliedenergistics2.units.rf=Flux de Piatră-Roşie gui.appliedenergistics2.White=Alb gui.appliedenergistics2.Orange=Portocaliu