Skip to content

Fix blackstone and tuff ores not dropping dusts #4376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JuiceyBeans wants to merge 5 commits into
base: 1.20.1
Choose a base branch
from
Open

Fix blackstone and tuff ores not dropping dusts #4376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
120b3c2
Create tuff material
JuiceyBeans Dec 24, 2025
8a1c1d2
Fix blackstone and tuff ores not dropping dusts
JuiceyBeans Dec 24, 2025
ae255f3
Make blackstone look nicer
JuiceyBeans Dec 24, 2025
5274cb4
More accurate coloring
JuiceyBeans Dec 24, 2025
ccbe971
Datagen
JuiceyBeans Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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⟘",
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/assets/gtceu/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(0x75756a).secondaryColor(0x8a8a80).iconSet(ROUGH)
.flags(NO_SMASHING)
.components(Ash, 2, PotassiumFeldspar, 1)
.buildAndRegister();
}
}