diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 770d7afd2..cba02a74f 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -262,10 +262,10 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public static enum ConfiguratorMode { - CONFIGURATE_ITEMS("configurate", "(" + TransmissionType.ITEM.getName() + ")", EnumColor.BRIGHT_GREEN, true), - CONFIGURATE_FLUIDS("configurate", "(" + TransmissionType.FLUID.getName() + ")", EnumColor.BRIGHT_GREEN, true), - CONFIGURATE_GASES("configurate", "(" + TransmissionType.GAS.getName() + ")", EnumColor.BRIGHT_GREEN, true), - CONFIGURATE_ENERGY("configurate", "(" + TransmissionType.ENERGY.getName() + ")", EnumColor.BRIGHT_GREEN, true), + CONFIGURATE_ITEMS("configurate", "(" + TransmissionType.ITEM.localize() + ")", EnumColor.BRIGHT_GREEN, true), + CONFIGURATE_FLUIDS("configurate", "(" + TransmissionType.FLUID.localize() + ")", EnumColor.BRIGHT_GREEN, true), + CONFIGURATE_GASES("configurate", "(" + TransmissionType.GAS.localize() + ")", EnumColor.BRIGHT_GREEN, true), + CONFIGURATE_ENERGY("configurate", "(" + TransmissionType.ENERGY.localize() + ")", EnumColor.BRIGHT_GREEN, true), EMPTY("empty", "", EnumColor.DARK_RED, false), ROTATE("rotate", "", EnumColor.YELLOW, false), WRENCH("wrench", "", EnumColor.PINK, false); @@ -285,7 +285,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public String getName() { - return MekanismUtils.localize("tooltip.configurator." + name) + info; + return MekanismUtils.localize("tooltip.configurator." + name) + " " + info; } public EnumColor getColor() diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index baddf35fa..18745d918 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -162,6 +162,7 @@ public class PacketConfigurationUpdate implements IMessageHandler sideConfigs = new ArrayList(); - public List> sideOutputs = new ArrayList>(); + public Map sideConfigs = new HashMap(); + public Map> sideOutputs = new HashMap>(); public List transmissions = new ArrayList(); @@ -27,21 +29,22 @@ public class TileComponentConfig implements ITileComponent tileEntity = tile; transmissions = Arrays.asList(types); + //Populate SideData list with empty arrays + for(TransmissionType transmission : types) + { + sideOutputs.put(transmission.ordinal(), new ArrayList()); + } + tile.components.add(this); } public void setConfig(TransmissionType type, byte[] config) { - sideConfigs.set(type.ordinal(), config); + sideConfigs.put(type.ordinal(), config); } public void addOutput(TransmissionType type, SideData data) { - if(sideOutputs.get(type.ordinal()) == null) - { - sideOutputs.set(type.ordinal(), new ArrayList()); - } - sideOutputs.get(type.ordinal()).add(data); } @@ -80,7 +83,7 @@ public class TileComponentConfig implements ITileComponent { for(TransmissionType type : transmissions) { - sideConfigs.set(type.ordinal(), nbtTags.getByteArray("config" + type.ordinal())); + sideConfigs.put(type.ordinal(), nbtTags.getByteArray("config" + type.ordinal())); } } } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 6690c0911..fc4298f99 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -319,6 +319,13 @@ oregas.silver=Silver Ore oregas.obsidian=Obsidian Ore oregas.lead=Lead Ore +//Transmission types +transmission.Energy=Energy +transmission.Fluids=Fluids +transmission.Gases=Gases +transmission.Items=Items +transmission.Heat=Heat + //Update handler text update.consider=Consider updating to version update.newFeatures=New features