tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Typo CondenserOuput

Browse source
This commit is contained in:
thatsIch 2014-09-20 22:21:47 +02:00
parent d5223e56ea
commit cea7b17699
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/gui/widgets/GuiImgButton.java
View file

@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11;
import appeng.api.config.AccessRestriction; import appeng.api.config.AccessRestriction;
import appeng.api.config.ActionItems; import appeng.api.config.ActionItems;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.FullnessMode; import appeng.api.config.FullnessMode;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.api.config.LevelType; import appeng.api.config.LevelType;
@ -102,9 +102,9 @@ public class GuiImgButton extends GuiButton implements ITooltip
if ( Appearances == null ) if ( Appearances == null )
{ {
Appearances = new HashMap(); Appearances = new HashMap();
registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash );
registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOuput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls );
registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOuput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity );
registerApp( 16 * 9 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode, ButtonToolTips.Read ); registerApp( 16 * 9 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode, ButtonToolTips.Read );
registerApp( 16 * 9 + 0, Settings.ACCESS, AccessRestriction.WRITE, ButtonToolTips.IOMode, ButtonToolTips.Write ); registerApp( 16 * 9 + 0, Settings.ACCESS, AccessRestriction.WRITE, ButtonToolTips.IOMode, ButtonToolTips.Write );

6
container/implementations/ContainerCondenser.java
View file

@ -1,7 +1,7 @@
package appeng.container.implementations; package appeng.container.implementations;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.guisync.GuiSync; import appeng.container.guisync.GuiSync;
@ -38,7 +38,7 @@ public class ContainerCondenser extends AEBaseContainer
this.requiredEnergy = (int) maxDisplay; this.requiredEnergy = (int) maxDisplay;
this.storedPower = (int) this.myte.storedPower; this.storedPower = (int) this.myte.storedPower;
this.output = (CondenserOuput) this.myte.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT ); this.output = (CondenserOutput) this.myte.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT );
} }
super.detectAndSendChanges(); super.detectAndSendChanges();
@ -51,6 +51,6 @@ public class ContainerCondenser extends AEBaseContainer
public long storedPower = 0; public long storedPower = 0;
@GuiSync(2) @GuiSync(2)
public CondenserOuput output = CondenserOuput.TRASH; public CondenserOutput output = CondenserOutput.TRASH;
} }

6
core/AEConfig.java
View file

@ -7,7 +7,7 @@ import java.util.List;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerMultiplier;
import appeng.api.config.PowerUnits; import appeng.api.config.PowerUnits;
import appeng.api.config.SearchBoxMode; import appeng.api.config.SearchBoxMode;
@ -223,8 +223,8 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
double usageEffective = get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 ); double usageEffective = get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 );
PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective ); PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective );
CondenserOuput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); CondenserOutput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 );
CondenserOuput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); CondenserOutput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 );
grinderOres = get( "GrindStone", "grinderOres", grinderOres ).getStringList(); grinderOres = get( "GrindStone", "grinderOres", grinderOres ).getStringList();
oreDoublePercentage = get( "GrindStone", "oreDoublePercentage", oreDoublePercentage ).getDouble( oreDoublePercentage ); oreDoublePercentage = get( "GrindStone", "oreDoublePercentage", oreDoublePercentage ).getDouble( oreDoublePercentage );

8
tile/misc/TileCondenser.java
View file

@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.implementations.items.IStorageComponent; import appeng.api.implementations.items.IStorageComponent;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
@ -49,7 +49,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory,
} }
public TileCondenser() { public TileCondenser() {
cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH ); cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH );
} }
public double getStorage() public double getStorage()
@ -112,7 +112,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory,
private ItemStack getOutput() private ItemStack getOutput()
{ {
switch ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )) switch ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT ))
{ {
case MATTER_BALLS: case MATTER_BALLS:
return AEApi.instance().materials().materialMatterBall.stack( 1 ); return AEApi.instance().materials().materialMatterBall.stack( 1 );
@ -126,7 +126,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory,
public double getRequiredPower() public double getRequiredPower()
{ {
return ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower; return ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower;
} }
@Override @Override