diff options
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/enums/Dimensions.java | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/UndergroundFluidNames.java | 67 |
2 files changed, 36 insertions, 35 deletions
diff --git a/src/main/java/gregtech/api/enums/Dimensions.java b/src/main/java/gregtech/api/enums/Dimensions.java index 21dee59977..d4c681e83f 100644 --- a/src/main/java/gregtech/api/enums/Dimensions.java +++ b/src/main/java/gregtech/api/enums/Dimensions.java @@ -23,11 +23,11 @@ public enum Dimensions { BarnardaF("BarnardaF"), TCetiE("TCetiE"), Ross128b("Ross128b"), - Ross128ba("Ross128ba"),; + Ross128ba("Ross128ba"); public final String id; - private Dimensions(String id) { + Dimensions(String id) { this.id = id; } } diff --git a/src/main/java/gregtech/api/enums/UndergroundFluidNames.java b/src/main/java/gregtech/api/enums/UndergroundFluidNames.java index 5e96544bd2..40d9e9cfd2 100644 --- a/src/main/java/gregtech/api/enums/UndergroundFluidNames.java +++ b/src/main/java/gregtech/api/enums/UndergroundFluidNames.java @@ -2,42 +2,43 @@ package gregtech.api.enums; public enum UndergroundFluidNames { - carbonDioxide("carbondioxide"), - carbonMonoxide("carbonmonoxide"), - chlorobenzene("chlorobenzene"), - deuterium("deuterium"), - distilledWater("ic2distilledwater"), - ethane("ethane"), - ethylene("ethylene"), - fluorine("fluorine"), - heavyOil("liquid_heavy_oil"), - helium3("helium-3"), - hydrofluoricAcid("hydrofluoricacid_gt5u"), - hydrogen("hydrogen"), - hydrogenSulfide("liquid_hydricsulfur"), - lava("lava"), - lightOil("liquid_light_oil"), - liquidAir("liquidair"), - mediumOil("liquid_medium_oil"), - methane("methane"), - moltenCopper("molten.copper"), - moltenIron("molten.iron"), - moltenLead("molten.lead"), - moltenTin("molten.tin"), - naturalGas("gas_natural_gas"), - nitrogen("nitrogen"), - oil("oil"), - oxygen("oxygen"), - saltWater("saltwater"), - sulfuricAcid("sulfuricacid"), - unknownWater("unknowwater"), - veryHeavyOil("liquid_extra_heavy_oil"), - - ; + carbonDioxide("carbondioxide", new short[] { 0x69, 0x69, 0x69 }), + carbonMonoxide("carbonmonoxide", new short[] { 0x10, 0x4E, 0x8B }), + chlorobenzene("chlorobenzene", new short[] { 0x40, 0x80, 0x40 }), + deuterium("deuterium", new short[] { 0xFF, 0xE3, 0x9F }), + distilledWater("ic2distilledwater", new short[] { 0x1E, 0x90, 0xFF }), + ethane("ethane", new short[] { 0x40, 0x80, 0x20 }), + ethylene("ethylene", new short[] { 0xd0, 0xd0, 0xd0 }), + fluorine("fluorine", new short[] { 0x99, 0xC1, 0xAD }), + heavyOil("liquid_heavy_oil", new short[] { 10, 10, 10 }), + helium3("helium-3", new short[] { 0x80, 0x20, 0xe0 }), + hydrofluoricAcid("hydrofluoricacid_gt5u", new short[] { 0x00, 0xCE, 0xD1 }), + hydrogen("hydrogen", new short[] { 0x32, 0x32, 0xD6 }), + hydrogenSulfide("liquid_hydricsulfur", null), + lava("lava", new short[] { 0xFF, 0x00, 0x00 }), + lightOil("liquid_light_oil", new short[] { 0xff, 0xff, 0x00 }), + liquidAir("liquidair", new short[] { 0x99, 0x99, 0xEA }), + mediumOil("liquid_medium_oil", new short[] { 0x00, 0xFF, 0x00 }), + methane("methane", new short[] { 0x80, 0x20, 0x20 }), + moltenCopper("molten.copper", new short[] { 0xFF, 0x7F, 0x24 }), + moltenIron("molten.iron", new short[] { 0x8B, 0x88, 0x78 }), + moltenLead("molten.lead", new short[] { 0xd0, 0xd0, 0xd0 }), + moltenTin("molten.tin", new short[] { 0xE7, 0xE7, 0xE4 }), + naturalGas("gas_natural_gas", new short[] { 0x00, 0xff, 0xff }), + nitrogen("nitrogen", new short[] { 0x00, 0x80, 0xd0 }), + oil("oil", new short[] { 0x00, 0x00, 0x00 }), + oxygen("oxygen", new short[] { 0x40, 0x40, 0xA0 }), + saltWater("saltwater", new short[] { 0x80, 0xff, 0x80 }), + sulfuricAcid("sulfuricacid", new short[] { 0xFF, 0xB9, 0x0F }), + unknownWater("unknowwater", new short[] { 0x8A, 0x2B, 0xE2 }), + veryHeavyOil("liquid_extra_heavy_oil", new short[] { 0x00, 0x00, 0x50 }); public final String name; + // color override used for detrav ore scanner + public final short[] renderColor; - private UndergroundFluidNames(String name) { + UndergroundFluidNames(String name, short[] renderColor) { this.name = name; + this.renderColor = renderColor; } } |