tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try and fix a strange crash that can't happen but is happening anyway.

Browse source
This commit is contained in:
Ben Spiers 2014-01-08 20:16:38 +00:00
parent 2600f8fe81
commit 849273f004
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/mekanism/common/multipart/PartLogisticalTransporter.java
View file

@ -48,7 +48,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PartLogisticalTransporter extends PartSidedPipe implements ILogisticalTransporter, IPipeTile public class PartLogisticalTransporter extends PartSidedPipe implements ILogisticalTransporter, IPipeTile
{ {
public static TransmitterIcons transporterIcons; public static TransmitterIcons transporterIcons = new TransmitterIcons(3, 2);
public static final int SPEED = 5; public static final int SPEED = 5;
@ -80,7 +80,6 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
public static void registerIcons(IconRegister register) public static void registerIcons(IconRegister register)
{ {
transporterIcons = new TransmitterIcons(3, 2);
transporterIcons.registerCenterIcons(register, new String[] {"LogisticalTransporter", "RestrictiveTransporter", "DiversionTransporter"}); transporterIcons.registerCenterIcons(register, new String[] {"LogisticalTransporter", "RestrictiveTransporter", "DiversionTransporter"});
transporterIcons.registerSideIcons(register, new String[] {"LogisticalTransporterSide", "RestrictiveTransporterSide"}); transporterIcons.registerSideIcons(register, new String[] {"LogisticalTransporterSide", "RestrictiveTransporterSide"});
} }

3
common/mekanism/common/multipart/PartMechanicalPipe.java
View file

@ -28,7 +28,7 @@ public class PartMechanicalPipe extends PartTransmitter<FluidNetwork> implements
/** The fake tank used for fluid transfer calculations. */ /** The fake tank used for fluid transfer calculations. */
public FluidTank dummyTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); public FluidTank dummyTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
public static TransmitterIcons pipeIcons; public static TransmitterIcons pipeIcons = new TransmitterIcons(2, 1);
public float currentScale; public float currentScale;
@ -187,7 +187,6 @@ public class PartMechanicalPipe extends PartTransmitter<FluidNetwork> implements
public static void registerIcons(IconRegister register) public static void registerIcons(IconRegister register)
{ {
pipeIcons = new TransmitterIcons(2, 1);
pipeIcons.registerCenterIcons(register, new String[] {"MechanicalPipe", "MechanicalPipeActive"}); pipeIcons.registerCenterIcons(register, new String[] {"MechanicalPipe", "MechanicalPipeActive"});
pipeIcons.registerSideIcons(register, new String[] {"MechanicalPipeSide"}); pipeIcons.registerSideIcons(register, new String[] {"MechanicalPipeSide"});
} }

3
common/mekanism/common/multipart/PartPressurizedTube.java
View file

@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PartPressurizedTube extends PartTransmitter<GasNetwork> public class PartPressurizedTube extends PartTransmitter<GasNetwork>
{ {
public static TransmitterIcons tubeIcons; public static TransmitterIcons tubeIcons = new TransmitterIcons(1, 1);
public float currentScale; public float currentScale;
@ -177,7 +177,6 @@ public class PartPressurizedTube extends PartTransmitter<GasNetwork>
public static void registerIcons(IconRegister register) public static void registerIcons(IconRegister register)
{ {
tubeIcons = new TransmitterIcons(1, 1);
tubeIcons.registerCenterIcons(register, new String[] {"PressurizedTube"}); tubeIcons.registerCenterIcons(register, new String[] {"PressurizedTube"});
tubeIcons.registerSideIcons(register, new String[] {"TransmitterSideSmall"}); tubeIcons.registerSideIcons(register, new String[] {"TransmitterSideSmall"});
} }

3
common/mekanism/common/multipart/PartUniversalCable.java
View file

@ -38,7 +38,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
/** A fake power handler used to initiate energy transfer calculations. */ /** A fake power handler used to initiate energy transfer calculations. */
public PowerHandler powerHandler; public PowerHandler powerHandler;
public static TransmitterIcons cableIcons; public static TransmitterIcons cableIcons = new TransmitterIcons(4, 1);
public double currentPower = 0; public double currentPower = 0;
@ -119,7 +119,6 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
public static void registerIcons(IconRegister register) public static void registerIcons(IconRegister register)
{ {
cableIcons = new TransmitterIcons(4, 1);
cableIcons.registerCenterIcons(register, new String[] {"UniversalCableBasic", "UniversalCableAdvanced", cableIcons.registerCenterIcons(register, new String[] {"UniversalCableBasic", "UniversalCableAdvanced",
"UniversalCableElite", "UniversalCableUltimate"}); "UniversalCableElite", "UniversalCableUltimate"});
cableIcons.registerSideIcons(register, new String[] {"TransmitterSideSmall"}); cableIcons.registerSideIcons(register, new String[] {"TransmitterSideSmall"});