From cea7b17699e5b6abb95a3ba62101f38447c1c358 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:21:47 +0200 Subject: [PATCH] Typo CondenserOuput --- client/gui/widgets/GuiImgButton.java | 8 ++++---- container/implementations/ContainerCondenser.java | 6 +++--- core/AEConfig.java | 6 +++--- tile/misc/TileCondenser.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/gui/widgets/GuiImgButton.java b/client/gui/widgets/GuiImgButton.java index 2e9088ff..02f75e50 100644 --- a/client/gui/widgets/GuiImgButton.java +++ b/client/gui/widgets/GuiImgButton.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import appeng.api.config.AccessRestriction; import appeng.api.config.ActionItems; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.FullnessMode; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; @@ -102,9 +102,9 @@ public class GuiImgButton extends GuiButton implements ITooltip if ( Appearances == null ) { Appearances = new HashMap(); - registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); - registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOuput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); - registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOuput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); + registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); + registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); + 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 + 0, Settings.ACCESS, AccessRestriction.WRITE, ButtonToolTips.IOMode, ButtonToolTips.Write ); diff --git a/container/implementations/ContainerCondenser.java b/container/implementations/ContainerCondenser.java index 87c59a02..ba11eb06 100644 --- a/container/implementations/ContainerCondenser.java +++ b/container/implementations/ContainerCondenser.java @@ -1,7 +1,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.InventoryPlayer; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; @@ -38,7 +38,7 @@ public class ContainerCondenser extends AEBaseContainer this.requiredEnergy = (int) maxDisplay; 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(); @@ -51,6 +51,6 @@ public class ContainerCondenser extends AEBaseContainer public long storedPower = 0; @GuiSync(2) - public CondenserOuput output = CondenserOuput.TRASH; + public CondenserOutput output = CondenserOutput.TRASH; } diff --git a/core/AEConfig.java b/core/AEConfig.java index 0a898cad..a419e6aa 100644 --- a/core/AEConfig.java +++ b/core/AEConfig.java @@ -7,7 +7,7 @@ import java.util.List; import net.minecraftforge.common.config.Configuration; 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.PowerUnits; 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 ); PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective ); - CondenserOuput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); - CondenserOuput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); + CondenserOutput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); + CondenserOutput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); grinderOres = get( "GrindStone", "grinderOres", grinderOres ).getStringList(); oreDoublePercentage = get( "GrindStone", "oreDoublePercentage", oreDoublePercentage ).getDouble( oreDoublePercentage ); diff --git a/tile/misc/TileCondenser.java b/tile/misc/TileCondenser.java index 7071e1d3..bd7991da 100644 --- a/tile/misc/TileCondenser.java +++ b/tile/misc/TileCondenser.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import appeng.api.AEApi; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; import appeng.api.implementations.items.IStorageComponent; import appeng.api.util.IConfigManager; @@ -49,7 +49,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, } public TileCondenser() { - cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH ); + cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH ); } public double getStorage() @@ -112,7 +112,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, private ItemStack getOutput() { - switch ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )) + switch ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT )) { case MATTER_BALLS: return AEApi.instance().materials().materialMatterBall.stack( 1 ); @@ -126,7 +126,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, public double getRequiredPower() { - return ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower; + return ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower; } @Override