ian1337/Ornamentum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Processed Obsidian in to this mod and update the BlockTags for it

Browse Source
This commit is contained in:
Glitchlabs
2026-07-26 22:58:04 +02:00
parent da417d8d76
commit e31b4b6d3c
57 changed files with 641 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java
+15
View File
@@ -16,6 +16,21 @@ public class ModBlocks {
public static final DeferredRegister.Blocks BLOCKS =
DeferredRegister.createBlocks(Ornamentum.MODID);
public static final DeferredBlock<Block> OBSIDIAN_BRICKS = registerBlock("obsidian_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.OBSIDIAN)));
public static final DeferredBlock<Block> CRACKED_OBSIDIAN_BRICKS = registerBlock("cracked_obsidian_bricks",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.OBSIDIAN)));
public static final DeferredBlock<Block> OBSIDIAN_TILES = registerBlock("obsidian_tiles",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.OBSIDIAN)));
public static final DeferredBlock<Block> CRACKED_OBSIDIAN_TILES = registerBlock("cracked_obsidian_tiles",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.OBSIDIAN)));
public static final DeferredBlock<Block> POLISHED_OBSIDIAN = registerBlock("polished_obsidian",
() -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.OBSIDIAN)));
// flags
public static final DeferredBlock<Block> WHITE_FLAG = registerBlock("white_flag",
() -> new FlagBlock(BlockBehaviour.Properties.of().strength(1.0f).sound(SoundType.WOOD)));
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java
+6
View File
@@ -17,6 +17,12 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider {
@Override
protected void generate() {
dropSelf(ModBlocks.OBSIDIAN_BRICKS.get());
dropSelf(ModBlocks.OBSIDIAN_TILES.get());
dropSelf(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get());
dropSelf(ModBlocks.CRACKED_OBSIDIAN_TILES.get());
dropSelf(ModBlocks.POLISHED_OBSIDIAN.get());
dropSelf(ModBlocks.WHITE_FLAG.get());
dropSelf(ModBlocks.ORANGE_FLAG.get());
dropSelf(ModBlocks.MAGENTA_FLAG.get());
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java
+6
View File
@@ -22,6 +22,12 @@ public class ModBlockStateProvider extends BlockStateProvider {
@Override
protected void registerStatesAndModels() {
blockWithItem(ModBlocks.POLISHED_OBSIDIAN);
blockWithItem(ModBlocks.CRACKED_OBSIDIAN_BRICKS);
blockWithItem(ModBlocks.CRACKED_OBSIDIAN_TILES);
blockWithItem(ModBlocks.OBSIDIAN_BRICKS);
blockWithItem(ModBlocks.OBSIDIAN_TILES);
// FLAGS
createFlag(ModBlocks.WHITE_FLAG, "white_flag");
createFlag(ModBlocks.ORANGE_FLAG, "orange_flag");
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java
+91
View File
@@ -22,6 +22,12 @@ public class ModBlockTagProvider extends BlockTagsProvider {
@Override
protected void addTags(HolderLookup.Provider provider) {
tag(BlockTags.MINEABLE_WITH_AXE)
.add(ModBlocks.OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get())
.add(ModBlocks.OBSIDIAN_BRICKS.get())
.add(ModBlocks.POLISHED_OBSIDIAN.get())
.add(ModBlocks.WHITE_FLAG.get())
.add(ModBlocks.ORANGE_FLAG.get())
.add(ModBlocks.MAGENTA_FLAG.get())
@@ -356,10 +362,39 @@ public class ModBlockTagProvider extends BlockTagsProvider {
;
tag(BlockTags.NEEDS_DIAMOND_TOOL)
.add(ModBlocks.OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get())
.add(ModBlocks.OBSIDIAN_BRICKS.get())
.add(ModBlocks.POLISHED_OBSIDIAN.get())
.add(ModBlocks.OBSIDIAN_GRATE.get())
.add(ModBlocks.NETHERITE_GRATE.get())
;
tag(Tags.Blocks.OBSIDIANS)
.add(ModBlocks.OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get())
.add(ModBlocks.OBSIDIAN_BRICKS.get())
.add(ModBlocks.POLISHED_OBSIDIAN.get())
;
tag(Tags.Blocks.OBSIDIANS_NORMAL)
.add(ModBlocks.OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get())
.add(ModBlocks.OBSIDIAN_BRICKS.get())
.add(ModBlocks.POLISHED_OBSIDIAN.get())
;
tag(BlockTags.DRAGON_IMMUNE)
.add(ModBlocks.OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get())
.add(ModBlocks.OBSIDIAN_BRICKS.get())
.add(ModBlocks.POLISHED_OBSIDIAN.get())
;
tag(BlockTags.NEEDS_STONE_TOOL)
.add(ModBlocks.IRON_GRATE.get())
@@ -477,6 +512,18 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.MESH_IRON.get())
;
tag(BlockTags.ANCIENT_CITY_REPLACEABLE)
.add(ModBlocks.OBSIDIAN_BRICKS.get())
;
tag(BlockTags.SCULK_REPLACEABLE_WORLD_GEN)
.add(ModBlocks.OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_TILES.get())
.add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get())
.add(ModBlocks.OBSIDIAN_BRICKS.get())
.add(ModBlocks.POLISHED_OBSIDIAN.get())
;
tag(Tags.Blocks.GLASS_BLOCKS)
.add(ModBlocks.WHITE_GLOW_STAINED_GLASS.get())
@@ -1413,7 +1460,51 @@ public class ModBlockTagProvider extends BlockTagsProvider {
.add(ModBlocks.PRIDE_FLAG.get())
.add(ModBlocks.PROGRESS_PRIDE_FLAG.get())
.add(ModBlocks.TRANS_FLAG.get())
;
tag(ModTags.Blocks.PRIDE_FLAGS)
.add(ModBlocks.AGENDER_FLAG.get())
.add(ModBlocks.AROACE_FLAG.get())
.add(ModBlocks.AROMANTIC_FLAG.get())
.add(ModBlocks.ASEXUAL_FLAG.get())
.add(ModBlocks.BISEXUAL_FLAG.get())
.add(ModBlocks.DEMIROMANTIC_FLAG.get())
.add(ModBlocks.DEMISEXUAL_FLAG.get())
.add(ModBlocks.GAY_MEN_FLAG.get())
.add(ModBlocks.GENDERFLUID_FLAG.get())
.add(ModBlocks.GENDERQUEER_FLAG.get())
.add(ModBlocks.INTERSEX_FLAG.get())
.add(ModBlocks.LESBIAN_FLAG.get())
.add(ModBlocks.NON_BINARY_FLAG.get())
.add(ModBlocks.OMNISEXUAL_FLAG.get())
.add(ModBlocks.PANSEXUAL_FLAG.get())
.add(ModBlocks.PRIDE_FLAG.get())
.add(ModBlocks.PROGRESS_PRIDE_FLAG.get())
.add(ModBlocks.TRANS_FLAG.get())
;
tag(ModTags.Blocks.COUNTRIES_FLAGS)
.add(ModBlocks.AUSTRIA_FLAG.get())
.add(ModBlocks.BOUVET_ISLAND_FLAG.get())
.add(ModBlocks.CANADA_FLAG.get())
.add(ModBlocks.CHINA_FLAG.get())
.add(ModBlocks.DENMARK_FLAG.get())
.add(ModBlocks.FINLAND_FLAG.get())
.add(ModBlocks.FRANCE_FLAG.get())
.add(ModBlocks.GERMANY_FLAG.get())
.add(ModBlocks.GREECE_FLAG.get())
.add(ModBlocks.HUNGARY_FLAG.get())
.add(ModBlocks.ICELAND_FLAG.get())
.add(ModBlocks.INDIA_FLAG.get())
.add(ModBlocks.IRELAND_FLAG.get())
.add(ModBlocks.ITALY_FLAG.get())
.add(ModBlocks.JAPAN_FLAG.get())
.add(ModBlocks.LATVIA_FLAG.get())
.add(ModBlocks.NETHERLANDS_FLAG.get())
.add(ModBlocks.SWEDEN_FLAG.get())
.add(ModBlocks.SWITZERLAND_FLAG.get())
.add(ModBlocks.UNITED_KINGDOM_FLAG.get())
.add(ModBlocks.UNITED_STATES_FLAG.get())
;
}
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModItemModelProvider.java
+2 -1
View File
@@ -4,6 +4,7 @@ import net.minecraft.data.PackOutput;
import net.neoforged.neoforge.client.model.generators.ItemModelProvider;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import ovh.glitchlabs.ornamentum.Ornamentum;
import ovh.glitchlabs.ornamentum.items.ModItems;
public class ModItemModelProvider extends ItemModelProvider {
public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
@@ -12,6 +13,6 @@ public class ModItemModelProvider extends ItemModelProvider {
@Override
protected void registerModels() {
// basicItem(ModItems.OBSIDIAN_DUST.get());
basicItem(ModItems.OBSIDIAN_DUST.get());
}
}
src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java
+6 -1
View File
@@ -334,7 +334,12 @@ public class ModLanguageProvider extends LanguageProvider {
add(ModBlocks.BLACK_PATTERN_BLOCK_STAIRS.get(), "Black Pattern Block Stairs");
add(ModBlocks.BLACK_PATTERN_BLOCK_SLAB.get(), "Black Pattern Block Slab");
add(ModItems.OBSIDIAN_DUST.get(), "Obsidian Dust");
add(ModBlocks.OBSIDIAN_BRICKS.get(), "Obsidian Bricks");
add(ModBlocks.OBSIDIAN_TILES.get(), "Obsidian Tiles");
add(ModBlocks.POLISHED_OBSIDIAN.get(), "Polished Obsidian");
add(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get(), "Cracked Obsidian Bricks");
add(ModBlocks.CRACKED_OBSIDIAN_TILES.get(), "Cracked Obsidian Tiles");
add("creativetab.ornamentum.ornamentum", "Ornamentum");
src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java
+75 -64
View File
@@ -23,14 +23,6 @@ public class ModCreativeModeTabs {
.title(Component.translatable("creativetab.ornamentum.ornamentum"))
.displayItems((itemDisplayParameters, output) -> {
// Grates
output.accept(ModBlocks.IRON_GRATE);
output.accept(ModBlocks.GOLD_GRATE);
output.accept(ModBlocks.DIAMOND_GRATE);
output.accept(ModBlocks.NETHERITE_GRATE);
output.accept(ModBlocks.AMETHYST_GRATE);
output.accept(ModBlocks.OBSIDIAN_GRATE);
// Glow Glass
output.accept(ModBlocks.WHITE_GLOW_STAINED_GLASS);
output.accept(ModBlocks.ORANGE_GLOW_STAINED_GLASS);
@@ -205,6 +197,65 @@ public class ModCreativeModeTabs {
output.accept(ModBlocks.RED_BRICKS_SLAB);
output.accept(ModBlocks.BLACK_BRICKS_SLAB);
//flagen
output.accept(ModBlocks.WHITE_FLAG);
output.accept(ModBlocks.ORANGE_FLAG);
output.accept(ModBlocks.MAGENTA_FLAG);
output.accept(ModBlocks.LIGHT_BLUE_FLAG);
output.accept(ModBlocks.YELLOW_FLAG);
output.accept(ModBlocks.LIME_FLAG);
output.accept(ModBlocks.PINK_FLAG);
output.accept(ModBlocks.GRAY_FLAG);
output.accept(ModBlocks.LIGHT_GRAY_FLAG);
output.accept(ModBlocks.CYAN_FLAG);
output.accept(ModBlocks.PURPLE_FLAG);
output.accept(ModBlocks.BLUE_FLAG);
output.accept(ModBlocks.BROWN_FLAG);
output.accept(ModBlocks.GREEN_FLAG);
output.accept(ModBlocks.RED_FLAG);
output.accept(ModBlocks.BLACK_FLAG);
output.accept(ModBlocks.AGENDER_FLAG);
output.accept(ModBlocks.AROACE_FLAG);
output.accept(ModBlocks.AROMANTIC_FLAG);
output.accept(ModBlocks.ASEXUAL_FLAG);
output.accept(ModBlocks.BISEXUAL_FLAG);
output.accept(ModBlocks.DEMIROMANTIC_FLAG);
output.accept(ModBlocks.DEMISEXUAL_FLAG);
output.accept(ModBlocks.GAY_MEN_FLAG);
output.accept(ModBlocks.GENDERFLUID_FLAG);
output.accept(ModBlocks.GENDERQUEER_FLAG);
output.accept(ModBlocks.INTERSEX_FLAG);
output.accept(ModBlocks.LESBIAN_FLAG);
output.accept(ModBlocks.NON_BINARY_FLAG);
output.accept(ModBlocks.OMNISEXUAL_FLAG);
output.accept(ModBlocks.PANSEXUAL_FLAG);
output.accept(ModBlocks.PRIDE_FLAG);
output.accept(ModBlocks.PROGRESS_PRIDE_FLAG);
output.accept(ModBlocks.TRANS_FLAG);
output.accept(ModBlocks.AUSTRIA_FLAG);
output.accept(ModBlocks.BOUVET_ISLAND_FLAG);
output.accept(ModBlocks.CANADA_FLAG);
output.accept(ModBlocks.CHINA_FLAG);
output.accept(ModBlocks.DENMARK_FLAG);
output.accept(ModBlocks.FINLAND_FLAG);
output.accept(ModBlocks.FRANCE_FLAG);
output.accept(ModBlocks.GERMANY_FLAG);
output.accept(ModBlocks.GREECE_FLAG);
output.accept(ModBlocks.HUNGARY_FLAG);
output.accept(ModBlocks.ICELAND_FLAG);
output.accept(ModBlocks.INDIA_FLAG);
output.accept(ModBlocks.IRELAND_FLAG);
output.accept(ModBlocks.ITALY_FLAG);
output.accept(ModBlocks.JAPAN_FLAG);
output.accept(ModBlocks.LATVIA_FLAG);
output.accept(ModBlocks.NETHERLANDS_FLAG);
output.accept(ModBlocks.SWEDEN_FLAG);
output.accept(ModBlocks.SWITZERLAND_FLAG);
output.accept(ModBlocks.UNITED_KINGDOM_FLAG);
output.accept(ModBlocks.UNITED_STATES_FLAG);
// Special Bricks
output.accept(ModBlocks.AMETIST_BRICKS);
output.accept(ModBlocks.PURPUR_BRICKS);
@@ -220,6 +271,12 @@ public class ModCreativeModeTabs {
output.accept(ModBlocks.POLISHED_DIORITE_BRICKS_STAIRS);
output.accept(ModBlocks.POLISHED_GRANITE_BRICKS_STAIRS);
output.accept(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get());
output.accept(ModBlocks.OBSIDIAN_BRICKS.get());
output.accept(ModBlocks.OBSIDIAN_TILES.get());
output.accept(ModBlocks.POLISHED_OBSIDIAN.get());
output.accept(ModBlocks.CRACKED_OBSIDIAN_TILES.get());
output.accept(ModBlocks.AMETIST_BRICKS_SLAB);
output.accept(ModBlocks.PURPUR_BRICKS_SLAB);
output.accept(ModBlocks.SMOOTH_BASALT_BRICKS_SLAB);
@@ -281,64 +338,18 @@ public class ModCreativeModeTabs {
output.accept(ModBlocks.RED_PATTERN_BLOCK_SLAB);
output.accept(ModBlocks.BLACK_PATTERN_BLOCK_SLAB);
//flagen
output.accept(ModBlocks.WHITE_FLAG);
output.accept(ModBlocks.ORANGE_FLAG);
output.accept(ModBlocks.MAGENTA_FLAG);
output.accept(ModBlocks.LIGHT_BLUE_FLAG);
output.accept(ModBlocks.YELLOW_FLAG);
output.accept(ModBlocks.LIME_FLAG);
output.accept(ModBlocks.PINK_FLAG);
output.accept(ModBlocks.GRAY_FLAG);
output.accept(ModBlocks.LIGHT_GRAY_FLAG);
output.accept(ModBlocks.CYAN_FLAG);
output.accept(ModBlocks.PURPLE_FLAG);
output.accept(ModBlocks.BLUE_FLAG);
output.accept(ModBlocks.BROWN_FLAG);
output.accept(ModBlocks.GREEN_FLAG);
output.accept(ModBlocks.RED_FLAG);
output.accept(ModBlocks.BLACK_FLAG);
// Grates
output.accept(ModBlocks.IRON_GRATE);
output.accept(ModBlocks.GOLD_GRATE);
output.accept(ModBlocks.DIAMOND_GRATE);
output.accept(ModBlocks.NETHERITE_GRATE);
output.accept(ModBlocks.AMETHYST_GRATE);
output.accept(ModBlocks.OBSIDIAN_GRATE);
output.accept(ModItems.OBSIDIAN_DUST.get());
output.accept(ModBlocks.AGENDER_FLAG);
output.accept(ModBlocks.AROACE_FLAG);
output.accept(ModBlocks.AROMANTIC_FLAG);
output.accept(ModBlocks.ASEXUAL_FLAG);
output.accept(ModBlocks.BISEXUAL_FLAG);
output.accept(ModBlocks.DEMIROMANTIC_FLAG);
output.accept(ModBlocks.DEMISEXUAL_FLAG);
output.accept(ModBlocks.GAY_MEN_FLAG);
output.accept(ModBlocks.GENDERFLUID_FLAG);
output.accept(ModBlocks.GENDERQUEER_FLAG);
output.accept(ModBlocks.INTERSEX_FLAG);
output.accept(ModBlocks.LESBIAN_FLAG);
output.accept(ModBlocks.NON_BINARY_FLAG);
output.accept(ModBlocks.OMNISEXUAL_FLAG);
output.accept(ModBlocks.PANSEXUAL_FLAG);
output.accept(ModBlocks.PRIDE_FLAG);
output.accept(ModBlocks.PROGRESS_PRIDE_FLAG);
output.accept(ModBlocks.TRANS_FLAG);
output.accept(ModBlocks.AUSTRIA_FLAG);
output.accept(ModBlocks.BOUVET_ISLAND_FLAG);
output.accept(ModBlocks.CANADA_FLAG);
output.accept(ModBlocks.CHINA_FLAG);
output.accept(ModBlocks.DENMARK_FLAG);
output.accept(ModBlocks.FINLAND_FLAG);
output.accept(ModBlocks.FRANCE_FLAG);
output.accept(ModBlocks.GERMANY_FLAG);
output.accept(ModBlocks.GREECE_FLAG);
output.accept(ModBlocks.HUNGARY_FLAG);
output.accept(ModBlocks.ICELAND_FLAG);
output.accept(ModBlocks.INDIA_FLAG);
output.accept(ModBlocks.IRELAND_FLAG);
output.accept(ModBlocks.ITALY_FLAG);
output.accept(ModBlocks.JAPAN_FLAG);
output.accept(ModBlocks.LATVIA_FLAG);
output.accept(ModBlocks.NETHERLANDS_FLAG);
output.accept(ModBlocks.SWEDEN_FLAG);
output.accept(ModBlocks.SWITZERLAND_FLAG);
output.accept(ModBlocks.UNITED_KINGDOM_FLAG);
output.accept(ModBlocks.UNITED_STATES_FLAG);
}).build());
src/main/java/ovh/glitchlabs/ornamentum/items/ModItems.java
+5 -5
View File
@@ -11,11 +11,11 @@ import ovh.glitchlabs.ornamentum.Ornamentum;
public class ModItems {
public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Ornamentum.MODID);
//public static final DeferredItem<Item> OBSIDIAN_DUST = ITEMS.register("obsidian_dust",
// () -> new Item(new Item.Properties()
// .stacksTo(16)
// .rarity(Rarity.RARE)
// ));
public static final DeferredItem<Item> OBSIDIAN_DUST = ITEMS.register("obsidian_dust",
() -> new Item(new Item.Properties()
.stacksTo(16)
.rarity(Rarity.RARE)
));
public static void register(IEventBus eventBus) {
ITEMS.register(eventBus);
src/main/java/ovh/glitchlabs/ornamentum/tags/ModTags.java
+12
View File
@@ -15,5 +15,17 @@ public class ModTags {
Registries.BLOCK,
ResourceLocation.fromNamespaceAndPath(Ornamentum.MODID, "flags")
);
public static final TagKey<Block> PRIDE_FLAGS =
TagKey.create(
Registries.BLOCK,
ResourceLocation.fromNamespaceAndPath(Ornamentum.MODID, "pride_flags")
);
public static final TagKey<Block> COUNTRIES_FLAGS =
TagKey.create(
Registries.BLOCK,
ResourceLocation.fromNamespaceAndPath(Ornamentum.MODID, "countries_flags")
);
}
}