Some minor updates

Items and machines are displayed in the inventory with colored tips sddsd2332#7 Optimized the GUI display of some machines Added additional item selection fields for generators, tools, and extras Move items that shouldn't be inside OtherDust to the right place Update the version number --中文-- 物品和机器在库存中显示彩色tip sddsd2332#7 优化部分机器的GUI显示对于发电机、工具、以及额外物品添加了额外的物品选择栏将不应该在其他粉尘内的物品移动到正确的地方更新版本号
RuiXuqi · Jan 27, 2023 · d412ff4 · d412ff4
1 parent 395e5dd
commit d412ff4
Show file tree

Hide file tree

Showing 64 changed files with 452 additions and 91 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ minecraft_version=1.12.2
 mappings_version=stable_39
 forge_version=14.23.5.2847
 mod_version=9.8.8
-homebaked=024-sddsd2332
+homebaked=030-sddsd2332
 
 mcmp_version=2.5.3
 jei_version=4.15.0.289

diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
@@ -276,6 +276,13 @@ public void registerItemRenders() {
         registerItemRender(MekanismItems.TierInstaller);
         registerItemRender(MekanismItems.OtherDust);
 
+        registerItemRender(MekanismItems.PlutoniumPellet);
+        registerItemRender(MekanismItems.AntimatterPellet);
+        registerItemRender(MekanismItems.ReprocessedFissileFragment);
+        registerItemRender(MekanismItems.YellowCakeUranium);
+        registerItemRender(MekanismItems.PoloniumPellet);
+
+
      //   registerItemRender(MekanismItems.MekaSuitHelmet);
     //    registerItemRender(MekanismItems.MekaSuitChest);
 

diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java
@@ -44,8 +44,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         String capacityInfo = stored + " / " + (tileEntity.tier.getStorage() == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.tier.getStorage());
         fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
         fontRenderer.drawString(capacityInfo, 45, 40, 0x33ff99);
-        renderScaledText(LangUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName()
-                                                                                                     : LangUtils.localize("gui.none")), 45, 49, 0x33ff99, 112);
+        renderScaledText(LangUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : LangUtils.localize("gui.none")), 45, 49, 0x33ff99, 112);
         fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
         String name = LangUtils.localize(tileEntity.dumping.getLangKey());
         fontRenderer.drawString(name, 156 - fontRenderer.getStringWidth(name), 73, 0x404040);

diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java
@@ -18,7 +18,7 @@ public class ChemicalWasherRecipeCategory<WRAPPER extends ChemicalWasherRecipeWr
 
     public ChemicalWasherRecipeCategory(IGuiHelper helper) {
         super(helper, "mekanism:gui/nei/GuiChemicalWasher.png", Recipe.CHEMICAL_WASHER.getJEICategory(),
-              "tile.MachineBlock2.ChemicalWasher.name", null, 3, 3, 170, 70);
+              "tile.MachineBlock2.ChemicalWasher.name", null, 3, 3, 170, 79);
     }
 
     @Override

diff --git a/src/main/java/mekanism/client/jei/machine/chemical/NutritionalLiquifierRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/NutritionalLiquifierRecipeCategory.java
@@ -23,7 +23,7 @@ public class NutritionalLiquifierRecipeCategory<WRAPPER extends NutritionalLiqui
 
     public NutritionalLiquifierRecipeCategory(IGuiHelper helper) {
         super(helper, "mekanism:gui/GuiChemical.png", Recipe.Nutritional_Liquifier.getJEICategory(),
-              "tile.MachineBlock.NutritionalLiquifier.name", ProgressBar.LARGE_RIGHT, 20, 12, 132, 62);
+              "tile.MachineBlock3.NutritionalLiquifier.name", ProgressBar.LARGE_RIGHT, 20, 12, 132, 62);
     }
 
     @Override

diff --git a/src/main/java/mekanism/client/jei/machine/other/IsotopicRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/IsotopicRecipeCategory.java
@@ -15,7 +15,7 @@ public class IsotopicRecipeCategory<WRAPPER extends IsotopicRecipeWrapper<Isotop
 
     public IsotopicRecipeCategory(IGuiHelper helper) {
         super(helper, "mekanism:gui/nei/GuiIsotopicCentrifuge.png", Recipe.ISOTOPIC_CENTRIFUGE.getJEICategory(),
-              "tile.MachineBlock.IsotopicCentrifuge.name", null, 3, 3, 170, 70);
+              "tile.MachineBlock3.IsotopicCentrifuge.name", null, 3, 3, 170, 79);
     }
 
     @Override

diff --git a/src/main/java/mekanism/common/CreativeTabMekanismAddition.java b/src/main/java/mekanism/common/CreativeTabMekanismAddition.java
@@ -0,0 +1,19 @@
+package mekanism.common;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+
+public class CreativeTabMekanismAddition extends CreativeTabs {
+
+    public CreativeTabMekanismAddition() {
+        super("tabMekanismAddition");
+    }
+
+    @Nonnull
+    @Override
+    public ItemStack createIcon() {
+        return new ItemStack(MekanismItems.WalkieTalkie);
+    }
+}
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
@@ -178,6 +178,7 @@ public class Mekanism {
      * Mekanism creative tab
      */
     public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism();
+    public static CreativeTabMekanismAddition tabMekanismAddition = new CreativeTabMekanismAddition();
     /**
      * List of Mekanism modules loaded
      */
@@ -384,7 +385,7 @@ public static void addRecipes() {
             RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.HARDENED_CLAY), MekanismFluids.Water, new ItemStack(Blocks.CLAY));
             RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.BRICK), MekanismFluids.Water, new ItemStack(Items.CLAY_BALL));
             RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.GUNPOWDER), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.OtherDust, 1, 3));
-            RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(MekanismItems.OtherDust, 1, 10), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.OtherDust, 1, 12));
+            RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(MekanismItems.PlutoniumPellet, 1), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.ReprocessedFissileFragment, 1));
         }
 
         //Precision Sawmill Recipes
@@ -541,7 +542,7 @@ public static void addRecipes() {
         if (MekanismConfig.current().general.machinesManager.isEnabled(MachineType.CHEMICAL_CRYSTALLIZER)) {
             RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Lithium, 100), new ItemStack(MekanismItems.OtherDust, 1, 4));
             RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Brine, 15), new ItemStack(MekanismItems.Salt));
-            RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Antimatter, 1000), new ItemStack(MekanismItems.OtherDust, 1, 11));
+            RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Antimatter, 1000), new ItemStack(MekanismItems.AntimatterPellet,1));
         }
         //CHEMICAL WASHER Recipes
         if (MekanismConfig.current().general.machinesManager.isEnabled(MachineType.CHEMICAL_WASHER)) {
@@ -580,10 +581,10 @@ public static void addRecipes() {
             RecipeHandler.addPRCRecipe(new ItemStack(Items.COAL, 1, OreDictionary.WILDCARD_VALUE), new FluidStack(FluidRegistry.WATER, 100), new GasStack(MekanismFluids.Oxygen, 100),
                     new ItemStack(MekanismItems.OtherDust, 1, 3), new GasStack(MekanismFluids.Hydrogen, 100), 0, 100);
             RecipeHandler.addPRCRecipe(new ItemStack(MekanismItems.OtherDust, 1, 8), new FluidStack(FluidRegistry.WATER, 10000), new GasStack(MekanismFluids.Plutonium, 1000),
-                    new ItemStack(MekanismItems.OtherDust, 1, 10), new GasStack(MekanismFluids.SpentNuclearWaste, 1000), 100000, 2000);
+                    new ItemStack(MekanismItems.PlutoniumPellet, 1), new GasStack(MekanismFluids.SpentNuclearWaste, 1000), 100000, 2000);
             RecipeHandler.addPRCRecipe(new ItemStack(MekanismItems.OtherDust, 1, 8), new FluidStack(FluidRegistry.WATER, 10000), new GasStack(MekanismFluids.Polonium, 1000),
-                    new ItemStack(MekanismItems.OtherDust, 1, 14), new GasStack(MekanismFluids.SpentNuclearWaste, 1000), 100000, 2000);
-            RecipeHandler.addPRCRecipe(new ItemStack(MekanismItems.OtherDust, 64, 12), FluidRegistry.getFluidStack("liquidsuperheatedsodium", 10000), new GasStack(MekanismFluids.Polonium, 10000),
+                    new ItemStack(MekanismItems.PoloniumPellet, 1), new GasStack(MekanismFluids.SpentNuclearWaste, 1000), 100000, 2000);
+            RecipeHandler.addPRCRecipe(new ItemStack(MekanismItems.ReprocessedFissileFragment, 64), FluidRegistry.getFluidStack("liquidsuperheatedsodium", 10000), new GasStack(MekanismFluids.Polonium, 10000),
                     new ItemStack(MekanismItems.OtherDust, 1, 9), new GasStack(MekanismFluids.Antimatter, 1000), 100000, 10000);
         }
         //Antiprotonic Nucleosynthesizer Recipes
@@ -605,8 +606,8 @@ public static void addRecipes() {
         }
         //Chemical Oxidizer Recipes
         if (MekanismConfig.current().general.machinesManager.isEnabled(MachineType.CHEMICAL_OXIDIZER)) {
-            RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(MekanismItems.OtherDust, 1, 12), new GasStack(MekanismFluids.FissileFule, 2000));
-            RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(MekanismItems.OtherDust, 1, 13), new GasStack(MekanismFluids.URANIUMOXIDE, 250));
+            RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(MekanismItems.ReprocessedFissileFragment, 1), new GasStack(MekanismFluids.FissileFule, 2000));
+            RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(MekanismItems.YellowCakeUranium, 1), new GasStack(MekanismFluids.URANIUMOXIDE, 250));
         }
 
         //Isotopic Centrifuge Recipes
