change some colors and iconsets, add BRIGHT iconset

GregTechCEu · Aug 6, 2021 · 93a296d · 93a296d
1 parent 455cd7b
commit 93a296d
Show file tree

Hide file tree

Showing 139 changed files with 402 additions and 37 deletions.
diff --git a/src/main/java/gregtech/api/unification/material/info/MaterialIconSet.java b/src/main/java/gregtech/api/unification/material/info/MaterialIconSet.java
@@ -34,7 +34,8 @@ public enum MaterialIconSet {
     GEM_HORIZONTAL,
     GEM_VERTICAL,
     PAPER,
-    NETHERSTAR;
+    NETHERSTAR,
+    BRIGHT;
 
     @ZenGetter("name")
     public String getName() {

diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
@@ -52,6 +52,7 @@ public static void register() {
 
         Arsenic = new Material.Builder(6, "arsenic")
                 .dust()
+                .color(0x676756)
                 .element(Elements.As)
                 .build();
 
@@ -63,7 +64,7 @@ public static void register() {
 
         Barium = new Material.Builder(8, "barium")
                 .ingot().fluid()
-                .iconSet(METALLIC)
+                .color(0x83824C).iconSet(METALLIC)
                 .element(Elements.Ba)
                 .build();
 
@@ -107,7 +108,7 @@ public static void register() {
 
         Caesium = new Material.Builder(15, "caesium")
                 .ingot()
-                .iconSet(METALLIC)
+                .color(0x80620B).iconSet(METALLIC)
                 .element(Elements.Cs)
                 .build();
 
@@ -287,7 +288,7 @@ public static void register() {
 
         Gold = new Material.Builder(41, "gold")
                 .ingot().fluid().ore()
-                .color(0xFFFF1E).iconSet(SHINY)
+                .color(0xFFE650).iconSet(SHINY)
                 .flags(EXT2_METAL, GENERATE_RING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES)
                 .element(Elements.Au)
                 .cableProperties(GTValues.V[3], 2, 2)
@@ -331,7 +332,7 @@ public static void register() {
 
         Indium = new Material.Builder(48, "indium")
                 .ingot().fluid()
-                .color(0x400080).iconSet(METALLIC)
+                .color(0x400080).iconSet(SHINY)
                 .element(Elements.In)
                 .build();
 
@@ -369,7 +370,7 @@ public static void register() {
 
         Lanthanum = new Material.Builder(53, "lanthanum")
                 .ingot().fluid()
-                .iconSet(METALLIC)
+                .color(0x5D7575).iconSet(METALLIC)
                 .element(Elements.La)
                 .blastTemp(1193)
                 .build();
@@ -411,7 +412,7 @@ public static void register() {
 
         Magnesium = new Material.Builder(59, "magnesium")
                 .ingot().fluid()
-                .color(0xE1C8C8).iconSet(METALLIC)
+                .color(0xFFC8C8).iconSet(METALLIC)
                 .element(Elements.Mg)
                 .build();
 
@@ -619,7 +620,7 @@ public static void register() {
 
         Radium = new Material.Builder(88, "radium")
                 .ingot().fluid()
-                .color(0xFFC840).iconSet(SHINY)
+                .color(0xFFFFCD).iconSet(SHINY)
                 .element(Elements.Ra)
                 .build();
 
@@ -632,7 +633,7 @@ public static void register() {
 
         Rhodium = new Material.Builder(90, "rhodium")
                 .ingot().fluid()
-                .color(0xF4F4F4).iconSet(METALLIC)
+                .color(0xF4F4F4).iconSet(SHINY)
                 .flags(EXT2_METAL)
                 .element(Elements.Rh)
                 .blastTemp(2237)
@@ -646,14 +647,14 @@ public static void register() {
 
         Rubidium = new Material.Builder(92, "rubidium")
                 .ingot().fluid()
-                .color(0xF01E1E).iconSet(METALLIC)
+                .color(0xF01E1E).iconSet(SHINY)
                 .flags(STD_METAL)
                 .element(Elements.Rb)
                 .build();
 
         Ruthenium = new Material.Builder(93, "ruthenium")
                 .ingot().fluid()
-                .color(0x646464).iconSet(METALLIC)
+                .color(0x9B9B9B).iconSet(SHINY)
                 .flags(EXT2_METAL)
                 .element(Elements.Ru)
                 .blastTemp(2607)
@@ -733,7 +734,7 @@ public static void register() {
 
         Tantalum = new Material.Builder(104, "tantalum")
                 .ingot().fluid()
-                .iconSet(METALLIC)
+                .color(0x78788c).iconSet(METALLIC)
                 .flags(STD_METAL, GENERATE_FOIL)
                 .element(Elements.Ta)
                 .build();
@@ -856,7 +857,7 @@ public static void register() {
 
         Ytterbium = new Material.Builder(120, "ytterbium")
                 .ingot().fluid()
-                .iconSet(METALLIC)
+                .color(0xA7A7A7).iconSet(METALLIC)
                 .flags(STD_METAL)
                 .element(Elements.Yb)
                 .blastTemp(1097)
@@ -880,7 +881,7 @@ public static void register() {
 
         Zirconium = new Material.Builder(123, "zirconium")
                 .ingot(6).fluid()
-                .color(0xE0E1E1).iconSet(METALLIC)
+                .color(0xC8FFFF).iconSet(METALLIC)
                 .flags(EXT2_METAL)
                 .element(Elements.Zr)
                 .build();
@@ -898,7 +899,7 @@ public static void register() {
 
         NaquadahEnriched = new Material.Builder(125, "naquadah_enriched")
                 .ingot(4).fluid().ore()
-                .color(0x323232).iconSet(METALLIC)
+                .color(0x3C3C3C).iconSet(METALLIC)
                 .flags(EXT_METAL, GENERATE_FOIL)
                 .element(Elements.Nq1)
                 .toolStats(6.0f, 4.0f, 1280)
@@ -932,7 +933,7 @@ public static void register() {
 
         Duranium = new Material.Builder(129, "duranium")
                 .ingot(5).fluid()
-                .iconSet(METALLIC)
+                .color(0x4BAFAF).iconSet(METALLIC)
                 .flags(EXT_METAL, GENERATE_FOIL)
                 .element(Elements.Dr)
                 .toolStats(16.0f, 5.0f, 5120)

diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java
@@ -22,14 +22,14 @@ public static void register() {
                 .build();
 
         Andradite = new Material.Builder(251, "andradite")
-                .dust(1)
-                .color(0x967800).iconSet(ROUGH)
+                .gem(1)
+                .color(0x967800).iconSet(RUBY)
                 .components(Calcium, 3, Iron, 2, Silicon, 3, Oxygen, 12)
                 .build();
 
         AnnealedCopper = new Material.Builder(252, "annealed_copper")
                 .ingot().fluid()
-                .color(0xFF7814).iconSet(SHINY)
+                .color(0xFF8D3B).iconSet(BRIGHT)
                 .flags(EXT2_METAL, MORTAR_GRINDABLE)
                 .components(Copper, 1)
                 .cableProperties(GTValues.V[1], 1, 1)
@@ -64,7 +64,7 @@ public static void register() {
 
         BlueTopaz = new Material.Builder(257, "blue_topaz")
                 .gem(3).ore()
-                .color(0x0000FF).iconSet(GEM_HORIZONTAL)
+                .color(0x7B96DC).iconSet(GEM_HORIZONTAL)
                 .flags(NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT)
                 .components(Aluminium, 2, Silicon, 1, Fluorine, 2, Hydrogen, 2, Oxygen, 6)
                 .toolStats(7.0f, 3.0f, 256)
@@ -242,8 +242,8 @@ public static void register() {
                 .build();
 
         Grossular = new Material.Builder(282, "grossular")
-                .dust(1).ore(6, 1)
-                .color(0xC86400).iconSet(ROUGH)
+                .gem(1).ore(6, 1)
+                .color(0xC86400).iconSet(RUBY)
                 .components(Calcium, 3, Aluminium, 2, Silicon, 3, Oxygen, 12)
                 .build();
 
@@ -445,8 +445,8 @@ public static void register() {
                 .build();
 
         Pyrope = new Material.Builder(308, "pyrope")
-                .dust().ore(4, 1)
-                .color(0x783264).iconSet(METALLIC)
+                .gem().ore(4, 1)
+                .color(0x783264).iconSet(RUBY)
                 .components(Aluminium, 2, Magnesium, 3, Silicon, 3, Oxygen, 12)
                 .build();
 
@@ -535,8 +535,8 @@ public static void register() {
                 .build();
 
         Spessartine = new Material.Builder(321, "spessartine")
-                .dust().ore(2, 1)
-                .color(0xFF6464)
+                .gem().ore(2, 1)
+                .color(0xFF6464).iconSet(RUBY)
                 .components(Aluminium, 2, Manganese, 3, Silicon, 3, Oxygen, 12)
                 .build();
 
@@ -632,8 +632,8 @@ public static void register() {
                 .setFormula("UO2", true);
 
         Uvarovite = new Material.Builder(333, "uvarovite")
-                .dust()
-                .color(0xB4FFB4).iconSet(DIAMOND)
+                .gem()
+                .color(0xB4ffB4).iconSet(RUBY)
                 .components(Calcium, 3, Chrome, 2, Silicon, 3, Oxygen, 12)
                 .build();
 
@@ -858,8 +858,8 @@ public static void register() {
                 .build();
 
         Realgar = new Material.Builder(365, "realgar")
-                .dust(2)
-                .color(0x8C6464)
+                .gem()
+                .color(0x9D2123).iconSet(EMERALD)
                 .flags(DECOMPOSITION_BY_CENTRIFUGING)
                 .components(Arsenic, 4, Sulfur, 4)
                 .build();
@@ -978,8 +978,8 @@ public static void register() {
                 .build();
 
         Malachite = new Material.Builder(385, "malachite")
-                .dust().ore()
-                .color(0x055F05)
+                .gem().ore()
+                .color(0x055F05).iconSet(LAPIS)
                 .components(Copper, 2, Carbon, 1, Hydrogen, 2, Oxygen, 5)
                 .build();
 
@@ -1015,7 +1015,7 @@ public static void register() {
 
         Kaolinite = new Material.Builder(391, "kaolinite")
                 .dust()
-                .color(0xF3EBEB)
+                .color(0xf5EBEB).iconSet(METALLIC)
                 .components(Aluminium, 2, Silicon, 2, Hydrogen, 4, Oxygen, 9)
                 .build();
 

diff --git a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java
@@ -52,7 +52,7 @@ public static void register() {
 
         Basalt = new Material.Builder(2512, "basalt")
                 .dust(1)
-                .color(0x1E1414).iconSet(ROUGH)
+                .color(0x3C3232).iconSet(ROUGH)
                 .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING)
                 .components(Olivine, 1, Calcite, 3, Flint, 8, DarkAsh, 4)
                 .build();

diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java
@@ -154,7 +154,7 @@ public static void register() {
 
         Marble = new Material.Builder(2018, "marble")
                 .dust(1)
-                .color(0xC8C8C8).iconSet(FINE)
+                .color(0xC8C8C8).iconSet(ROUGH)
                 .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING)
                 .components(Magnesium, 1, Calcite, 7)
                 .build();

diff --git a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java
@@ -272,7 +272,7 @@ public static void register() {
 
         Netherrack = new Material.Builder(1604, "netherrack")
                 .dust(1)
-                .color(0xC80000)
+                .color(0xC80000).iconSet(METALLIC)
                 .flags(NO_SMASHING, FLAMMABLE)
                 .build();
 
@@ -327,7 +327,7 @@ public static void register() {
 
         Cocoa = new Material.Builder(1614, "cocoa")
                 .dust(0)
-                .color(0xBE5F00).iconSet(FINE)
+                .color(0x643200).iconSet(FINE)
                 .build();
 
         Wheat = new Material.Builder(1615, "wheat")

diff --git a/src/main/java/gregtech/common/MetaFluids.java b/src/main/java/gregtech/common/MetaFluids.java
@@ -33,6 +33,8 @@ public class MetaFluids {
 
     public static final ResourceLocation AUTO_GENERATED_PLASMA_TEXTURE = new ResourceLocation(
             GTValues.MODID, "blocks/fluids/fluid.plasma.autogenerated");
+    public static final ResourceLocation FLUID_BRIGHT_TEXTURE = new ResourceLocation(
+            GTValues.MODID, "blocks/material_sets/bright/fluid");
     public static final ResourceLocation FLUID_DIAMOND_TEXTURE = new ResourceLocation(
             GTValues.MODID, "blocks/material_sets/diamond/fluid");
     public static final ResourceLocation FLUID_DULL_TEXTURE = new ResourceLocation(
@@ -132,6 +134,7 @@ public static void init() {
          * Every {@link gregtech.api.unification.material.info.MaterialIconSet} that has fluids requires a registered sprite
          */
         fluidSprites.add(AUTO_GENERATED_PLASMA_TEXTURE);
+        fluidSprites.add(FLUID_BRIGHT_TEXTURE);
         fluidSprites.add(FLUID_DIAMOND_TEXTURE);
         fluidSprites.add(FLUID_DULL_TEXTURE);
         fluidSprites.add(FLUID_EMERALD_TEXTURE);

diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/bolt.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/bolt",
+        "layer1": "gregtech:items/material_sets/bright/bolt_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/cell_plasma.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/cell_plasma.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/cell_plasma",
+        "layer1": "gregtech:items/material_sets/bright/cell_plasma_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/crushed",
+        "layer1": "gregtech:items/material_sets/bright/crushed_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_centrifuged.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/crushed_centrifuged"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/crushed_purified.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/crushed_purified"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/dust",
+        "layer1": "gregtech:items/material_sets/bright/dust_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_impure.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/dust_impure",
+        "layer1": "gregtech:items/material_sets/bright/dust_impure_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_pure.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/dust_pure",
+        "layer1": "gregtech:items/material_sets/bright/dust_pure_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_small.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/dust_small",
+        "layer1": "gregtech:items/material_sets/bright/dust_small_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/dust_tiny.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/dust_tiny",
+        "layer1": "gregtech:items/material_sets/bright/dust_tiny_overlay"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/foil.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/foil"
+    }
+}
diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/bright/gear.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gregtech:items/material_sets/bright/gear",
+        "layer1": "gregtech:items/material_sets/bright/gear_overlay"
+    }
+}