Make Laser Amplifier require an Advanced Induction Cell, fixed RF & EU display units
This commit is contained in:
parent
6892156454
commit
ca9ec78399
4 changed files with 8 additions and 14 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue