diff --git a/src/main/java/mekanism/api/gas/OreGas.java b/src/main/java/mekanism/api/gas/OreGas.java index c82f9ed3f..b9d380ceb 100644 --- a/src/main/java/mekanism/api/gas/OreGas.java +++ b/src/main/java/mekanism/api/gas/OreGas.java @@ -13,6 +13,8 @@ public class OreGas extends Gas super(s, "mekanism:blocks/liquid/Liquid" + (s.contains("clean") ? "Clean" : "") + "Ore"); oreName = name; + + setTint(0xf2cd67);//default old tint } public boolean isClean() diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 40a9841a4..b2cb9f8ed 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -116,4 +116,15 @@ public class GuiGasGauge extends GuiGauge { GasTank getTank(); } + + @Override + public int getRenderColor() + { + if(dummy) + { + return dummyType.getTint(); + } + + return (infoHandler.getTank().getGas() != null) ? infoHandler.getTank().getGas().getGas().getTint() : super.getRenderColor(); + } } diff --git a/src/main/java/mekanism/common/MekanismFluids.java b/src/main/java/mekanism/common/MekanismFluids.java index e724bb1b6..565e2645f 100644 --- a/src/main/java/mekanism/common/MekanismFluids.java +++ b/src/main/java/mekanism/common/MekanismFluids.java @@ -57,9 +57,16 @@ public class MekanismFluids for(Resource resource : Resource.values()) { String name = resource.getName(); + String nameLower = name.toLowerCase(); - OreGas clean = (OreGas)GasRegistry.register(new OreGas("clean" + name, "oregas." + name.toLowerCase()).setVisible(false)); - GasRegistry.register(new OreGas(name.toLowerCase(), "oregas." + name.toLowerCase()).setCleanGas(clean).setVisible(false)); + OreGas clean = new OreGas("clean" + name, "oregas." + nameLower); + clean.setVisible(false).setTint(resource.tint); + + OreGas dirty = new OreGas(nameLower, "oregas." + nameLower).setCleanGas(clean); + dirty.setVisible(false).setTint(resource.tint); + + GasRegistry.register(clean); + GasRegistry.register(dirty); } FluidRegistry.enableUniversalBucket(); diff --git a/src/main/java/mekanism/common/Resource.java b/src/main/java/mekanism/common/Resource.java index 48e4a5ddd..f244d260a 100644 --- a/src/main/java/mekanism/common/Resource.java +++ b/src/main/java/mekanism/common/Resource.java @@ -2,19 +2,21 @@ package mekanism.common; public enum Resource { - IRON("Iron"), - GOLD("Gold"), - OSMIUM("Osmium"), - COPPER("Copper"), - TIN("Tin"), - SILVER("Silver"), - LEAD("Lead"); + IRON("Iron", 0xccccd9), + GOLD("Gold", 0xf2cd67), + OSMIUM("Osmium", 0x1e79c3), + COPPER("Copper", 0xaa4b19), + TIN("Tin", 0xccccd9), + SILVER("Silver", 0xccccd9), + LEAD("Lead", 0x3d3d41); private String name; + public final int tint; - Resource(String s) + Resource(String s, int t) { name = s; + tint = t; } public static Resource getFromName(String s) diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore.png index 12a045fea..8a0bd7c2b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore.png and b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore_orig.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore_orig.png new file mode 100644 index 000000000..12a045fea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidcleanore_orig.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore.png index 45d1b19ab..a298acddd 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore.png and b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore_orig.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore_orig.png new file mode 100644 index 000000000..45d1b19ab Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/liquid/liquidore_orig.png differ