From 2f1283ca83f2387eb6742c99e0d0062bfc898837 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 15 Mar 2025 12:16:09 +0000 Subject: [PATCH 1/6] Added correct sounds for deepslate and tuff ores --- .../java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 748e205a4ac..cd31a096c85 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 @@ -130,7 +130,8 @@ public static TagPrefix get(String name) { .langValue("Deepslate %s Ore") .registerOre( Blocks.DEEPSLATE::defaultBlockState, () -> GTMaterials.Deepslate, BlockBehaviour.Properties.of() - .mapColor(MapColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3.0F), + .mapColor(MapColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3.0F) + .sound(SoundType.DEEPSLATE), new ResourceLocation("block/deepslate"), false, false, true); // TODO figure out a composition for tuff @@ -138,7 +139,8 @@ public static TagPrefix get(String name) { .langValue("Tuff %s Ore") .registerOre( Blocks.TUFF::defaultBlockState, null, BlockBehaviour.Properties.of() - .mapColor(MapColor.TERRACOTTA_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F), + .mapColor(MapColor.TERRACOTTA_GRAY).requiresCorrectToolForDrops().strength(3.0F, 3.0F) + .sound(SoundType.TUFF), new ResourceLocation("block/tuff")); public static final TagPrefix oreSand = oreTagPrefix("sand", BlockTags.MINEABLE_WITH_SHOVEL) From 883189f2bd30dab62138ca3dd4612d018aa53674 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 15 Dec 2025 21:04:52 +0000 Subject: [PATCH 2/6] add missing cobble replacements --- src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index c05e86871fd..8f5d04487a9 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -1427,6 +1427,8 @@ private static void initializeCobbleReplacements() { registerCobbleBlock(TagPrefix.oreAndesite, Blocks.ANDESITE::defaultBlockState); registerCobbleBlock(TagPrefix.oreDiorite, Blocks.DIORITE::defaultBlockState); registerCobbleBlock(TagPrefix.oreGranite, Blocks.GRANITE::defaultBlockState); + registerCobbleBlock(TagPrefix.oreRedGranite, GTBlocks.RED_GRANITE::getDefaultState); + registerCobbleBlock(TagPrefix.oreMarble, GTBlocks.MARBLE::getDefaultState); registerCobbleBlock(TagPrefix.oreSand, Blocks.SAND::defaultBlockState); registerCobbleBlock(TagPrefix.oreGravel, Blocks.GRAVEL::defaultBlockState); registerCobbleBlock(TagPrefix.oreRedSand, Blocks.RED_SAND::defaultBlockState); From ead0e74e28584067452cb4a956944887f5112048 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 15 Dec 2025 21:15:25 +0000 Subject: [PATCH 3/6] no wait this is better --- src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index 8f5d04487a9..57df6a30e8a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -1427,8 +1427,8 @@ private static void initializeCobbleReplacements() { registerCobbleBlock(TagPrefix.oreAndesite, Blocks.ANDESITE::defaultBlockState); registerCobbleBlock(TagPrefix.oreDiorite, Blocks.DIORITE::defaultBlockState); registerCobbleBlock(TagPrefix.oreGranite, Blocks.GRANITE::defaultBlockState); - registerCobbleBlock(TagPrefix.oreRedGranite, GTBlocks.RED_GRANITE::getDefaultState); - registerCobbleBlock(TagPrefix.oreMarble, GTBlocks.MARBLE::getDefaultState); + registerCobbleBlock(TagPrefix.oreRedGranite, STONE_BLOCKS.get(StoneBlockType.COBBLE, StoneTypes.RED_GRANITE)::getDefaultState); + registerCobbleBlock(TagPrefix.oreMarble, STONE_BLOCKS.get(StoneBlockType.COBBLE, StoneTypes.MARBLE)::getDefaultState); registerCobbleBlock(TagPrefix.oreSand, Blocks.SAND::defaultBlockState); registerCobbleBlock(TagPrefix.oreGravel, Blocks.GRAVEL::defaultBlockState); registerCobbleBlock(TagPrefix.oreRedSand, Blocks.RED_SAND::defaultBlockState); From 433f525a5dab3eda5244aed24d59f75e4b359496 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 5 Jan 2026 12:15:12 +0000 Subject: [PATCH 4/6] spotless but manual --- .../java/com/gregtechceu/gtceu/common/data/GTBlocks.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index 57df6a30e8a..a91932797f8 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -1427,8 +1427,10 @@ private static void initializeCobbleReplacements() { registerCobbleBlock(TagPrefix.oreAndesite, Blocks.ANDESITE::defaultBlockState); registerCobbleBlock(TagPrefix.oreDiorite, Blocks.DIORITE::defaultBlockState); registerCobbleBlock(TagPrefix.oreGranite, Blocks.GRANITE::defaultBlockState); - registerCobbleBlock(TagPrefix.oreRedGranite, STONE_BLOCKS.get(StoneBlockType.COBBLE, StoneTypes.RED_GRANITE)::getDefaultState); - registerCobbleBlock(TagPrefix.oreMarble, STONE_BLOCKS.get(StoneBlockType.COBBLE, StoneTypes.MARBLE)::getDefaultState); + registerCobbleBlock(TagPrefix.oreRedGranite, + STONE_BLOCKS.get(StoneBlockType.COBBLE, StoneTypes.RED_GRANITE)::getDefaultState); + registerCobbleBlock(TagPrefix.oreMarble, + STONE_BLOCKS.get(StoneBlockType.COBBLE, StoneTypes.MARBLE)::getDefaultState); registerCobbleBlock(TagPrefix.oreSand, Blocks.SAND::defaultBlockState); registerCobbleBlock(TagPrefix.oreGravel, Blocks.GRAVEL::defaultBlockState); registerCobbleBlock(TagPrefix.oreRedSand, Blocks.RED_SAND::defaultBlockState); From 52d45c5c0046226e5ec07f714518991960f7a6e3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 7 Jan 2026 19:45:28 +0000 Subject: [PATCH 5/6] Update SecondDegreeMaterials.java --- .../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 0bd7ea7c667..4ece776f76b 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 @@ -107,7 +107,7 @@ public static void register() { Apatite = new Material.Builder(GTCEu.id("apatite")) .gem(1).ore(4, 2) .color(0x06cdf1).secondaryColor(0x701c07).iconSet(DIAMOND) - .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW, DISABLE_DECOMPOSITION) + .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, DISABLE_DECOMPOSITION) .components(Calcium, 5, Phosphate, 3, Chlorine, 1) .buildAndRegister(); From 7eaabbee9db76ca69bab1abc7076b20c0bb6868c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 7 Jan 2026 19:51:12 +0000 Subject: [PATCH 6/6] remove rubber screw, bolt, and gear --- .../gtceu/common/data/materials/OrganicChemistryMaterials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java index 545e3030f6e..b581ac7cf73 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java @@ -509,7 +509,7 @@ public static void register() { .color(0x353529).secondaryColor(0x080808) .toolStats( ToolProperty.Builder.of(1.0F, 1.0F, 256, 1, GTToolType.SOFT_MALLET, GTToolType.PLUNGER).build()) - .flags(GENERATE_GEAR, GENERATE_RING, GENERATE_FOIL, GENERATE_BOLT_SCREW) + .flags(GENERATE_RING, GENERATE_FOIL) .components(Carbon, 5, Hydrogen, 8) .buildAndRegister();