diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index b80b38f35..f5bee7e9c 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -89,9 +89,11 @@ public class SettingToggleButton> extends IconButton { registerApp(16 * 7, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash); registerApp(16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, - ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls); + ButtonToolTips.CondenserOutput, + ButtonToolTips.MatterBalls.text(CondenserOutput.MATTER_BALLS.requiredPower)); registerApp(16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY, - ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity); + ButtonToolTips.CondenserOutput, + ButtonToolTips.Singularity.text(CondenserOutput.SINGULARITY.requiredPower)); registerApp(16 * 9 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode, ButtonToolTips.Read); diff --git a/src/main/java/appeng/container/implementations/CondenserContainer.java b/src/main/java/appeng/container/implementations/CondenserContainer.java index b2e71c6a8..636027319 100644 --- a/src/main/java/appeng/container/implementations/CondenserContainer.java +++ b/src/main/java/appeng/container/implementations/CondenserContainer.java @@ -81,7 +81,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv this.requiredEnergy = requiredEnergy == 0 ? (int) maxStorage : (int) Math.min(requiredEnergy, maxStorage); this.storedPower = (int) this.condenser.getStoredPower(); - this.setOutput((CondenserOutput) this.condenser.getConfigManager().getSetting(Settings.CONDENSER_OUTPUT)); + this.output = (CondenserOutput) this.condenser.getConfigManager().getSetting(Settings.CONDENSER_OUTPUT); } super.detectAndSendChanges(); @@ -101,7 +101,4 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv return this.output; } - private void setOutput(final CondenserOutput output) { - this.output = output; - } }