Skip to content

Commit

Permalink
fix fluid colors and update some textures
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 committed Jul 26, 2023
1 parent 4412c71 commit a6fc06c
Show file tree
Hide file tree
Showing 37 changed files with 140 additions and 47 deletions.
11 changes: 11 additions & 0 deletions src/main/java/gregtech/api/fluids/MetaFluids.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ private static void setCustomTextures() {
setMaterialFluidTexture(Materials.Helium, FluidTypes.PLASMA);
setMaterialFluidTexture(Materials.Helium3, FluidTypes.GAS);
setMaterialFluidTexture(Materials.Fluorine, FluidTypes.GAS);
setMaterialFluidTexture(Materials.Krypton, FluidTypes.GAS);
setMaterialFluidTexture(Materials.TitaniumTetrachloride, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.Steam, FluidTypes.GAS);
setMaterialFluidTexture(Materials.OilHeavy, FluidTypes.LIQUID);
Expand All @@ -130,10 +131,18 @@ private static void setCustomTextures() {
setMaterialFluidTexture(Materials.LightFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.HeavyFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LPG, FluidTypes.GAS);
setMaterialFluidTexture(Materials.LightlySteamCrackedNaphtha, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SeverelySteamCrackedNaphtha, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LightlyHydroCrackedNaphtha, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SeverelyHydroCrackedNaphtha, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LightlySteamCrackedLightFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SeverelySteamCrackedLightFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LightlyHydroCrackedLightFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SeverelyHydroCrackedLightFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LightlySteamCrackedHeavyFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SeverelySteamCrackedHeavyFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LightlyHydroCrackedHeavyFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SeverelyHydroCrackedHeavyFuel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.Chlorine, FluidTypes.GAS);
setMaterialFluidTexture(Materials.CetaneBoostedDiesel, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.SodiumPersulfate, FluidTypes.LIQUID);
Expand Down Expand Up @@ -161,6 +170,8 @@ private static void setCustomTextures() {
setMaterialFluidTexture(Materials.UUMatter, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.Toluene, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.LiquidAir, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.Epichlorohydrin, FluidTypes.LIQUID);
setMaterialFluidTexture(Materials.Glass, FluidTypes.LIQUID);
}

/**
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ public static void register() {

Chlorine = new Material.Builder(21, gregtechId("chlorine"))
.fluid(FluidTypes.GAS)
.color(0x2D8C8C, false)
.element(Elements.Cl)
.build();

Expand Down Expand Up @@ -206,6 +207,7 @@ public static void register() {

Deuterium = new Material.Builder(28, gregtechId("deuterium"))
.fluid(FluidTypes.GAS)
.color(0xFCFC84, false)
.element(Elements.D)
.build();

Expand Down Expand Up @@ -253,6 +255,7 @@ public static void register() {

Fluorine = new Material.Builder(36, gregtechId("fluorine"))
.fluid(FluidTypes.GAS)
.color(0x6EA7DC, false)
.element(Elements.F)
.build();

Expand Down Expand Up @@ -313,11 +316,13 @@ public static void register() {

Helium = new Material.Builder(46, gregtechId("helium"))
.fluid(FluidTypes.GAS).plasma()
.color(0xFCFC94, false)
.element(Elements.He)
.build();

Helium3 = new Material.Builder(47, gregtechId("helium_3"))
.fluid(FluidTypes.GAS)
.color(0xFCFCCC, false)
.element(Elements.He3)
.build();

Expand Down Expand Up @@ -346,7 +351,7 @@ public static void register() {

Iron = new Material.Builder(51, gregtechId("iron"))
.ingot().fluid().plasma().ore()
.color(0xC8C8C8).iconSet(METALLIC)
.color(0xC8C8C8, false).iconSet(METALLIC)
.flags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_GEAR, GENERATE_SPRING_SMALL, GENERATE_SPRING, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, BLAST_FURNACE_CALCITE_TRIPLE)
.element(Elements.Fe)
.toolStats(ToolProperty.Builder.of(2.0F, 2.0F, 256, 2)
Expand All @@ -358,7 +363,7 @@ public static void register() {

Krypton = new Material.Builder(52, gregtechId("krypton"))
.fluid(FluidTypes.GAS)
.color(0x80FF80).iconSet(GAS)
.color(0x80FF80, false).iconSet(GAS)
.element(Elements.Kr)
.build();

Expand Down Expand Up @@ -769,6 +774,7 @@ public static void register() {

Tritium = new Material.Builder(114, gregtechId("tritium"))
.fluid(FluidTypes.GAS)
.color(0xFC5C5C, false)
.iconSet(METALLIC)
.element(Elements.T)
.build();
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,7 @@ public static void register() {

SodiumPersulfate = new Material.Builder(378, gregtechId("sodium_persulfate"))
.fluid()
.color(0x045C5C, false)
.components(Sodium, 2, Sulfur, 2, Oxygen, 8)
.build();

Expand Down Expand Up @@ -1092,19 +1093,20 @@ public static void register() {

TitaniumTetrachloride = new Material.Builder(398, gregtechId("titanium_tetrachloride"))
.fluid()
.color(0xD40D5C)
.color(0xD40D5C, false)
.flags(DISABLE_DECOMPOSITION)
.components(Titanium, 1, Chlorine, 4)
.build();

NitrogenDioxide = new Material.Builder(399, gregtechId("nitrogen_dioxide"))
.fluid(FluidTypes.GAS)
.color(0x85FCFF).iconSet(GAS)
.color(0xF05800).iconSet(GAS)
.components(Nitrogen, 1, Oxygen, 2)
.build();

HydrogenSulfide = new Material.Builder(400, gregtechId("hydrogen_sulfide"))
.fluid(FluidTypes.GAS)
.color(0xFC5304, false)
.components(Hydrogen, 2, Sulfur, 1)
.build();

Expand All @@ -1117,6 +1119,7 @@ public static void register() {

SulfuricAcid = new Material.Builder(402, gregtechId("sulfuric_acid"))
.fluid(FluidTypes.ACID)
.color(0xFC5304, false)
.flags(DISABLE_DECOMPOSITION)
.components(Hydrogen, 2, Sulfur, 1, Oxygen, 4)
.build();
Expand Down Expand Up @@ -1233,11 +1236,13 @@ public static void register() {

HydrochloricAcid = new Material.Builder(419, gregtechId("hydrochloric_acid"))
.fluid(FluidTypes.ACID)
.color(0xBCBCB5, false)
.components(Hydrogen, 1, Chlorine, 1)
.build();

Steam = new Material.Builder(420, gregtechId("steam"))
.fluid(FluidTypes.GAS, true)
.color(0xC4C4C4, false)
.flags(DISABLE_DECOMPOSITION)
.components(Hydrogen, 2, Oxygen, 1)
.fluidTemp(373)
Expand Down Expand Up @@ -1398,6 +1403,7 @@ public static void register() {

FluoroantimonicAcid = new Material.Builder(438, gregtechId("fluoroantimonic_acid"))
.fluid(FluidTypes.ACID)
.color(0x8CA4C4, false)
.components(Hydrogen, 2, Antimony, 1, Fluorine, 7)
.build();

Expand Down
7 changes: 5 additions & 2 deletions src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public static void register() {

GlycerylTrinitrate = new Material.Builder(1009, gregtechId("glyceryl_trinitrate"))
.fluid()
.color(0x04443C, false)
.flags(FLAMMABLE, EXPLOSIVE)
.components(Carbon, 3, Hydrogen, 5, Nitrogen, 3, Oxygen, 9)
.build();
Expand Down Expand Up @@ -156,7 +157,7 @@ public static void register() {

Epichlorohydrin = new Material.Builder(1019, gregtechId("epichlorohydrin"))
.fluid()
.color(0x712400)
.color(0x640C04, false)
.components(Carbon, 3, Hydrogen, 5, Chlorine, 1, Oxygen, 1)
.build();

Expand Down Expand Up @@ -290,7 +291,7 @@ public static void register() {

DinitrogenTetroxide = new Material.Builder(1039, gregtechId("dinitrogen_tetroxide"))
.fluid(FluidTypes.GAS)
.color(0x004184)
.color(0x570C02)
.components(Nitrogen, 2, Oxygen, 4)
.build();

Expand Down Expand Up @@ -387,12 +388,14 @@ public static void register() {

Ethanol = new Material.Builder(1054, gregtechId("ethanol"))
.fluid()
.color(0xFC4C04, false)
.flags(DISABLE_DECOMPOSITION)
.components(Carbon, 2, Hydrogen, 6, Oxygen, 1)
.build();

Toluene = new Material.Builder(1055, gregtechId("toluene"))
.fluid()
.color(0x712400, false)
.flags(DISABLE_DECOMPOSITION)
.components(Carbon, 7, Hydrogen, 8)
.build();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static void register() {

Glass = new Material.Builder(2000, gregtechId("glass"))
.gem(0).fluid()
.color(0xFAFAFA).iconSet(GLASS)
.color(0xFAFAFA, false).iconSet(GLASS)
.flags(GENERATE_LENS, NO_SMASHING, EXCLUDE_BLOCK_CRAFTING_RECIPES, DECOMPOSITION_BY_CENTRIFUGING)
.components(SiliconDioxide, 1)
.fluidTemp(1200)
Expand Down Expand Up @@ -345,6 +345,7 @@ public static void register() {

LeadZincSolution = new Material.Builder(2045, gregtechId("lead_zinc_solution"))
.fluid()
.color(0x3C0404, false)
.flags(DECOMPOSITION_BY_CENTRIFUGING)
.components(Lead, 1, Silver, 1, Zinc, 1, Sulfur, 3, Water, 1)
.build();
Expand Down Expand Up @@ -389,6 +390,7 @@ public static void register() {

LiquidAir = new Material.Builder(2051, gregtechId("liquid_air"))
.fluid()
.color(0x84BCFC, false)
.flags(DISABLE_DECOMPOSITION)
.components(Nitrogen, 70, Oxygen, 22, CarbonDioxide, 5, Helium, 2, Argon, 1, Ice, 1)
.fluidTemp(79)
Expand Down
Loading

0 comments on commit a6fc06c

Please sign in to comment.