+ more Bricks

+ block tag fix
This commit is contained in:
Glitchlabs
2026-07-12 12:20:42 +02:00
parent 8d5e1d4de1
commit 8c079b87f4
158 changed files with 3482 additions and 12 deletions
@@ -19,6 +19,52 @@ public class ModBlocks {
public static final DeferredRegister.Blocks BLOCKS =
DeferredRegister.createBlocks(Ornamentum.MODID);
//more bricks
public static final DeferredBlock<Block> AMETIST_BRICKS = registerBlock("ametist_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK)));
public static final DeferredBlock<StairBlock> AMETIST_BRICKS_STAIRS = registerBlock("ametist_bricks_stairs",
() -> new StairBlock(AMETIST_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(AMETIST_BRICKS.get())));
public static final DeferredBlock<SlabBlock> AMETIST_BRICKS_SLAB = registerBlock("ametist_bricks_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(AMETIST_BRICKS.get())));
public static final DeferredBlock<Block> POLISHED_ANDESITE_BRICKS = registerBlock("polished_andesite_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_ANDESITE)));
public static final DeferredBlock<StairBlock> POLISHED_ANDESITE_BRICKS_STAIRS = registerBlock("polished_andesite_bricks_stairs",
() -> new StairBlock(POLISHED_ANDESITE_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_ANDESITE_BRICKS.get())));
public static final DeferredBlock<SlabBlock> POLISHED_ANDESITE_BRICKS_SLAB = registerBlock("polished_andesite_bricks_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_ANDESITE_BRICKS.get())));
public static final DeferredBlock<Block> POLISHED_DIORITE_BRICKS = registerBlock("polished_diorite_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_DIORITE)));
public static final DeferredBlock<StairBlock> POLISHED_DIORITE_BRICKS_STAIRS = registerBlock("polished_diorite_bricks_stairs",
() -> new StairBlock(POLISHED_DIORITE_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_DIORITE_BRICKS.get())));
public static final DeferredBlock<SlabBlock> POLISHED_DIORITE_BRICKS_SLAB = registerBlock("polished_diorite_bricks_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_DIORITE_BRICKS.get())));
public static final DeferredBlock<Block> POLISHED_GRANITE_BRICKS = registerBlock("polished_granite_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_GRANITE)));
public static final DeferredBlock<StairBlock> POLISHED_GRANITE_BRICKS_STAIRS = registerBlock("polished_granite_bricks_stairs",
() -> new StairBlock(POLISHED_GRANITE_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_GRANITE_BRICKS.get())));
public static final DeferredBlock<SlabBlock> POLISHED_GRANITE_BRICKS_SLAB = registerBlock("polished_granite_bricks_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_GRANITE_BRICKS.get())));
public static final DeferredBlock<Block> PURPUR_BRICKS = registerBlock("purpur_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.PURPUR_BLOCK)));
public static final DeferredBlock<StairBlock> PURPUR_BRICKS_STAIRS = registerBlock("purpur_bricks_stairs",
() -> new StairBlock(PURPUR_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(PURPUR_BRICKS.get())));
public static final DeferredBlock<SlabBlock> PURPUR_BRICKS_SLAB = registerBlock("purpur_bricks_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(PURPUR_BRICKS.get())));
public static final DeferredBlock<Block> SMOOTH_BASALT_BRICKS = registerBlock("smooth_basalt_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.SMOOTH_BASALT)));
public static final DeferredBlock<StairBlock> SMOOTH_BASALT_BRICKS_STAIRS = registerBlock("smooth_basalt_bricks_stairs",
() -> new StairBlock(SMOOTH_BASALT_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SMOOTH_BASALT_BRICKS.get())));
public static final DeferredBlock<SlabBlock> SMOOTH_BASALT_BRICKS_SLAB = registerBlock("smooth_basalt_bricks_slab",
() -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(SMOOTH_BASALT_BRICKS.get())));
// COLORED BRICKS + STAIRS + SLABS
public static final DeferredBlock<Block> WHITE_BRICKS = registerBlock("white_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.BRICKS)));
@@ -136,6 +136,33 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider {
dropSelf(ModBlocks.RED_BRICKS_SLAB.get());
dropSelf(ModBlocks.BLACK_BRICKS_SLAB.get());
dropSelf(ModBlocks.AMETIST_BRICKS.get());
dropSelf(ModBlocks.AMETIST_BRICKS_STAIRS.get());
dropSelf(ModBlocks.AMETIST_BRICKS_SLAB.get());
dropSelf(ModBlocks.SMOOTH_BASALT_BRICKS.get());
dropSelf(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get());
dropSelf(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get());
dropSelf(ModBlocks.PURPUR_BRICKS.get());
dropSelf(ModBlocks.PURPUR_BRICKS_STAIRS.get());
dropSelf(ModBlocks.PURPUR_BRICKS_SLAB.get());
dropSelf(ModBlocks.SMOOTH_BASALT_BRICKS.get());
dropSelf(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get());
dropSelf(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get());
dropSelf(ModBlocks.POLISHED_ANDESITE_BRICKS.get());
dropSelf(ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS.get());
dropSelf(ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB.get());
dropSelf(ModBlocks.POLISHED_DIORITE_BRICKS.get());
dropSelf(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS.get());
dropSelf(ModBlocks.POLISHED_DIORITE_BRICKS_SLAB.get());
dropSelf(ModBlocks.POLISHED_GRANITE_BRICKS.get());
dropSelf(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS.get());
dropSelf(ModBlocks.POLISHED_GRANITE_BRICKS_SLAB.get());
//dropSelf(ModBlocks.OBSIDIAN_BRICKS.get());
@@ -120,6 +120,20 @@ public class ModBlockStateProvider extends BlockStateProvider {
createStairsAndSlab(ModBlocks.RED_BRICKS_STAIRS, ModBlocks.RED_BRICKS_SLAB, "red_bricks");
createStairsAndSlab(ModBlocks.BLACK_BRICKS_STAIRS, ModBlocks.BLACK_BRICKS_SLAB, "black_bricks");
blockWithItem(ModBlocks.AMETIST_BRICKS);
blockWithItem(ModBlocks.PURPUR_BRICKS);
blockWithItem(ModBlocks.SMOOTH_BASALT_BRICKS);
blockWithItem(ModBlocks.POLISHED_ANDESITE_BRICKS);
blockWithItem(ModBlocks.POLISHED_DIORITE_BRICKS);
blockWithItem(ModBlocks.POLISHED_GRANITE_BRICKS);
createStairsAndSlab(ModBlocks.AMETIST_BRICKS_STAIRS, ModBlocks.AMETIST_BRICKS_SLAB, "ametist_bricks");
createStairsAndSlab(ModBlocks.PURPUR_BRICKS_STAIRS, ModBlocks.PURPUR_BRICKS_SLAB, "purpur_bricks");
createStairsAndSlab(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS, ModBlocks.SMOOTH_BASALT_BRICKS_SLAB, "smooth_basalt_bricks");
createStairsAndSlab(ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS, ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB, "polished_andesite_bricks");
createStairsAndSlab(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS, ModBlocks.POLISHED_DIORITE_BRICKS_SLAB, "polished_diorite_bricks");
createStairsAndSlab(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS, ModBlocks.POLISHED_GRANITE_BRICKS_SLAB, "polished_granite_bricks");
}
@@ -1,5 +1,6 @@
package ovh.glitchlabs.ornamentum.datagen;
import com.jcraft.jorbis.Block;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.tags.BlockTags;
@@ -104,6 +105,28 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.GREEN_BRICKS_SLAB.get())
.add(ModBlocks.RED_BRICKS_SLAB.get())
.add(ModBlocks.BLACK_BRICKS_SLAB.get())
.add(ModBlocks.AMETIST_BRICKS.get())
.add(ModBlocks.PURPUR_BRICKS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS.get())
.add(ModBlocks.POLISHED_ANDESITE_BRICKS.get())
.add(ModBlocks.POLISHED_DIORITE_BRICKS.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS.get())
.add(ModBlocks.AMETIST_BRICKS_STAIRS.get())
.add(ModBlocks.PURPUR_BRICKS_STAIRS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS.get())
.add(ModBlocks.AMETIST_BRICKS_SLAB.get())
.add(ModBlocks.PURPUR_BRICKS_SLAB.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_DIORITE_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS_SLAB.get())
;
tag(BlockTags.NEEDS_IRON_TOOL)
@@ -682,6 +705,36 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.BLACK_BRICKS_SLAB.get())
;
tag(BlockTags.VIBRATION_RESONATORS)
.add(ModBlocks.AMETHYST_GRATE.get())
.add(ModBlocks.AMETIST_BRICKS.get())
.add(ModBlocks.AMETIST_BRICKS_STAIRS.get())
.add(ModBlocks.AMETIST_BRICKS_SLAB.get())
;
tag(BlockTags.CRYSTAL_SOUND_BLOCKS)
.add(ModBlocks.AMETHYST_GRATE.get())
.add(ModBlocks.AMETIST_BRICKS.get())
.add(ModBlocks.AMETIST_BRICKS_STAIRS.get())
.add(ModBlocks.AMETIST_BRICKS_SLAB.get())
;
tag(BlockTags.SCULK_REPLACEABLE)
.add(ModBlocks.SMOOTH_BASALT_BRICKS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get())
;
tag(BlockTags.SCULK_REPLACEABLE_WORLD_GEN)
.add(ModBlocks.SMOOTH_BASALT_BRICKS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get())
;
tag(BlockTags.STAIRS)
.add(ModBlocks.WHITE_WOOL_STAIRS.get())
@@ -721,6 +774,13 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.RED_BRICKS_STAIRS.get())
.add(ModBlocks.BLACK_BRICKS_STAIRS.get())
.add(ModBlocks.AMETIST_BRICKS_STAIRS.get())
.add(ModBlocks.PURPUR_BRICKS_STAIRS.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS.get())
;
tag(BlockTags.SLABS)
@@ -762,6 +822,13 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.RED_BRICKS_SLAB.get())
.add(ModBlocks.BLACK_BRICKS_SLAB.get())
.add(ModBlocks.AMETIST_BRICKS_SLAB.get())
.add(ModBlocks.PURPUR_BRICKS_SLAB.get())
.add(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_DIORITE_BRICKS_SLAB.get())
.add(ModBlocks.POLISHED_GRANITE_BRICKS_SLAB.get())
;
}
@@ -153,6 +153,33 @@ public class ModLanguageProvider extends LanguageProvider {
add(ModBlocks.RED_BRICKS_SLAB.get(), "Red Bricks Slab");
add(ModBlocks.BLACK_BRICKS_SLAB.get(), "Black Bricks Slab");
add(ModBlocks.AMETIST_BRICKS.get(), "Amethyst Bricks");
add(ModBlocks.AMETIST_BRICKS_STAIRS.get(), "Amethyst Bricks Stairs");
add(ModBlocks.AMETIST_BRICKS_SLAB.get(), "Amethyst Bricks Slab");
add(ModBlocks.POLISHED_ANDESITE_BRICKS.get(), "Polished Andesite Bricks");
add(ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS.get(), "Polished Andesite Bricks Stairs");
add(ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB.get(), "Polished Andesite Bricks Slab");
add(ModBlocks.POLISHED_DIORITE_BRICKS.get(), "Polished Diorite Bricks");
add(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS.get(), "Polished Diorite Bricks Stairs");
add(ModBlocks.POLISHED_DIORITE_BRICKS_SLAB.get(), "Polished Diorite Bricks Slab");
add(ModBlocks.POLISHED_GRANITE_BRICKS.get(), "Polished Granite Bricks");
add(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS.get(), "Polished Granite Bricks Stairs");
add(ModBlocks.POLISHED_GRANITE_BRICKS_SLAB.get(), "Polished Granite Bricks Slab");
add(ModBlocks.PURPUR_BRICKS.get(), "Purpur Bricks");
add(ModBlocks.PURPUR_BRICKS_STAIRS.get(), "Purpur Bricks Stairs");
add(ModBlocks.PURPUR_BRICKS_SLAB.get(), "Purpur Bricks Slab");
add(ModBlocks.SMOOTH_BASALT_BRICKS.get(), "Purpur Bricks");
add(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get(), "Purpur Bricks Stairs");
add(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get(), "Purpur Bricks Slab");
add("creativetab.ornamentum.ornamentum", "Ornamentum");
// Items
@@ -12,6 +12,7 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Blocks;
import ovh.glitchlabs.ornamentum.Ornamentum;
import ovh.glitchlabs.ornamentum.blocks.ModBlocks;
@@ -172,6 +173,27 @@ public class ModRecipeProvider extends RecipeProvider {
bricksDyeRecipes.put(Items.RED_DYE, ModBlocks.RED_BRICKS.get());
bricksDyeRecipes.put(Items.BLACK_DYE, ModBlocks.BLACK_BRICKS.get());
createBrickRecipe(output, Blocks.AMETHYST_BLOCK, ModBlocks.AMETIST_BRICKS.get());
createBrickRecipe(output, Blocks.POLISHED_ANDESITE, ModBlocks.POLISHED_ANDESITE_BRICKS.get());
createBrickRecipe(output, Blocks.POLISHED_DIORITE, ModBlocks.POLISHED_DIORITE_BRICKS.get());
createBrickRecipe(output, Blocks.POLISHED_GRANITE, ModBlocks.POLISHED_GRANITE_BRICKS.get());
createBrickRecipe(output, Blocks.PURPUR_BLOCK, ModBlocks.PURPUR_BRICKS.get());
createBrickRecipe(output, Blocks.SMOOTH_BASALT, ModBlocks.SMOOTH_BASALT_BRICKS.get());
stairRecipes.put(ModBlocks.AMETIST_BRICKS.get(), ModBlocks.AMETIST_BRICKS_STAIRS.get());
stairRecipes.put(ModBlocks.POLISHED_ANDESITE_BRICKS.get(), ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS.get());
stairRecipes.put(ModBlocks.POLISHED_DIORITE_BRICKS.get(), ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS.get());
stairRecipes.put(ModBlocks.POLISHED_GRANITE_BRICKS.get(), ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS.get());
stairRecipes.put(ModBlocks.PURPUR_BRICKS.get(), ModBlocks.PURPUR_BRICKS_STAIRS.get());
stairRecipes.put(ModBlocks.SMOOTH_BASALT_BRICKS.get(), ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS.get());
slabRecipes.put(ModBlocks.AMETIST_BRICKS.get(), ModBlocks.AMETIST_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.POLISHED_ANDESITE_BRICKS.get(), ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.POLISHED_DIORITE_BRICKS.get(), ModBlocks.POLISHED_DIORITE_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.POLISHED_GRANITE_BRICKS.get(), ModBlocks.POLISHED_GRANITE_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.PURPUR_BRICKS.get(), ModBlocks.PURPUR_BRICKS_SLAB.get());
slabRecipes.put(ModBlocks.SMOOTH_BASALT_BRICKS.get(), ModBlocks.SMOOTH_BASALT_BRICKS_SLAB.get());
grateRecipes.forEach((input, result) ->
createGrateRecipe(output, input, result));
@@ -394,4 +416,18 @@ public class ModRecipeProvider extends RecipeProvider {
.unlockedBy("has_input", has(input))
.save(output);
}
private void createBrickRecipe(RecipeOutput output, ItemLike input, ItemLike result) {
ShapedRecipeBuilder.shaped(
RecipeCategory.BUILDING_BLOCKS,
result,
4
)
.pattern("##")
.pattern("##")
.define('#', input)
.group("Bricks")
.unlockedBy("has_input", has(input))
.save(output);
}
}
@@ -162,6 +162,27 @@ public class ModCreativeModeTabs {
output.accept(ModBlocks.RED_BRICKS_SLAB);
output.accept(ModBlocks.BLACK_BRICKS_SLAB);
output.accept(ModBlocks.AMETIST_BRICKS);
output.accept(ModBlocks.PURPUR_BRICKS);
output.accept(ModBlocks.SMOOTH_BASALT_BRICKS);
output.accept(ModBlocks.POLISHED_ANDESITE_BRICKS);
output.accept(ModBlocks.POLISHED_DIORITE_BRICKS);
output.accept(ModBlocks.POLISHED_GRANITE_BRICKS);
output.accept(ModBlocks.AMETIST_BRICKS_STAIRS);
output.accept(ModBlocks.PURPUR_BRICKS_STAIRS);
output.accept(ModBlocks.SMOOTH_BASALT_BRICKS_STAIRS);
output.accept(ModBlocks.POLISHED_ANDESITE_BRICKS_STAIRS);
output.accept(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS);
output.accept(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS);
output.accept(ModBlocks.AMETIST_BRICKS_SLAB);
output.accept(ModBlocks.PURPUR_BRICKS_SLAB);
output.accept(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB);
output.accept(ModBlocks.POLISHED_ANDESITE_BRICKS_SLAB);
output.accept(ModBlocks.POLISHED_DIORITE_BRICKS_SLAB);
output.accept(ModBlocks.POLISHED_GRANITE_BRICKS_SLAB);
}).build());
Binary file not shown.

After

Width:  |  Height:  |  Size: 774 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 751 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B