From 120b3c229e733db596ec57fc1501d8d6bb1e1627 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Wed, 24 Dec 2025 14:18:19 +0400 Subject: [PATCH 1/5] Create tuff material --- .../com/gregtechceu/gtceu/common/data/GTMaterials.java | 1 + .../gtceu/common/data/materials/SecondDegreeMaterials.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index fd7896dadf4..a4fb7dad431 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -959,6 +959,7 @@ private static void excludeAllGemsButNormal(Material material) { public static Material Redstone; public static Material Dichloroethane; public static Material Diethylenetriamine; + public static Material Tuff; /** * Third Degree Materials diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java index f66bac60af4..bc03e00f9ca 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java @@ -531,5 +531,12 @@ public static void register() { .components(Carbon, 4, Hydrogen, 13, Nitrogen, 3) .hazard(HazardProperty.HazardTrigger.ANY, GTMedicalConditions.CHEMICAL_BURNS) .buildAndRegister(); + + Tuff = new Material.Builder(GTCEu.id("tuff")) + .dust() + .color(0x4d5046).secondaryColor(0x5d5d52).iconSet(ROUGH) + .flags(NO_SMASHING) + .components(Ash, 2, PotassiumFeldspar, 1) + .buildAndRegister(); } } From 8a1c1d25e1df58c19a1f22c2a78c6aad522cc2b5 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Wed, 24 Dec 2025 14:18:26 +0400 Subject: [PATCH 2/5] Fix blackstone and tuff ores not dropping dusts --- .../java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java index 507f8a2c909..777131be6e6 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java @@ -142,11 +142,10 @@ public boolean isEmpty() { .sound(SoundType.DEEPSLATE), new ResourceLocation("block/deepslate"), false, false, true); - // TODO figure out a composition for tuff public static final TagPrefix oreTuff = oreTagPrefix("tuff", BlockTags.MINEABLE_WITH_PICKAXE) .langValue("Tuff %s Ore") .registerOre( - Blocks.TUFF::defaultBlockState, null, BlockBehaviour.Properties.of() + Blocks.TUFF::defaultBlockState, () -> GTMaterials.Tuff, BlockBehaviour.Properties.of() .mapColor(MapColor.TERRACOTTA_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F) .sound(SoundType.TUFF), new ResourceLocation("block/tuff")); @@ -187,10 +186,9 @@ public boolean isEmpty() { .requiresCorrectToolForDrops().strength(3.0F, 3.0F).sound(SoundType.NETHER_ORE), new ResourceLocation("block/netherrack"), true, false, true); - // TODO figure out a composition for blackstone public static final TagPrefix oreBlackstone = oreTagPrefix("blackstone", BlockTags.MINEABLE_WITH_PICKAXE) .langValue("Blackstone %s Ore") - .registerOre(Blocks.BLACKSTONE::defaultBlockState, null, + .registerOre(Blocks.BLACKSTONE::defaultBlockState, () -> GTMaterials.Blackstone, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK) .instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops() .strength(3.0F, 3.0F), From ae255f3fceaf5afd076a39e7600bfb3096f34d0a Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Wed, 24 Dec 2025 14:18:33 +0400 Subject: [PATCH 3/5] Make blackstone look nicer --- .../gtceu/common/data/materials/HigherDegreeMaterials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java index 3da754a5833..cc7ce118a21 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java @@ -197,7 +197,7 @@ public static void register() { Blackstone = new Material.Builder(GTCEu.id("blackstone")) .dust() - .color(0x090a0a).iconSet(ROUGH) + .color(0x3c3947).secondaryColor(0x160f10).iconSet(ROUGH) .flags(NO_SMASHING) .components(DarkAsh, 2, Basalt, 1, Stone, 5) .buildAndRegister(); From 5274cb429dc888f21c2fd1d53b69280af9c09e7b Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Wed, 24 Dec 2025 14:21:44 +0400 Subject: [PATCH 4/5] More accurate coloring --- .../gtceu/common/data/materials/SecondDegreeMaterials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java index bc03e00f9ca..0bd7ea7c667 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java @@ -534,7 +534,7 @@ public static void register() { Tuff = new Material.Builder(GTCEu.id("tuff")) .dust() - .color(0x4d5046).secondaryColor(0x5d5d52).iconSet(ROUGH) + .color(0x75756a).secondaryColor(0x8a8a80).iconSet(ROUGH) .flags(NO_SMASHING) .components(Ash, 2, PotassiumFeldspar, 1) .buildAndRegister(); From ccbe9714eb4ded661b8ae0b96a641f7856f009f6 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Wed, 24 Dec 2025 14:33:35 +0400 Subject: [PATCH 5/5] Datagen --- src/generated/resources/assets/gtceu/lang/en_ud.json | 1 + src/generated/resources/assets/gtceu/lang/en_us.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 5f7ddfe6700..7c985391652 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -5599,6 +5599,7 @@ "material.gtceu.tritanium": "ɯnıuɐʇıɹ⟘", "material.gtceu.tritium": "ɯnıʇıɹ⟘", "material.gtceu.trona": "ɐuoɹ⟘", + "material.gtceu.tuff": "ɟɟn⟘", "material.gtceu.tungstate": "ǝʇɐʇsbun⟘", "material.gtceu.tungsten": "uǝʇsbun⟘", "material.gtceu.tungsten_carbide": "ǝpıqɹɐƆ uǝʇsbun⟘", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 18b9a4c3d0e..13ff98a83c9 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -5599,6 +5599,7 @@ "material.gtceu.tritanium": "Tritanium", "material.gtceu.tritium": "Tritium", "material.gtceu.trona": "Trona", + "material.gtceu.tuff": "Tuff", "material.gtceu.tungstate": "Tungstate", "material.gtceu.tungsten": "Tungsten", "material.gtceu.tungsten_carbide": "Tungsten Carbide",