From 849273f004224ef11bcf2f5a1783da5fd017d4e0 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 8 Jan 2014 20:16:38 +0000 Subject: [PATCH] Try and fix a strange crash that can't happen but is happening anyway. --- .../mekanism/common/multipart/PartLogisticalTransporter.java | 3 +-- common/mekanism/common/multipart/PartMechanicalPipe.java | 3 +-- common/mekanism/common/multipart/PartPressurizedTube.java | 3 +-- common/mekanism/common/multipart/PartUniversalCable.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/common/mekanism/common/multipart/PartLogisticalTransporter.java b/common/mekanism/common/multipart/PartLogisticalTransporter.java index bc3e09b86..606fdbf03 100644 --- a/common/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/common/mekanism/common/multipart/PartLogisticalTransporter.java @@ -48,7 +48,7 @@ import cpw.mods.fml.relauncher.SideOnly; 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; @@ -80,7 +80,6 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti public static void registerIcons(IconRegister register) { - transporterIcons = new TransmitterIcons(3, 2); transporterIcons.registerCenterIcons(register, new String[] {"LogisticalTransporter", "RestrictiveTransporter", "DiversionTransporter"}); transporterIcons.registerSideIcons(register, new String[] {"LogisticalTransporterSide", "RestrictiveTransporterSide"}); } diff --git a/common/mekanism/common/multipart/PartMechanicalPipe.java b/common/mekanism/common/multipart/PartMechanicalPipe.java index db0c68a15..2c56bc5a2 100644 --- a/common/mekanism/common/multipart/PartMechanicalPipe.java +++ b/common/mekanism/common/multipart/PartMechanicalPipe.java @@ -28,7 +28,7 @@ public class PartMechanicalPipe extends PartTransmitter implements /** The fake tank used for fluid transfer calculations. */ public FluidTank dummyTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); - public static TransmitterIcons pipeIcons; + public static TransmitterIcons pipeIcons = new TransmitterIcons(2, 1); public float currentScale; @@ -187,7 +187,6 @@ public class PartMechanicalPipe extends PartTransmitter implements public static void registerIcons(IconRegister register) { - pipeIcons = new TransmitterIcons(2, 1); pipeIcons.registerCenterIcons(register, new String[] {"MechanicalPipe", "MechanicalPipeActive"}); pipeIcons.registerSideIcons(register, new String[] {"MechanicalPipeSide"}); } diff --git a/common/mekanism/common/multipart/PartPressurizedTube.java b/common/mekanism/common/multipart/PartPressurizedTube.java index 7a57c4818..5d0d7f17a 100644 --- a/common/mekanism/common/multipart/PartPressurizedTube.java +++ b/common/mekanism/common/multipart/PartPressurizedTube.java @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PartPressurizedTube extends PartTransmitter { - public static TransmitterIcons tubeIcons; + public static TransmitterIcons tubeIcons = new TransmitterIcons(1, 1); public float currentScale; @@ -177,7 +177,6 @@ public class PartPressurizedTube extends PartTransmitter public static void registerIcons(IconRegister register) { - tubeIcons = new TransmitterIcons(1, 1); tubeIcons.registerCenterIcons(register, new String[] {"PressurizedTube"}); tubeIcons.registerSideIcons(register, new String[] {"TransmitterSideSmall"}); } diff --git a/common/mekanism/common/multipart/PartUniversalCable.java b/common/mekanism/common/multipart/PartUniversalCable.java index 63e66bafe..880135c46 100644 --- a/common/mekanism/common/multipart/PartUniversalCable.java +++ b/common/mekanism/common/multipart/PartUniversalCable.java @@ -38,7 +38,7 @@ public class PartUniversalCable extends PartTransmitter implement /** A fake power handler used to initiate energy transfer calculations. */ public PowerHandler powerHandler; - public static TransmitterIcons cableIcons; + public static TransmitterIcons cableIcons = new TransmitterIcons(4, 1); public double currentPower = 0; @@ -119,7 +119,6 @@ public class PartUniversalCable extends PartTransmitter implement public static void registerIcons(IconRegister register) { - cableIcons = new TransmitterIcons(4, 1); cableIcons.registerCenterIcons(register, new String[] {"UniversalCableBasic", "UniversalCableAdvanced", "UniversalCableElite", "UniversalCableUltimate"}); cableIcons.registerSideIcons(register, new String[] {"TransmitterSideSmall"});