Skip to content

Commit e6654e6

Browse files
TechLord22TechLord22
authored
fix issues with fluid colors and textures (GregTechCEu#2005)
1 parent 2622070 commit e6654e6

37 files changed

+139
-46
lines changed

‎src/main/java/gregtech/api/fluids/MetaFluids.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ private static void setCustomTextures() {
115115
setMaterialFluidTexture(Materials.Helium, FluidTypes.PLASMA);
116116
setMaterialFluidTexture(Materials.Helium3, FluidTypes.GAS);
117117
setMaterialFluidTexture(Materials.Fluorine, FluidTypes.GAS);
118+
setMaterialFluidTexture(Materials.Krypton, FluidTypes.GAS);
118119
setMaterialFluidTexture(Materials.TitaniumTetrachloride, FluidTypes.LIQUID);
119120
setMaterialFluidTexture(Materials.Steam, FluidTypes.GAS);
120121
setMaterialFluidTexture(Materials.OilHeavy, FluidTypes.LIQUID);
@@ -130,10 +131,18 @@ private static void setCustomTextures() {
130131
setMaterialFluidTexture(Materials.LightFuel, FluidTypes.LIQUID);
131132
setMaterialFluidTexture(Materials.HeavyFuel, FluidTypes.LIQUID);
132133
setMaterialFluidTexture(Materials.LPG, FluidTypes.GAS);
134+
setMaterialFluidTexture(Materials.LightlySteamCrackedNaphtha, FluidTypes.LIQUID);
135+
setMaterialFluidTexture(Materials.SeverelySteamCrackedNaphtha, FluidTypes.LIQUID);
136+
setMaterialFluidTexture(Materials.LightlyHydroCrackedNaphtha, FluidTypes.LIQUID);
137+
setMaterialFluidTexture(Materials.SeverelyHydroCrackedNaphtha, FluidTypes.LIQUID);
133138
setMaterialFluidTexture(Materials.LightlySteamCrackedLightFuel, FluidTypes.LIQUID);
134139
setMaterialFluidTexture(Materials.SeverelySteamCrackedLightFuel, FluidTypes.LIQUID);
140+
setMaterialFluidTexture(Materials.LightlyHydroCrackedLightFuel, FluidTypes.LIQUID);
141+
setMaterialFluidTexture(Materials.SeverelyHydroCrackedLightFuel, FluidTypes.LIQUID);
135142
setMaterialFluidTexture(Materials.LightlySteamCrackedHeavyFuel, FluidTypes.LIQUID);
136143
setMaterialFluidTexture(Materials.SeverelySteamCrackedHeavyFuel, FluidTypes.LIQUID);
144+
setMaterialFluidTexture(Materials.LightlyHydroCrackedHeavyFuel, FluidTypes.LIQUID);
145+
setMaterialFluidTexture(Materials.SeverelyHydroCrackedHeavyFuel, FluidTypes.LIQUID);
137146
setMaterialFluidTexture(Materials.Chlorine, FluidTypes.GAS);
138147
setMaterialFluidTexture(Materials.CetaneBoostedDiesel, FluidTypes.LIQUID);
139148
setMaterialFluidTexture(Materials.SodiumPersulfate, FluidTypes.LIQUID);
@@ -161,6 +170,8 @@ private static void setCustomTextures() {
161170
setMaterialFluidTexture(Materials.UUMatter, FluidTypes.LIQUID);
162171
setMaterialFluidTexture(Materials.Toluene, FluidTypes.LIQUID);
163172
setMaterialFluidTexture(Materials.LiquidAir, FluidTypes.LIQUID);
173+
setMaterialFluidTexture(Materials.Epichlorohydrin, FluidTypes.LIQUID);
174+
setMaterialFluidTexture(Materials.Glass, FluidTypes.LIQUID);
164175
}
165176

166177
/**

‎src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public static void register() {
152152

153153
Chlorine = new Material.Builder(21, gregtechId("chlorine"))
154154
.fluid(FluidTypes.GAS)
155+
.color(0x2D8C8C, false)
155156
.element(Elements.Cl)
156157
.build();
157158

@@ -206,6 +207,7 @@ public static void register() {
206207

207208
Deuterium = new Material.Builder(28, gregtechId("deuterium"))
208209
.fluid(FluidTypes.GAS)
210+
.color(0xFCFC84, false)
209211
.element(Elements.D)
210212
.build();
211213

@@ -253,6 +255,7 @@ public static void register() {
253255

254256
Fluorine = new Material.Builder(36, gregtechId("fluorine"))
255257
.fluid(FluidTypes.GAS)
258+
.color(0x6EA7DC, false)
256259
.element(Elements.F)
257260
.build();
258261

@@ -313,11 +316,13 @@ public static void register() {
313316

314317
Helium = new Material.Builder(46, gregtechId("helium"))
315318
.fluid(FluidTypes.GAS).plasma()
319+
.color(0xFCFC94, false)
316320
.element(Elements.He)
317321
.build();
318322

319323
Helium3 = new Material.Builder(47, gregtechId("helium_3"))
320324
.fluid(FluidTypes.GAS)
325+
.color(0xFCFCCC, false)
321326
.element(Elements.He3)
322327
.build();
323328

@@ -358,7 +363,7 @@ public static void register() {
358363

359364
Krypton = new Material.Builder(52, gregtechId("krypton"))
360365
.fluid(FluidTypes.GAS)
361-
.color(0x80FF80).iconSet(GAS)
366+
.color(0x80FF80, false).iconSet(GAS)
362367
.element(Elements.Kr)
363368
.build();
364369

@@ -769,6 +774,7 @@ public static void register() {
769774

770775
Tritium = new Material.Builder(114, gregtechId("tritium"))
771776
.fluid(FluidTypes.GAS)
777+
.color(0xFC5C5C, false)
772778
.iconSet(METALLIC)
773779
.element(Elements.T)
774780
.build();

‎src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ public static void register() {
978978

979979
SodiumPersulfate = new Material.Builder(378, gregtechId("sodium_persulfate"))
980980
.fluid()
981+
.color(0x045C5C, false)
981982
.components(Sodium, 2, Sulfur, 2, Oxygen, 8)
982983
.build();
983984

@@ -1092,19 +1093,20 @@ public static void register() {
10921093

10931094
TitaniumTetrachloride = new Material.Builder(398, gregtechId("titanium_tetrachloride"))
10941095
.fluid()
1095-
.color(0xD40D5C)
1096+
.color(0xD40D5C, false)
10961097
.flags(DISABLE_DECOMPOSITION)
10971098
.components(Titanium, 1, Chlorine, 4)
10981099
.build();
10991100

11001101
NitrogenDioxide = new Material.Builder(399, gregtechId("nitrogen_dioxide"))
11011102
.fluid(FluidTypes.GAS)
1102-
.color(0x85FCFF).iconSet(GAS)
1103+
.color(0xF05800).iconSet(GAS)
11031104
.components(Nitrogen, 1, Oxygen, 2)
11041105
.build();
11051106

11061107
HydrogenSulfide = new Material.Builder(400, gregtechId("hydrogen_sulfide"))
11071108
.fluid(FluidTypes.GAS)
1109+
.color(0xFC5304, false)
11081110
.components(Hydrogen, 2, Sulfur, 1)
11091111
.build();
11101112

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

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

12341237
HydrochloricAcid = new Material.Builder(419, gregtechId("hydrochloric_acid"))
12351238
.fluid(FluidTypes.ACID)
1239+
.color(0xBCBCB5, false)
12361240
.components(Hydrogen, 1, Chlorine, 1)
12371241
.build();
12381242

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

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

‎src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public static void register() {
8585

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

157158
Epichlorohydrin = new Material.Builder(1019, gregtechId("epichlorohydrin"))
158159
.fluid()
159-
.color(0x712400)
160+
.color(0x640C04, false)
160161
.components(Carbon, 3, Hydrogen, 5, Chlorine, 1, Oxygen, 1)
161162
.build();
162163

@@ -290,7 +291,7 @@ public static void register() {
290291

291292
DinitrogenTetroxide = new Material.Builder(1039, gregtechId("dinitrogen_tetroxide"))
292293
.fluid(FluidTypes.GAS)
293-
.color(0x004184)
294+
.color(0x570C02)
294295
.components(Nitrogen, 2, Oxygen, 4)
295296
.build();
296297

@@ -387,12 +388,14 @@ public static void register() {
387388

388389
Ethanol = new Material.Builder(1054, gregtechId("ethanol"))
389390
.fluid()
391+
.color(0xFC4C04, false)
390392
.flags(DISABLE_DECOMPOSITION)
391393
.components(Carbon, 2, Hydrogen, 6, Oxygen, 1)
392394
.build();
393395

394396
Toluene = new Material.Builder(1055, gregtechId("toluene"))
395397
.fluid()
398+
.color(0x712400, false)
396399
.flags(DISABLE_DECOMPOSITION)
397400
.components(Carbon, 7, Hydrogen, 8)
398401
.build();

‎src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void register() {
2020

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

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

390391
LiquidAir = new Material.Builder(2051, gregtechId("liquid_air"))
391392
.fluid()
393+
.color(0x84BCFC, false)
392394
.flags(DISABLE_DECOMPOSITION)
393395
.components(Nitrogen, 70, Oxygen, 22, CarbonDioxide, 5, Helium, 2, Argon, 1, Ice, 1)
394396
.fluidTemp(79)

0 commit comments

Comments
 (0)