@@ -690,11 +691,11 @@ public static void registerOreDict() {
         OreDictionary.registerOre("Fluorite", new ItemStack(MekanismItems.OtherDust, 1, 7));
         OreDictionary.registerOre("FluoriteDust", new ItemStack(MekanismItems.OtherDust, 1, 8));
         OreDictionary.registerOre("CharCoalDust", new ItemStack(MekanismItems.OtherDust, 1, 9));
-        OreDictionary.registerOre("PlutoniumPellet", new ItemStack(MekanismItems.OtherDust, 1, 10));
-        OreDictionary.registerOre("AntimatterPellet", new ItemStack(MekanismItems.OtherDust, 1, 11));
-        OreDictionary.registerOre("ReprocessedFissileFragment", new ItemStack(MekanismItems.OtherDust, 1, 12));
-        OreDictionary.registerOre("YellowCakeUranium", new ItemStack(MekanismItems.OtherDust, 1, 13));
-        OreDictionary.registerOre("PoloniumPellet", new ItemStack(MekanismItems.OtherDust, 1, 14));
+        OreDictionary.registerOre("PlutoniumPellet", new ItemStack(MekanismItems.PlutoniumPellet, 1));
+        OreDictionary.registerOre("AntimatterPellet", new ItemStack(MekanismItems.AntimatterPellet, 1));
+        OreDictionary.registerOre("ReprocessedFissileFragment", new ItemStack(MekanismItems.ReprocessedFissileFragment, 1));
+        OreDictionary.registerOre("YellowCakeUranium", new ItemStack(MekanismItems.YellowCakeUranium, 1));
+        OreDictionary.registerOre("PoloniumPellet", new ItemStack(MekanismItems.PoloniumPellet, 1));
 
 
         OreDictionary.registerOre("ingotRefinedObsidian", new ItemStack(MekanismItems.Ingot, 1, 0));

diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java
@@ -44,7 +44,7 @@ public class MekanismBlocks {
     public static Block MachineBlock3 = BlockMachine.getBlockMachine(MACHINE_BLOCK_3);
     public static Block MachineBlock4 = BlockMachine.getBlockMachine(MACHINE_BLOCK_4);
     public static Block OreBlock = new BlockOre();
-    public static Block ObsidianTNT = new BlockObsidianTNT().setCreativeTab(Mekanism.tabMekanism);
+    public static Block ObsidianTNT = new BlockObsidianTNT().setCreativeTab(Mekanism.tabMekanismAddition);
     public static Block EnergyCube = new BlockEnergyCube();
     public static Block Transmitter = new BlockTransmitter();
     public static Block BoundingBlock = new BlockBounding();

diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java
@@ -52,6 +52,11 @@ public class MekanismItems {
     public static final ItemJetpack ArmoredJetpack = new ItemJetpack();
     public static final ItemFreeRunners FreeRunners = new ItemFreeRunners();
     public static final Item Balloon = new ItemBalloon();
+    public static final Item PlutoniumPellet = new ItemMekanism();;
+    public static final Item AntimatterPellet = new ItemMekanism();;
+    public static final Item ReprocessedFissileFragment = new ItemMekanism();;
+    public static final Item YellowCakeUranium = new ItemMekanism();;
+    public static final Item PoloniumPellet = new ItemMekanism();;
 
     public static final ItemMekTool MekTool = new ItemMekTool();
   //  public static final ItemMekaSuitHelmet MekaSuitHelmet = new ItemMekaSuitHelmet();
@@ -137,6 +142,12 @@ public static void registerItems(IForgeRegistry<Item> registry) {
 
    //     registry.register(init(MekaSuitHelmet, "MekaSuitHelmet"));
   //      registry.register(init(MekaSuitChest, "MekaSuitChest"));
+
+        registry.register(init(PlutoniumPellet,"PlutoniumPellet"));
+        registry.register(init(AntimatterPellet,"AntimatterPellet"));
+        registry.register(init(ReprocessedFissileFragment,"ReprocessedFissileFragment"));
+        registry.register(init(YellowCakeUranium,"YellowCakeUranium"));
+        registry.register(init(PoloniumPellet, "PoloniumPellet"));
     }
 
     public static Item init(Item item, String name) {

diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java
@@ -45,7 +45,7 @@ public class BlockGlowPanel extends BlockTileDrops implements ITileEntityProvide
 
     public BlockGlowPanel() {
         super(Material.PISTON);
-        setCreativeTab(Mekanism.tabMekanism);
+        setCreativeTab(Mekanism.tabMekanismAddition);
         setHardness(1F);
         setResistance(10F);
     }

diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java
@@ -22,7 +22,7 @@ public class BlockObsidianTNT extends Block {
 
     public BlockObsidianTNT() {
         super(Material.TNT);
-        setCreativeTab(Mekanism.tabMekanism);
+        setCreativeTab(Mekanism.tabMekanismAddition);
     }
 
     @Override

diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java
@@ -30,7 +30,7 @@ public BlockPlastic(PlasticBlockType blockType) {
         type = blockType;
         setHardness(type == PlasticBlockType.REINFORCED ? 50F : 5F);
         setResistance(type == PlasticBlockType.REINFORCED ? 2000F : 10F);
-        setCreativeTab(Mekanism.tabMekanism);
+        setCreativeTab(Mekanism.tabMekanismAddition);
         if (type == PlasticBlockType.SLICK) {
             slipperiness = 0.98F;
         }

diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java
@@ -22,7 +22,7 @@ public BlockPlasticFence() {
         super(BlockPlastic.PLASTIC, BlockPlastic.PLASTIC.getMaterialMapColor());
         setHardness(5F);
         setResistance(10F);
-        setCreativeTab(Mekanism.tabMekanism);
+        setCreativeTab(Mekanism.tabMekanismAddition);
     }
 
     @Nonnull

diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java
@@ -26,7 +26,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class ItemBalloon extends ItemMekanism implements IMetaItem {
+public class ItemBalloon extends ItemMekanismAddition implements IMetaItem {
 
     public ItemBalloon() {
         super();

diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java
@@ -103,6 +103,45 @@ public int getMetadata(int i) {
         return i;
     }
 
+    @Nonnull
+    @Override
+    public String getItemStackDisplayName(@Nonnull ItemStack itemstack) {
+        BasicBlockType type = BasicBlockType.get(itemstack);
+        if (type == BasicBlockType.BIN) {
+            BinTier tier= BinTier.values()[getBaseTier(itemstack).ordinal()];
+            if (tier == BinTier.BASIC){
+                return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == BinTier.ADVANCED){
+                return EnumColor.RED + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == BinTier.ELITE){
+                return EnumColor.AQUA + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == BinTier.ULTIMATE){
+                return EnumColor.PURPLE + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name");
+            }else return EnumColor.ORANGE + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (type == BasicBlockType.INDUCTION_CELL){
+            InductionCellTier tier = InductionCellTier.values()[getBaseTier(itemstack).ordinal()];
+            if (tier == InductionCellTier.BASIC){
+                return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == InductionCellTier.ADVANCED){
+                return EnumColor.RED + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == InductionCellTier.ELITE){
+                return EnumColor.AQUA + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name");
+            }else return EnumColor.PURPLE + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name");
+
+
+        }else if (type == BasicBlockType.INDUCTION_PROVIDER){
+            InductionProviderTier tier = InductionProviderTier.values()[getBaseTier(itemstack).ordinal()];
+            if (tier == InductionProviderTier.BASIC){
+                return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == InductionProviderTier.ADVANCED){
+                return EnumColor.RED + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name");
+            }else if (tier == InductionProviderTier.ELITE){
+                return EnumColor.AQUA + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name");
+            }return EnumColor.PURPLE + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name");
+        }
+        return super.getItemStackDisplayName(itemstack);
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List<String> list, @Nonnull ITooltipFlag flag) {

diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
@@ -103,7 +103,16 @@ public ItemStack getUnchargedItem(EnergyCubeTier tier) {
     @Nonnull
     @Override
     public String getItemStackDisplayName(@Nonnull ItemStack itemstack) {
-        return LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name");
+        EnergyCubeTier tier = EnergyCubeTier.values()[getBaseTier(itemstack).ordinal()];
+        if (tier == EnergyCubeTier.BASIC) {
+            return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (tier == EnergyCubeTier.ADVANCED){
+            return EnumColor.RED + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (tier == EnergyCubeTier.ELITE){
+            return EnumColor.AQUA + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (tier == EnergyCubeTier.ULTIMATE){
+            return EnumColor.PURPLE +LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else return EnumColor.ORANGE + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name");
     }
 
     @Override

diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java
@@ -72,7 +72,17 @@ public int getMetadata(int i) {
     @Nonnull
     @Override
     public String getItemStackDisplayName(@Nonnull ItemStack itemstack) {
-        return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name");
+        GasTankTier tier = GasTankTier.values()[getBaseTier(itemstack).ordinal()];
+        if (tier == GasTankTier.BASIC){
+            return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (tier == GasTankTier.ADVANCED){
+            return EnumColor.RED + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (tier == GasTankTier.ELITE){
+            return EnumColor.AQUA + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else if (tier == GasTankTier.ULTIMATE){
+            return EnumColor.PURPLE + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name");
+        }else return EnumColor.ORANGE + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name");
+
     }
 
     @Override