From 1c735ec101f5353a059a547f2aef6e31cb761714 Mon Sep 17 00:00:00 2001 From: Autumn Date: Mon, 7 Jul 2025 23:11:26 -0400 Subject: [PATCH 1/8] Create Titanium Plated Bricks and connected blocks --- .../blockstates/chiseled_titanium_bricks.json | 7 ++++++ .../titanium/blockstates/titanium_bricks.json | 7 ++++++ .../block/chiseled_titanium_bricks.json | 6 +++++ .../models/block/titanium_bricks.json | 6 +++++ .../models/item/chiseled_titanium_bricks.json | 3 +++ .../titanium/models/item/titanium_bricks.json | 3 +++ .../tags/block/mineable/pickaxe.json | 7 +++++- .../minecraft/tags/block/needs_iron_tool.json | 7 +++++- .../blocks/chiseled_titanium_bricks.json | 21 ++++++++++++++++++ .../blocks/titanium_brick_slab.json | 21 ++++++++++++++++++ .../blocks/titanium_brick_stairs.json | 21 ++++++++++++++++++ .../blocks/titanium_brick_wall.json | 21 ++++++++++++++++++ .../loot_table/blocks/titanium_bricks.json | 21 ++++++++++++++++++ .../titanium/block/StairBlockHelper.java | 10 +++++++++ .../titanium/block/TitaniumBlocks.java | 8 +++++-- .../atom596/titanium/item/TitaniumItems.java | 10 +++++++++ .../resources/assets/titanium/lang/en_us.json | 5 +++++ .../block/chiseled_titanium_bricks.png | Bin 0 -> 478 bytes .../textures/block/titanium_bricks.png | Bin 0 -> 486 bytes gradle.properties | 2 +- .../datagen/TitaniumBlockStateProvider.java | 10 +++++++++ .../datagen/TitaniumBlockTagProvider.java | 14 ++++++++++-- .../loottables/TitaniumBlockLootTables.java | 5 +++++ 23 files changed, 208 insertions(+), 7 deletions(-) create mode 100644 common/src/main/generated/assets/titanium/blockstates/chiseled_titanium_bricks.json create mode 100644 common/src/main/generated/assets/titanium/blockstates/titanium_bricks.json create mode 100644 common/src/main/generated/assets/titanium/models/block/chiseled_titanium_bricks.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_bricks.json create mode 100644 common/src/main/generated/assets/titanium/models/item/chiseled_titanium_bricks.json create mode 100644 common/src/main/generated/assets/titanium/models/item/titanium_bricks.json create mode 100644 common/src/main/generated/data/titanium/loot_table/blocks/chiseled_titanium_bricks.json create mode 100644 common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_slab.json create mode 100644 common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_stairs.json create mode 100644 common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_wall.json create mode 100644 common/src/main/generated/data/titanium/loot_table/blocks/titanium_bricks.json create mode 100644 common/src/main/java/com/atom596/titanium/block/StairBlockHelper.java create mode 100644 common/src/main/resources/assets/titanium/textures/block/chiseled_titanium_bricks.png create mode 100644 common/src/main/resources/assets/titanium/textures/block/titanium_bricks.png diff --git a/common/src/main/generated/assets/titanium/blockstates/chiseled_titanium_bricks.json b/common/src/main/generated/assets/titanium/blockstates/chiseled_titanium_bricks.json new file mode 100644 index 0000000..0a1c043 --- /dev/null +++ b/common/src/main/generated/assets/titanium/blockstates/chiseled_titanium_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "titanium:block/chiseled_titanium_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/blockstates/titanium_bricks.json b/common/src/main/generated/assets/titanium/blockstates/titanium_bricks.json new file mode 100644 index 0000000..774679e --- /dev/null +++ b/common/src/main/generated/assets/titanium/blockstates/titanium_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "titanium:block/titanium_bricks" + } + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/chiseled_titanium_bricks.json b/common/src/main/generated/assets/titanium/models/block/chiseled_titanium_bricks.json new file mode 100644 index 0000000..7b48f07 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/chiseled_titanium_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "titanium:block/chiseled_titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_bricks.json b/common/src/main/generated/assets/titanium/models/block/titanium_bricks.json new file mode 100644 index 0000000..a11a5b5 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/item/chiseled_titanium_bricks.json b/common/src/main/generated/assets/titanium/models/item/chiseled_titanium_bricks.json new file mode 100644 index 0000000..a3e478e --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/item/chiseled_titanium_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "titanium:block/chiseled_titanium_bricks" +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/item/titanium_bricks.json b/common/src/main/generated/assets/titanium/models/item/titanium_bricks.json new file mode 100644 index 0000000..eddfc11 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/item/titanium_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "titanium:block/titanium_bricks" +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json index 5231e69..5b1831a 100644 --- a/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json +++ b/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -5,6 +5,11 @@ "titanium:end_titanium_ore", "titanium:raw_titanium_block", "titanium:titanium_block", - "titanium:titanium_lantern" + "titanium:titanium_lantern", + "titanium:titanium_bricks", + "titanium:titanium_brick_slab", + "titanium:titanium_brick_stairs", + "titanium:titanium_brick_wall", + "titanium:chiseled_titanium_bricks" ] } \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json b/common/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json index bf9997a..f930c77 100644 --- a/common/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json +++ b/common/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json @@ -4,6 +4,11 @@ "titanium:deepslate_titanium_ore", "titanium:end_titanium_ore", "titanium:raw_titanium_block", - "titanium:titanium_block" + "titanium:titanium_block", + "titanium:titanium_bricks", + "titanium:titanium_brick_slab", + "titanium:titanium_brick_stairs", + "titanium:titanium_brick_wall", + "titanium:chiseled_titanium_bricks" ] } \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/loot_table/blocks/chiseled_titanium_bricks.json b/common/src/main/generated/data/titanium/loot_table/blocks/chiseled_titanium_bricks.json new file mode 100644 index 0000000..e79a382 --- /dev/null +++ b/common/src/main/generated/data/titanium/loot_table/blocks/chiseled_titanium_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "titanium:chiseled_titanium_bricks" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "titanium:blocks/chiseled_titanium_bricks" +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_slab.json b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_slab.json new file mode 100644 index 0000000..1f0db14 --- /dev/null +++ b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "titanium:titanium_brick_slab" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "titanium:blocks/titanium_brick_slab" +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_stairs.json b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_stairs.json new file mode 100644 index 0000000..3021b21 --- /dev/null +++ b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "titanium:titanium_brick_stairs" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "titanium:blocks/titanium_brick_stairs" +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_wall.json b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_wall.json new file mode 100644 index 0000000..113f7d8 --- /dev/null +++ b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_brick_wall.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "titanium:titanium_brick_wall" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "titanium:blocks/titanium_brick_wall" +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/loot_table/blocks/titanium_bricks.json b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_bricks.json new file mode 100644 index 0000000..f2fa527 --- /dev/null +++ b/common/src/main/generated/data/titanium/loot_table/blocks/titanium_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "titanium:titanium_bricks" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "titanium:blocks/titanium_bricks" +} \ No newline at end of file diff --git a/common/src/main/java/com/atom596/titanium/block/StairBlockHelper.java b/common/src/main/java/com/atom596/titanium/block/StairBlockHelper.java new file mode 100644 index 0000000..70d2564 --- /dev/null +++ b/common/src/main/java/com/atom596/titanium/block/StairBlockHelper.java @@ -0,0 +1,10 @@ +package com.atom596.titanium.block; + +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.state.BlockState; + +public class StairBlockHelper extends StairBlock { + protected StairBlockHelper(BlockState $$0, Properties $$1) { + super($$0, $$1); + } +} diff --git a/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java b/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java index 47d7d26..158b0b4 100644 --- a/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java +++ b/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java @@ -4,8 +4,7 @@ import com.atom596.titanium.regutils.RegistrationProvider; import com.atom596.titanium.regutils.RegistryObject; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; public class TitaniumBlocks { @@ -17,6 +16,11 @@ public class TitaniumBlocks { public static final RegistryObject RAW_TITANIUM_BLOCK = BLOCKS.register("raw_titanium_block", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); public static final RegistryObject TITANIUM_BLOCK = BLOCKS.register("titanium_block", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject TITANIUM_LANTERN = BLOCKS.register("titanium_lantern", TitaniumLanternBlock::new); + public static final RegistryObject TITANIUM_BRICKS = BLOCKS.register("titanium_bricks", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject TITANIUM_BRICK_SLAB = BLOCKS.register("titanium_brick_slab", () -> new SlabBlock(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject TITANIUM_BRICK_STAIRS = BLOCKS.register("titanium_brick_stairs", () -> new StairBlockHelper(TITANIUM_BRICKS.get().defaultBlockState(), Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject TITANIUM_BRICK_WALL = BLOCKS.register("titanium_brick_wall", () -> new WallBlock(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject CHISELED_TITANIUM_BRICKS = BLOCKS.register("chiseled_titanium_bricks", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static void init() {} } diff --git a/common/src/main/java/com/atom596/titanium/item/TitaniumItems.java b/common/src/main/java/com/atom596/titanium/item/TitaniumItems.java index d7aa652..2c1cab1 100644 --- a/common/src/main/java/com/atom596/titanium/item/TitaniumItems.java +++ b/common/src/main/java/com/atom596/titanium/item/TitaniumItems.java @@ -61,6 +61,16 @@ public class TitaniumItems { () -> new BlockItem(TitaniumBlocks.TITANIUM_BLOCK.get(), new Item.Properties())); public static final RegistryObject TITANIUM_LANTERN = ITEMS.register("titanium_lantern", () -> new BlockItem(TitaniumBlocks.TITANIUM_LANTERN.get(), new Item.Properties())); + public static final RegistryObject TITANIUM_BRICKS = ITEMS.register("titanium_bricks", + () -> new BlockItem(TitaniumBlocks.TITANIUM_BRICKS.get(), new Item.Properties())); + public static final RegistryObject TITANIUM_BRICK_SLAB = ITEMS.register("titanium_brick_slab", + () -> new BlockItem(TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), new Item.Properties())); + public static final RegistryObject TITANIUM_BRICK_STAIRS = ITEMS.register("titanium_brick_stairs", + () -> new BlockItem(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), new Item.Properties())); + public static final RegistryObject TITANIUM_BRICK_WALL = ITEMS.register("titanium_brick_wall", + () -> new BlockItem(TitaniumBlocks.TITANIUM_BRICK_WALL.get(), new Item.Properties())); + public static final RegistryObject CHISELED_TITANIUM_BRICKS = ITEMS.register("chiseled_titanium_bricks", + () -> new BlockItem(TitaniumBlocks.CHISELED_TITANIUM_BRICKS.get(), new Item.Properties())); public static void init() {} } diff --git a/common/src/main/resources/assets/titanium/lang/en_us.json b/common/src/main/resources/assets/titanium/lang/en_us.json index 282c09a..5fe8eac 100644 --- a/common/src/main/resources/assets/titanium/lang/en_us.json +++ b/common/src/main/resources/assets/titanium/lang/en_us.json @@ -24,6 +24,11 @@ "block.titanium.raw_titanium_block": "Block of Raw Titanium", "block.titanium.titanium_block": "Block of Titanium", "block.titanium.titanium_lantern": "Titanium Lantern", + "block.titanium.titanium_bricks": "Titanium Plated Bricks", + "block.titanium.titanium_brick_slab": "Titanium Plated Brick Slab", + "block.titanium.titanium_brick_stairs": "Titanium Plated Brick Stairs", + "block.titanium.titanium_brick_wall": "Titanium Plated Brick Wall", + "block.titanium.chiseled_titanium_bricks": "Chiseled Titanium Plated Bricks", "itemGroup.titanium.titanium_group": "Titanium", diff --git a/common/src/main/resources/assets/titanium/textures/block/chiseled_titanium_bricks.png b/common/src/main/resources/assets/titanium/textures/block/chiseled_titanium_bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..9aa932edba859bd465ce5d407c373399f592541e GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFGaGfV03OvY3H^?;r>> z?wFYU7APoD;u=vBoS#-wo>-L15RjOeSEA?V8lqsTXQ*c(o%w17P|dc~2+uT6Pb~%x zAcvJfijkFp5yOd|)VYxzga#ujgIQF(n!@hF|F5bViaLcmXrn2b?H}?b8a29w(7BevL z9RguSQ4OyKkj4_%h?3y^w370~qEv=}#LT=BJwMkF1yemkJqzi~S1W*OwxvdRrg?g5 zF>nAmtPE0&tPG4mmKP99L)jn)YA`Z`#hHL?Lq;aB52AqV%yt&AcovWi0-wql8D0QA z2BXm|WdKS|U}sjH>LQ-Ev`U;>)U1XdYjX#r$Gbr~8MfMn0) ziPd-ozmNek3q4&NLnJQCb{ldr8}hJxS9rBnX$kMY#=rvoC;TjL#A5>Lr|z#0S~e?* z&0!_yli-ZAiZAwWx@OQm|GeU(zPdSd-|C7%y0fj wmRYu1*925A?{L4~u6gjt?I~sxb&Wss{tb|M@@C(R2Ox)dy85}Sb4q9e0QrcA*Z=?k literal 0 HcmV?d00001 diff --git a/gradle.properties b/gradle.properties index 35c8661..344f01d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ # Every field you add must be added to the root build.gradle expandProps map. # Project -version=1.4.0 +version=1.4.1 group=com.atom596.titanium java_version=21 diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java index 4958137..dac792b 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java @@ -4,6 +4,7 @@ import com.atom596.titanium.block.TitaniumBlocks; import com.atom596.titanium.regutils.RegistryObject; import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.client.model.generators.BlockStateProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; @@ -20,6 +21,15 @@ protected void registerStatesAndModels() { blockWithItem(TitaniumBlocks.END_TITANIUM_ORE); blockWithItem(TitaniumBlocks.RAW_TITANIUM_BLOCK); blockWithItem(TitaniumBlocks.TITANIUM_BLOCK); + blockWithItem(TitaniumBlocks.TITANIUM_BRICKS); + /*slabBlock(TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), + ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks"), + ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks")); + stairsBlock(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), + ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks")); + wallBlock(TitaniumBlocks.TITANIUM_BRICK_WALL.get(), + ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks"));*/ + blockWithItem(TitaniumBlocks.CHISELED_TITANIUM_BRICKS); } private void blockWithItem(RegistryObject block) { diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java index e569167..d05a344 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java @@ -33,7 +33,12 @@ protected void addTags(HolderLookup.Provider provider) { TitaniumBlocks.END_TITANIUM_ORE.get(), TitaniumBlocks.RAW_TITANIUM_BLOCK.get(), TitaniumBlocks.TITANIUM_BLOCK.get(), - TitaniumBlocks.TITANIUM_LANTERN.get() + TitaniumBlocks.TITANIUM_LANTERN.get(), + TitaniumBlocks.TITANIUM_BRICKS.get(), + TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), + TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), + TitaniumBlocks.TITANIUM_BRICK_WALL.get(), + TitaniumBlocks.CHISELED_TITANIUM_BRICKS.get() ); this.tag(BlockTags.NEEDS_IRON_TOOL).add( @@ -41,7 +46,12 @@ protected void addTags(HolderLookup.Provider provider) { TitaniumBlocks.DEEPSLATE_TITANIUM_ORE.get(), TitaniumBlocks.END_TITANIUM_ORE.get(), TitaniumBlocks.RAW_TITANIUM_BLOCK.get(), - TitaniumBlocks.TITANIUM_BLOCK.get() + TitaniumBlocks.TITANIUM_BLOCK.get(), + TitaniumBlocks.TITANIUM_BRICKS.get(), + TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), + TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), + TitaniumBlocks.TITANIUM_BRICK_WALL.get(), + TitaniumBlocks.CHISELED_TITANIUM_BRICKS.get() ); } } diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/loottables/TitaniumBlockLootTables.java b/neoforge/src/main/java/com/atom596/titanium/datagen/loottables/TitaniumBlockLootTables.java index ac8ace3..a4d7538 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/loottables/TitaniumBlockLootTables.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/loottables/TitaniumBlockLootTables.java @@ -33,6 +33,11 @@ protected void generate() { dropSelf(TitaniumBlocks.RAW_TITANIUM_BLOCK.get()); dropSelf(TitaniumBlocks.TITANIUM_BLOCK.get()); dropSelf(TitaniumBlocks.TITANIUM_LANTERN.get()); + dropSelf(TitaniumBlocks.TITANIUM_BRICKS.get()); + dropSelf(TitaniumBlocks.TITANIUM_BRICK_SLAB.get()); + dropSelf(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get()); + dropSelf(TitaniumBlocks.TITANIUM_BRICK_WALL.get()); + dropSelf(TitaniumBlocks.CHISELED_TITANIUM_BRICKS.get()); add(TitaniumBlocks.TITANIUM_ORE.get(), block -> createOreDrop(TitaniumBlocks.TITANIUM_ORE.get(), TitaniumItems.RAW_TITANIUM.get())); add(TitaniumBlocks.DEEPSLATE_TITANIUM_ORE.get(), From f5d3ad7ab48e7a984917335d64d63e6d22267edf Mon Sep 17 00:00:00 2001 From: Autumn Date: Sat, 19 Jul 2025 11:23:22 -0400 Subject: [PATCH 2/8] Finalized Chiseled Titanium Bricks texture --- .../textures/block/chiseled_titanium_bricks.png | Bin 478 -> 496 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/common/src/main/resources/assets/titanium/textures/block/chiseled_titanium_bricks.png b/common/src/main/resources/assets/titanium/textures/block/chiseled_titanium_bricks.png index 9aa932edba859bd465ce5d407c373399f592541e..b3025d6043dfee41f0fdefd182e8514d389a94a9 100644 GIT binary patch delta 234 zcmVe1iQzRtjmosVsTcC5Xyoh)*V00009a7bBm z000ib000ib0l1NC?U8qO3E6f50O$h%0NIiDUw`F&X@z1@mA(J~0BlJ_K~xyiC5 zkb727U}Uu)*VWA?)vBshW0LG!=TAWhhIT1Tmi+d=#AQl<|21jB#7$1n+<(_i8zV=O S`wcDt0000 Date: Sat, 19 Jul 2025 11:41:29 -0400 Subject: [PATCH 3/8] Fix Titanium Plated Brick decoration block models --- .../blockstates/titanium_brick_slab.json | 13 ++ .../blockstates/titanium_brick_stairs.json | 209 ++++++++++++++++++ .../blockstates/titanium_brick_wall.json | 90 ++++++++ .../models/block/titanium_brick_slab.json | 8 + .../models/block/titanium_brick_slab_top.json | 8 + .../models/block/titanium_brick_stairs.json | 8 + .../block/titanium_brick_stairs_inner.json | 8 + .../block/titanium_brick_stairs_outer.json | 8 + .../block/titanium_brick_wall_post.json | 6 + .../block/titanium_brick_wall_side.json | 6 + .../block/titanium_brick_wall_side_tall.json | 6 + .../datagen/TitaniumBlockStateProvider.java | 12 +- 12 files changed, 375 insertions(+), 7 deletions(-) create mode 100644 common/src/main/generated/assets/titanium/blockstates/titanium_brick_slab.json create mode 100644 common/src/main/generated/assets/titanium/blockstates/titanium_brick_stairs.json create mode 100644 common/src/main/generated/assets/titanium/blockstates/titanium_brick_wall.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_slab.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_slab_top.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_inner.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_outer.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_post.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side.json create mode 100644 common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side_tall.json diff --git a/common/src/main/generated/assets/titanium/blockstates/titanium_brick_slab.json b/common/src/main/generated/assets/titanium/blockstates/titanium_brick_slab.json new file mode 100644 index 0000000..a4d4088 --- /dev/null +++ b/common/src/main/generated/assets/titanium/blockstates/titanium_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "titanium:block/titanium_brick_slab" + }, + "type=double": { + "model": "titanium:block/titanium_bricks" + }, + "type=top": { + "model": "titanium:block/titanium_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/blockstates/titanium_brick_stairs.json b/common/src/main/generated/assets/titanium/blockstates/titanium_brick_stairs.json new file mode 100644 index 0000000..cb22d5d --- /dev/null +++ b/common/src/main/generated/assets/titanium/blockstates/titanium_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "titanium:block/titanium_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "titanium:block/titanium_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "titanium:block/titanium_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "titanium:block/titanium_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/blockstates/titanium_brick_wall.json b/common/src/main/generated/assets/titanium/blockstates/titanium_brick_wall.json new file mode 100644 index 0000000..e246ec3 --- /dev/null +++ b/common/src/main/generated/assets/titanium/blockstates/titanium_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "titanium:block/titanium_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "titanium:block/titanium_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_slab.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_slab.json new file mode 100644 index 0000000..43710e5 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_slab_top.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_slab_top.json new file mode 100644 index 0000000..d410342 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs.json new file mode 100644 index 0000000..33d68e4 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_inner.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_inner.json new file mode 100644 index 0000000..82713da --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_outer.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_outer.json new file mode 100644 index 0000000..84f4448 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_post.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_post.json new file mode 100644 index 0000000..360be72 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side.json new file mode 100644 index 0000000..5086ff0 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side_tall.json b/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side_tall.json new file mode 100644 index 0000000..4f2eff2 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/block/titanium_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java index dac792b..7a4a799 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java @@ -16,19 +16,17 @@ public TitaniumBlockStateProvider(PackOutput output, ExistingFileHelper exFileHe @Override protected void registerStatesAndModels() { + ResourceLocation titaniumBlockTexture = blockTexture(TitaniumBlocks.TITANIUM_BRICKS.get()); + blockWithItem(TitaniumBlocks.TITANIUM_ORE); blockWithItem(TitaniumBlocks.DEEPSLATE_TITANIUM_ORE); blockWithItem(TitaniumBlocks.END_TITANIUM_ORE); blockWithItem(TitaniumBlocks.RAW_TITANIUM_BLOCK); blockWithItem(TitaniumBlocks.TITANIUM_BLOCK); blockWithItem(TitaniumBlocks.TITANIUM_BRICKS); - /*slabBlock(TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), - ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks"), - ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks")); - stairsBlock(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), - ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks")); - wallBlock(TitaniumBlocks.TITANIUM_BRICK_WALL.get(), - ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks"));*/ + slabBlock(TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), titaniumBlockTexture, titaniumBlockTexture); + stairsBlock(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), titaniumBlockTexture); + wallBlock(TitaniumBlocks.TITANIUM_BRICK_WALL.get(), titaniumBlockTexture); blockWithItem(TitaniumBlocks.CHISELED_TITANIUM_BRICKS); } From 3ae50e325eaa43f72ccceddf403ddd83a7c57600 Mon Sep 17 00:00:00 2001 From: Autumn Date: Sat, 19 Jul 2025 12:18:23 -0400 Subject: [PATCH 4/8] Fix Titanium decoration block item models --- .../titanium/models/item/titanium_brick_slab.json | 9 +++++++++ .../models/item/titanium_brick_stairs.json | 9 +++++++++ .../titanium/models/item/titanium_brick_wall.json | 9 +++++++++ .../datagen/TitaniumBlockStateProvider.java | 8 ++++---- .../datagen/TitaniumItemModelProvider.java | 15 +++++++++++++++ 5 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 common/src/main/generated/assets/titanium/models/item/titanium_brick_slab.json create mode 100644 common/src/main/generated/assets/titanium/models/item/titanium_brick_stairs.json create mode 100644 common/src/main/generated/assets/titanium/models/item/titanium_brick_wall.json diff --git a/common/src/main/generated/assets/titanium/models/item/titanium_brick_slab.json b/common/src/main/generated/assets/titanium/models/item/titanium_brick_slab.json new file mode 100644 index 0000000..f2ddb0d --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/item/titanium_brick_slab.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks", + "wall": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/item/titanium_brick_stairs.json b/common/src/main/generated/assets/titanium/models/item/titanium_brick_stairs.json new file mode 100644 index 0000000..58c888c --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/item/titanium_brick_stairs.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks", + "wall": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/assets/titanium/models/item/titanium_brick_wall.json b/common/src/main/generated/assets/titanium/models/item/titanium_brick_wall.json new file mode 100644 index 0000000..91f2001 --- /dev/null +++ b/common/src/main/generated/assets/titanium/models/item/titanium_brick_wall.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "bottom": "titanium:block/titanium_bricks", + "side": "titanium:block/titanium_bricks", + "top": "titanium:block/titanium_bricks", + "wall": "titanium:block/titanium_bricks" + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java index 7a4a799..8b449c2 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockStateProvider.java @@ -16,7 +16,7 @@ public TitaniumBlockStateProvider(PackOutput output, ExistingFileHelper exFileHe @Override protected void registerStatesAndModels() { - ResourceLocation titaniumBlockTexture = blockTexture(TitaniumBlocks.TITANIUM_BRICKS.get()); + ResourceLocation titaniumBricksTexture = blockTexture(TitaniumBlocks.TITANIUM_BRICKS.get()); blockWithItem(TitaniumBlocks.TITANIUM_ORE); blockWithItem(TitaniumBlocks.DEEPSLATE_TITANIUM_ORE); @@ -24,9 +24,9 @@ protected void registerStatesAndModels() { blockWithItem(TitaniumBlocks.RAW_TITANIUM_BLOCK); blockWithItem(TitaniumBlocks.TITANIUM_BLOCK); blockWithItem(TitaniumBlocks.TITANIUM_BRICKS); - slabBlock(TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), titaniumBlockTexture, titaniumBlockTexture); - stairsBlock(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), titaniumBlockTexture); - wallBlock(TitaniumBlocks.TITANIUM_BRICK_WALL.get(), titaniumBlockTexture); + slabBlock(TitaniumBlocks.TITANIUM_BRICK_SLAB.get(), titaniumBricksTexture, titaniumBricksTexture); + stairsBlock(TitaniumBlocks.TITANIUM_BRICK_STAIRS.get(), titaniumBricksTexture); + wallBlock(TitaniumBlocks.TITANIUM_BRICK_WALL.get(), titaniumBricksTexture); blockWithItem(TitaniumBlocks.CHISELED_TITANIUM_BRICKS); } diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemModelProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemModelProvider.java index 2f16c9b..bbffe5c 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemModelProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumItemModelProvider.java @@ -1,10 +1,12 @@ package com.atom596.titanium.datagen; import com.atom596.titanium.Titanium; +import com.atom596.titanium.block.TitaniumBlocks; import com.atom596.titanium.item.TitaniumItems; import com.atom596.titanium.regutils.RegistryObject; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; import net.neoforged.neoforge.client.model.generators.ItemModelProvider; @@ -36,6 +38,10 @@ protected void registerModels() { handheldItem(TitaniumItems.TITANIUM_AXE); handheldItem(TitaniumItems.TITANIUM_HOE); handheldItem(TitaniumItems.TESTING_WAND); + + titaniumBrickDecorationBlock(TitaniumItems.TITANIUM_BRICK_SLAB, "block/slab"); + titaniumBrickDecorationBlock(TitaniumItems.TITANIUM_BRICK_STAIRS, "block/stairs"); + titaniumBrickDecorationBlock(TitaniumItems.TITANIUM_BRICK_WALL, "block/wall_inventory"); } private ItemModelBuilder simpleItem(RegistryObject item) { @@ -49,4 +55,13 @@ private ItemModelBuilder handheldItem(RegistryObject item) { ResourceLocation.withDefaultNamespace("item/handheld")).texture("layer0", ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "item/" + item.getId().getPath())); } + + private ItemModelBuilder titaniumBrickDecorationBlock(RegistryObject item, String parent) { + return withExistingParent(item.getId().getPath(), + ResourceLocation.withDefaultNamespace(parent)) + .texture("bottom", ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "block/titanium_bricks")) + .texture("side", ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "block/titanium_bricks")) + .texture("top", ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "block/titanium_bricks")) + .texture("wall", ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "block/titanium_bricks")); + } } From b7b989b893a53a6c235f44c53720eb38dad85fd5 Mon Sep 17 00:00:00 2001 From: Autumn Date: Sat, 19 Jul 2025 12:24:12 -0400 Subject: [PATCH 5/8] Add decoration blocks to creative tabs --- .../java/com/atom596/titanium/item/TitaniumItemGroup.java | 5 +++++ .../src/main/java/com/atom596/titanium/TitaniumFabric.java | 5 +++++ .../src/main/java/com/atom596/titanium/TitaniumNeoforge.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java b/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java index ca681a1..dd183bc 100644 --- a/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java +++ b/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java @@ -17,6 +17,11 @@ public class TitaniumItemGroup { .title(Component.translatable("itemGroup.titanium.titanium_group")) .displayItems((context, entries) -> { entries.accept(TitaniumItems.TITANIUM_BLOCK.get()); + entries.accept(TitaniumItems.TITANIUM_BRICKS.get()); + entries.accept(TitaniumItems.TITANIUM_BRICK_SLAB.get()); + entries.accept(TitaniumItems.TITANIUM_BRICK_STAIRS.get()); + entries.accept(TitaniumItems.TITANIUM_BRICK_WALL.get()); + entries.accept(TitaniumItems.CHISELED_TITANIUM_BRICKS.get()); entries.accept(TitaniumItems.TITANIUM_ORE.get()); entries.accept(TitaniumItems.DEEPSLATE_TITANIUM_ORE.get()); entries.accept(TitaniumItems.END_TITANIUM_ORE.get()); diff --git a/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java b/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java index 6d8149d..7c3a6eb 100644 --- a/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java +++ b/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java @@ -26,6 +26,11 @@ public void onInitialize() { private void addCreative() { ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(content -> { content.addAfter(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, TitaniumItems.TITANIUM_BLOCK.get()); + content.addAfter(TitaniumItems.TITANIUM_BLOCK.get(), TitaniumItems.TITANIUM_BRICKS.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICK_SLAB.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICK_STAIRS.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICK_WALL.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICK_WALL.get(), TitaniumItems.CHISELED_TITANIUM_BRICKS.get()); }); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.NATURAL_BLOCKS).register(content -> { content.addAfter(Items.DEEPSLATE_GOLD_ORE, TitaniumItems.TITANIUM_ORE.get()); diff --git a/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java b/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java index 0ee95a1..1643a47 100644 --- a/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java +++ b/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java @@ -26,6 +26,11 @@ private void addCreative(BuildCreativeModeTabContentsEvent event) { ObjectSortedSet entries = event.getSearchEntries(); if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) { putAfter(event, Items.LIGHT_WEIGHTED_PRESSURE_PLATE, TitaniumItems.TITANIUM_BLOCK.get()); + putAfter(event, TitaniumItems.TITANIUM_BLOCK.get(), TitaniumItems.TITANIUM_BRICKS.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICK_SLAB.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICK_STAIRS.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICK_WALL.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICK_WALL.get(), TitaniumItems.CHISELED_TITANIUM_BRICKS.get()); } else if (event.getTabKey() == CreativeModeTabs.NATURAL_BLOCKS) { putAfter(event, Items.DEEPSLATE_GOLD_ORE, TitaniumItems.TITANIUM_ORE.get()); From 987d7df9c9ebaf88203248b3eefac0100cb3d71f Mon Sep 17 00:00:00 2001 From: Autumn Date: Mon, 15 Sep 2025 13:44:37 -0400 Subject: [PATCH 6/8] Fix MacOS missing gradle issue --- build.gradle | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/build.gradle b/build.gradle index 977c8cf..6593537 100644 --- a/build.gradle +++ b/build.gradle @@ -16,3 +16,25 @@ registrationUtils { neoforge { type "neoforge" } } } +subprojects { + apply plugin: 'java' + apply plugin: 'idea' + apply plugin: 'java-library' + + repositories { + // Fix issue with lwjgl-freetype not being found on macOS / ForgeGradle issue + // + // Could not resolve all files for configuration ':_compileJava_1'. + // Could not find lwjgl-freetype-3.3.3-natives-macos-patch.jar (org.lwjgl:lwjgl-freetype:3.3.3). + maven { + url "https://libraries.minecraft.net" + content { + includeModule("org.lwjgl", "lwjgl-freetype") + } + } + mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url "https://repo.lucko.me/" } + maven { url "https://jitpack.io" } + } +} From 3a754214c2be23a9e3d2bea3593aeeb7bd8211af Mon Sep 17 00:00:00 2001 From: Autumn Date: Thu, 18 Sep 2025 22:35:42 -0400 Subject: [PATCH 7/8] Switch Titanium Brick Stairs and Slab positions The vanilla creative inventory has stairs first, then slabs, so I switched the Titanium Brick Stairs and Slab to match that. --- .../java/com/atom596/titanium/block/TitaniumBlocks.java | 4 ++-- .../java/com/atom596/titanium/item/TitaniumItemGroup.java | 2 +- .../src/main/java/com/atom596/titanium/TitaniumFabric.java | 6 +++--- .../main/java/com/atom596/titanium/TitaniumNeoforge.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java b/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java index 158b0b4..6e147f2 100644 --- a/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java +++ b/common/src/main/java/com/atom596/titanium/block/TitaniumBlocks.java @@ -17,9 +17,9 @@ public class TitaniumBlocks { public static final RegistryObject TITANIUM_BLOCK = BLOCKS.register("titanium_block", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject TITANIUM_LANTERN = BLOCKS.register("titanium_lantern", TitaniumLanternBlock::new); public static final RegistryObject TITANIUM_BRICKS = BLOCKS.register("titanium_bricks", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final RegistryObject TITANIUM_BRICK_SLAB = BLOCKS.register("titanium_brick_slab", () -> new SlabBlock(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject TITANIUM_BRICK_STAIRS = BLOCKS.register("titanium_brick_stairs", () -> new StairBlockHelper(TITANIUM_BRICKS.get().defaultBlockState(), Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final RegistryObject TITANIUM_BRICK_WALL = BLOCKS.register("titanium_brick_wall", () -> new WallBlock(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject TITANIUM_BRICK_SLAB = BLOCKS.register("titanium_brick_slab", () -> new SlabBlock(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject TITANIUM_BRICK_WALL = BLOCKS.register("titanium_brick_wall", () -> new WallBlock(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops().forceSolidOn())); public static final RegistryObject CHISELED_TITANIUM_BRICKS = BLOCKS.register("chiseled_titanium_bricks", () -> new Block(Properties.of().strength(4.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static void init() {} diff --git a/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java b/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java index dd183bc..82519db 100644 --- a/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java +++ b/common/src/main/java/com/atom596/titanium/item/TitaniumItemGroup.java @@ -18,8 +18,8 @@ public class TitaniumItemGroup { .displayItems((context, entries) -> { entries.accept(TitaniumItems.TITANIUM_BLOCK.get()); entries.accept(TitaniumItems.TITANIUM_BRICKS.get()); - entries.accept(TitaniumItems.TITANIUM_BRICK_SLAB.get()); entries.accept(TitaniumItems.TITANIUM_BRICK_STAIRS.get()); + entries.accept(TitaniumItems.TITANIUM_BRICK_SLAB.get()); entries.accept(TitaniumItems.TITANIUM_BRICK_WALL.get()); entries.accept(TitaniumItems.CHISELED_TITANIUM_BRICKS.get()); entries.accept(TitaniumItems.TITANIUM_ORE.get()); diff --git a/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java b/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java index 7c3a6eb..ae0c9b9 100644 --- a/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java +++ b/fabric/src/main/java/com/atom596/titanium/TitaniumFabric.java @@ -27,9 +27,9 @@ private void addCreative() { ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(content -> { content.addAfter(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, TitaniumItems.TITANIUM_BLOCK.get()); content.addAfter(TitaniumItems.TITANIUM_BLOCK.get(), TitaniumItems.TITANIUM_BRICKS.get()); - content.addAfter(TitaniumItems.TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICK_SLAB.get()); - content.addAfter(TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICK_STAIRS.get()); - content.addAfter(TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICK_WALL.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICK_STAIRS.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICK_SLAB.get()); + content.addAfter(TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICK_WALL.get()); content.addAfter(TitaniumItems.TITANIUM_BRICK_WALL.get(), TitaniumItems.CHISELED_TITANIUM_BRICKS.get()); }); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.NATURAL_BLOCKS).register(content -> { diff --git a/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java b/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java index 1643a47..07b9d65 100644 --- a/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java +++ b/neoforge/src/main/java/com/atom596/titanium/TitaniumNeoforge.java @@ -27,9 +27,9 @@ private void addCreative(BuildCreativeModeTabContentsEvent event) { if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) { putAfter(event, Items.LIGHT_WEIGHTED_PRESSURE_PLATE, TitaniumItems.TITANIUM_BLOCK.get()); putAfter(event, TitaniumItems.TITANIUM_BLOCK.get(), TitaniumItems.TITANIUM_BRICKS.get()); - putAfter(event, TitaniumItems.TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICK_SLAB.get()); - putAfter(event, TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICK_STAIRS.get()); - putAfter(event, TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICK_WALL.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICK_STAIRS.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICK_SLAB.get()); + putAfter(event, TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICK_WALL.get()); putAfter(event, TitaniumItems.TITANIUM_BRICK_WALL.get(), TitaniumItems.CHISELED_TITANIUM_BRICKS.get()); } else if (event.getTabKey() == CreativeModeTabs.NATURAL_BLOCKS) { From 0343454d793670f9bb814eb37655662359115c4f Mon Sep 17 00:00:00 2001 From: Autumn Date: Thu, 18 Sep 2025 23:25:14 -0400 Subject: [PATCH 8/8] Fix wall issue and add recipes --- ...cks_from_titanium_bricks_stonecutting.json | 32 ++++++++++++++ ...lab_from_titanium_bricks_stonecutting.json | 32 ++++++++++++++ ...irs_from_titanium_bricks_stonecutting.json | 32 ++++++++++++++ ...all_from_titanium_bricks_stonecutting.json | 32 ++++++++++++++ ...cks_from_titanium_bricks_stonecutting.json | 10 +++++ ...lab_from_titanium_bricks_stonecutting.json | 10 +++++ ...irs_from_titanium_bricks_stonecutting.json | 10 +++++ ...all_from_titanium_bricks_stonecutting.json | 10 +++++ .../data/minecraft/tags/block/walls.json | 5 +++ .../chiseled_titanium_bricks.json | 32 ++++++++++++++ .../building_blocks/titanium_brick_slab.json | 32 ++++++++++++++ .../titanium_brick_stairs.json | 32 ++++++++++++++ .../building_blocks/titanium_brick_wall.json | 32 ++++++++++++++ .../building_blocks/titanium_bricks.json | 32 ++++++++++++++ .../recipe/chiseled_titanium_bricks.json | 17 ++++++++ .../titanium/recipe/titanium_brick_slab.json | 16 +++++++ .../recipe/titanium_brick_stairs.json | 18 ++++++++ .../titanium/recipe/titanium_brick_wall.json | 17 ++++++++ .../data/titanium/recipe/titanium_bricks.json | 17 ++++++++ .../datagen/TitaniumBlockTagProvider.java | 4 ++ .../datagen/TitaniumRecipeProvider.java | 43 +++++++++++++++++++ 21 files changed, 465 insertions(+) create mode 100644 common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_slab_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_stairs_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_wall_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/recipe/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/recipe/titanium_brick_slab_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/recipe/titanium_brick_stairs_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/recipe/titanium_brick_wall_from_titanium_bricks_stonecutting.json create mode 100644 common/src/main/generated/data/minecraft/tags/block/walls.json create mode 100644 common/src/main/generated/data/titanium/advancement/recipes/building_blocks/chiseled_titanium_bricks.json create mode 100644 common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_slab.json create mode 100644 common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_stairs.json create mode 100644 common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_wall.json create mode 100644 common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_bricks.json create mode 100644 common/src/main/generated/data/titanium/recipe/chiseled_titanium_bricks.json create mode 100644 common/src/main/generated/data/titanium/recipe/titanium_brick_slab.json create mode 100644 common/src/main/generated/data/titanium/recipe/titanium_brick_stairs.json create mode 100644 common/src/main/generated/data/titanium/recipe/titanium_brick_wall.json create mode 100644 common/src/main/generated/data/titanium/recipe/titanium_bricks.json diff --git a/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..d75b601 --- /dev/null +++ b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:chiseled_titanium_bricks_from_titanium_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_titanium_bricks": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_titanium_bricks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:chiseled_titanium_bricks_from_titanium_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_slab_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_slab_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..6d025e4 --- /dev/null +++ b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_slab_from_titanium_bricks_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:titanium_brick_slab_from_titanium_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_titanium_bricks": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_titanium_bricks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:titanium_brick_slab_from_titanium_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_stairs_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_stairs_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..acb9c8a --- /dev/null +++ b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_stairs_from_titanium_bricks_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:titanium_brick_stairs_from_titanium_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_titanium_bricks": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_titanium_bricks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:titanium_brick_stairs_from_titanium_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_wall_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_wall_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..b31b43a --- /dev/null +++ b/common/src/main/generated/data/minecraft/advancement/recipes/building_blocks/titanium_brick_wall_from_titanium_bricks_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:titanium_brick_wall_from_titanium_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_titanium_bricks": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_titanium_bricks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:titanium_brick_wall_from_titanium_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/recipe/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/recipe/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..08cef30 --- /dev/null +++ b/common/src/main/generated/data/minecraft/recipe/chiseled_titanium_bricks_from_titanium_bricks_stonecutting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "titanium:titanium_bricks" + }, + "result": { + "count": 1, + "id": "titanium:chiseled_titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/recipe/titanium_brick_slab_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/recipe/titanium_brick_slab_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..c1379fb --- /dev/null +++ b/common/src/main/generated/data/minecraft/recipe/titanium_brick_slab_from_titanium_bricks_stonecutting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "titanium:titanium_bricks" + }, + "result": { + "count": 2, + "id": "titanium:titanium_brick_slab" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/recipe/titanium_brick_stairs_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/recipe/titanium_brick_stairs_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..409aefb --- /dev/null +++ b/common/src/main/generated/data/minecraft/recipe/titanium_brick_stairs_from_titanium_bricks_stonecutting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "titanium:titanium_bricks" + }, + "result": { + "count": 1, + "id": "titanium:titanium_brick_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/recipe/titanium_brick_wall_from_titanium_bricks_stonecutting.json b/common/src/main/generated/data/minecraft/recipe/titanium_brick_wall_from_titanium_bricks_stonecutting.json new file mode 100644 index 0000000..484deaf --- /dev/null +++ b/common/src/main/generated/data/minecraft/recipe/titanium_brick_wall_from_titanium_bricks_stonecutting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "titanium:titanium_bricks" + }, + "result": { + "count": 1, + "id": "titanium:titanium_brick_wall" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/minecraft/tags/block/walls.json b/common/src/main/generated/data/minecraft/tags/block/walls.json new file mode 100644 index 0000000..86388a0 --- /dev/null +++ b/common/src/main/generated/data/minecraft/tags/block/walls.json @@ -0,0 +1,5 @@ +{ + "values": [ + "titanium:titanium_brick_wall" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/chiseled_titanium_bricks.json b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/chiseled_titanium_bricks.json new file mode 100644 index 0000000..c7c29fa --- /dev/null +++ b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/chiseled_titanium_bricks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "chiseled_titanium_bricks": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "titanium:chiseled_titanium_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "chiseled_titanium_bricks" + ] + ], + "rewards": { + "recipes": [ + "titanium:chiseled_titanium_bricks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_slab.json b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_slab.json new file mode 100644 index 0000000..f29a4ab --- /dev/null +++ b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_slab.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "titanium:titanium_brick_slab" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "titanium_brick_slab": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "titanium_brick_slab" + ] + ], + "rewards": { + "recipes": [ + "titanium:titanium_brick_slab" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_stairs.json b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_stairs.json new file mode 100644 index 0000000..6cbad4a --- /dev/null +++ b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "titanium:titanium_brick_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "titanium_brick_stairs": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "titanium_brick_stairs" + ] + ], + "rewards": { + "recipes": [ + "titanium:titanium_brick_stairs" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_wall.json b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_wall.json new file mode 100644 index 0000000..b934971 --- /dev/null +++ b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "titanium:titanium_brick_wall" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "titanium_brick_wall": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "titanium_brick_wall" + ] + ], + "rewards": { + "recipes": [ + "titanium:titanium_brick_wall" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_bricks.json b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_bricks.json new file mode 100644 index 0000000..caa893b --- /dev/null +++ b/common/src/main/generated/data/titanium/advancement/recipes/building_blocks/titanium_bricks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "titanium:titanium_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "titanium_bricks": { + "conditions": { + "items": [ + { + "items": "titanium:titanium_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "titanium_bricks" + ] + ], + "rewards": { + "recipes": [ + "titanium:titanium_bricks" + ] + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/recipe/chiseled_titanium_bricks.json b/common/src/main/generated/data/titanium/recipe/chiseled_titanium_bricks.json new file mode 100644 index 0000000..77fe247 --- /dev/null +++ b/common/src/main/generated/data/titanium/recipe/chiseled_titanium_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": { + "item": "titanium:titanium_bricks" + } + }, + "pattern": [ + "TT", + "TT" + ], + "result": { + "count": 4, + "id": "titanium:chiseled_titanium_bricks" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/recipe/titanium_brick_slab.json b/common/src/main/generated/data/titanium/recipe/titanium_brick_slab.json new file mode 100644 index 0000000..b828689 --- /dev/null +++ b/common/src/main/generated/data/titanium/recipe/titanium_brick_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": { + "item": "titanium:titanium_bricks" + } + }, + "pattern": [ + "TTT" + ], + "result": { + "count": 6, + "id": "titanium:titanium_brick_slab" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/recipe/titanium_brick_stairs.json b/common/src/main/generated/data/titanium/recipe/titanium_brick_stairs.json new file mode 100644 index 0000000..7f96ab0 --- /dev/null +++ b/common/src/main/generated/data/titanium/recipe/titanium_brick_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": { + "item": "titanium:titanium_bricks" + } + }, + "pattern": [ + "T ", + "TT ", + "TTT" + ], + "result": { + "count": 4, + "id": "titanium:titanium_brick_stairs" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/recipe/titanium_brick_wall.json b/common/src/main/generated/data/titanium/recipe/titanium_brick_wall.json new file mode 100644 index 0000000..5732326 --- /dev/null +++ b/common/src/main/generated/data/titanium/recipe/titanium_brick_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": { + "item": "titanium:titanium_bricks" + } + }, + "pattern": [ + "TTT", + "TTT" + ], + "result": { + "count": 6, + "id": "titanium:titanium_brick_wall" + } +} \ No newline at end of file diff --git a/common/src/main/generated/data/titanium/recipe/titanium_bricks.json b/common/src/main/generated/data/titanium/recipe/titanium_bricks.json new file mode 100644 index 0000000..fbfd728 --- /dev/null +++ b/common/src/main/generated/data/titanium/recipe/titanium_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": { + "item": "titanium:titanium_ingot" + } + }, + "pattern": [ + "TT", + "TT" + ], + "result": { + "count": 1, + "id": "titanium:titanium_bricks" + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java index d05a344..dfdc878 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumBlockTagProvider.java @@ -53,5 +53,9 @@ protected void addTags(HolderLookup.Provider provider) { TitaniumBlocks.TITANIUM_BRICK_WALL.get(), TitaniumBlocks.CHISELED_TITANIUM_BRICKS.get() ); + + this.tag(BlockTags.WALLS).add( + TitaniumBlocks.TITANIUM_BRICK_WALL.get() + ); } } diff --git a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumRecipeProvider.java b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumRecipeProvider.java index 227d4bc..21107c8 100644 --- a/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumRecipeProvider.java +++ b/neoforge/src/main/java/com/atom596/titanium/datagen/TitaniumRecipeProvider.java @@ -40,6 +40,49 @@ protected void buildRecipes(RecipeOutput recipeOutput) { nineBlockStorageRecipes(recipeOutput, RecipeCategory.MISC, TitaniumItems.RAW_TITANIUM.get(), RecipeCategory.BUILDING_BLOCKS, TitaniumBlocks.RAW_TITANIUM_BLOCK.get()); + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICKS.get(), 1) + .pattern("TT") + .pattern("TT") + .define('T', TitaniumItems.TITANIUM_INGOT.get()) + .unlockedBy("titanium_bricks", has(TitaniumItems.TITANIUM_INGOT.get())) + .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_bricks")); + + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICK_STAIRS.get(), 4) + .pattern("T ") + .pattern("TT ") + .pattern("TTT") + .define('T', TitaniumItems.TITANIUM_BRICKS.get()) + .unlockedBy("titanium_brick_stairs", has(TitaniumItems.TITANIUM_BRICKS.get())) + .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_brick_stairs")); + + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICK_STAIRS.get(), TitaniumItems.TITANIUM_BRICKS.get()); + + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICK_SLAB.get(), 6) + .pattern("TTT") + .define('T', TitaniumItems.TITANIUM_BRICKS.get()) + .unlockedBy("titanium_brick_slab", has(TitaniumItems.TITANIUM_BRICKS.get())) + .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_brick_slab")); + + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICK_SLAB.get(), TitaniumItems.TITANIUM_BRICKS.get(), 2); + + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICK_WALL.get(), 6) + .pattern("TTT") + .pattern("TTT") + .define('T', TitaniumItems.TITANIUM_BRICKS.get()) + .unlockedBy("titanium_brick_wall", has(TitaniumItems.TITANIUM_BRICKS.get())) + .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "titanium_brick_wall")); + + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TitaniumItems.TITANIUM_BRICK_WALL.get(), TitaniumItems.TITANIUM_BRICKS.get()); + + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, TitaniumItems.CHISELED_TITANIUM_BRICKS.get(), 4) + .pattern("TT") + .pattern("TT") + .define('T', TitaniumItems.TITANIUM_BRICKS.get()) + .unlockedBy("chiseled_titanium_bricks", has(TitaniumItems.TITANIUM_BRICKS.get())) + .save(recipeOutput, ResourceLocation.fromNamespaceAndPath(Titanium.MOD_ID, "chiseled_titanium_bricks")); + + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TitaniumItems.CHISELED_TITANIUM_BRICKS.get(), TitaniumItems.TITANIUM_BRICKS.get()); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, TitaniumItems.TITANIUM_INGOT.get(), 1) .pattern("TTT") .pattern("TTT")