From ca9ec783998b6b9bacceda39994d1be2a0914d28 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 24 Mar 2015 08:46:41 -0400 Subject: [PATCH] Make Laser Amplifier require an Advanced Induction Cell, fixed RF & EU display units --- .../mekanism/client/gui/GuiLaserAmplifier.java | 14 ++++---------- src/main/java/mekanism/common/Mekanism.java | 2 +- .../tile/TileEntitySolarNeutronActivator.java | 2 +- .../java/mekanism/common/util/MekanismUtils.java | 4 ++-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 52eccdc8d..e3dc467fa 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -155,12 +155,9 @@ public class GuiLaserAmplifier extends GuiMekanism { double toUse; - try - { + try { toUse = Math.max(0, Double.parseDouble(minField.getText())); - } - catch(Exception e) - { + } catch(Exception e) { minField.setText(""); return; } @@ -181,12 +178,9 @@ public class GuiLaserAmplifier extends GuiMekanism { double toUse; - try - { + try { toUse = Math.max(0, Double.parseDouble(maxField.getText())); - } - catch(Exception e) - { + } catch(Exception e) { maxField.setText(""); return; } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 50d3261ea..034cb21ff 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -491,7 +491,7 @@ public class Mekanism "RE ", "RCD", "RE ", Character.valueOf('R'), "alloyElite", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('D'), "gemDiamond" })); MachineType.LASER_AMPLIFIER.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 14), new Object[] { - "SSS", "SED", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('D'), "gemDiamond" + "SSS", "SED", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismUtils.getInductionCell(InductionCellTier.ADVANCED), Character.valueOf('D'), "gemDiamond" })); MachineType.LASER_TRACTOR_BEAM.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 15), new Object[] { "C", "F", Character.valueOf('C'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('F'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 14) diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index c54c56326..90bf3b479 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -36,7 +36,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im public GasTank outputTank = new GasTank(MAX_GAS); public static final int MAX_GAS = 10000; - public static final int TICKS_REQUIRED = 20; + public static final int TICKS_REQUIRED = 5; public int updateDelay; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index fe4875429..1d7010664 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1189,9 +1189,9 @@ public final class MekanismUtils case J: return UnitDisplayUtils.getDisplayShort(energy, ElectricUnit.JOULES); case RF: - return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX, 0); + return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX); case EU: - return UnitDisplayUtils.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0); + return UnitDisplayUtils.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS); case MJ: return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE / 10, ElectricUnit.MINECRAFT_JOULES); }