From df70874391af01dbedc2e889ddcf79a87cc9dd8e Mon Sep 17 00:00:00 2001 From: Glitchlabs Date: Fri, 26 Jun 2026 22:13:50 +0200 Subject: [PATCH] + iron grate --- .../5537763371ce84515b2ba566a215878d32b7df83 | 10 +++++----- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 ++- .../76fa529304d84db1465431f69702c7947fc3a5d2 | 5 ++++- .../8eabf35e4ef64464e61dd27839db58b6edc7b568 | 4 ++-- .../assets/ornamentum/lang/en_us.json | 1 + .../tags/block/ancient_city_replaceable.json | 3 --- .../tags/block/mineable/pickaxe.json | 4 +++- .../tags/block/needs_diamond_tool.json | 3 --- .../block/sculk_replaceable_world_gen.json | 3 --- .../ovh/glitchlabs/ornamentum/Ornamentum.java | 1 + .../ornamentum/blocks/GrateBlock.java | 19 +++++++++++++++++++ .../ornamentum/blocks/ModBlocks.java | 9 +++++++++ .../datagen/ModBlockLootTableProvider.java | 1 + .../datagen/ModBlockStateProvider.java | 4 ++++ .../datagen/ModBlockTagProvider.java | 15 ++++++++------- .../datagen/ModLanguageProvider.java | 2 ++ 16 files changed, 61 insertions(+), 26 deletions(-) delete mode 100644 src/generated/resources/data/minecraft/tags/block/ancient_city_replaceable.json delete mode 100644 src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json delete mode 100644 src/generated/resources/data/minecraft/tags/block/sculk_replaceable_world_gen.json create mode 100644 src/main/java/ovh/glitchlabs/ornamentum/blocks/GrateBlock.java diff --git a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 index b1f408b..bb46500 100644 --- a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 +++ b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 @@ -1,5 +1,5 @@ -// 1.21.1 2026-06-25T20:42:25.224764876 Tags for minecraft:block mod id ornamentum -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/block/ancient_city_replaceable.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/block/mineable/pickaxe.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/block/needs_diamond_tool.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/block/sculk_replaceable_world_gen.json +// 1.21.1 2026-06-26T21:45:38.041342555 Tags for minecraft:block mod id ornamentum +33e136c57ab3316e1b553dd00f9cc0b1f77b3283 data/minecraft/tags/block/incorrect_for_gold_tool.json +33e136c57ab3316e1b553dd00f9cc0b1f77b3283 data/minecraft/tags/block/incorrect_for_wooden_tool.json +33e136c57ab3316e1b553dd00f9cc0b1f77b3283 data/minecraft/tags/block/mineable/pickaxe.json +33e136c57ab3316e1b553dd00f9cc0b1f77b3283 data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 8c3055f..435a559 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,10 +1,11 @@ -// 1.21.1 2026-06-26T21:16:14.811733507 Loot Tables +// 1.21.1 2026-06-26T21:45:38.040841298 Loot Tables 1179e46db3d46fc3c3ed5468855ed87d2fb60019 data/ornamentum/loot_table/blocks/black_glow_stained_glass.json e0303d460f84f2d058296ca73321657e671d0322 data/ornamentum/loot_table/blocks/blue_glow_stained_glass.json a4648ce5f810c216ee43e33303189d530551331b data/ornamentum/loot_table/blocks/brown_glow_stained_glass.json 8e2f5d15fd661818f289853b52041d3a955bf9bc data/ornamentum/loot_table/blocks/cyan_glow_stained_glass.json 944021f21649a8eeb5d3d1cc69d31905e69ba6dc data/ornamentum/loot_table/blocks/gray_glow_stained_glass.json a038f998c5c87722d779ad1b09b5b1138881157a data/ornamentum/loot_table/blocks/green_glow_stained_glass.json +09b444eecc59c7b1d3bd022ed586b02fc453fd79 data/ornamentum/loot_table/blocks/iron_grate.json 0e9df03907fc078372b2f9912da7026d8147d59b data/ornamentum/loot_table/blocks/light_blue_glow_stained_glass.json 1f19091f55f6418ae2b8b9c24c9541349d681489 data/ornamentum/loot_table/blocks/light_gray_glow_stained_glass.json 853fd94e43870766b6e9a00dfc0ce29ac6d8ca33 data/ornamentum/loot_table/blocks/lime_glow_stained_glass.json diff --git a/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 b/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 index 6971d12..c6efd80 100644 --- a/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 +++ b/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 @@ -1,10 +1,11 @@ -// 1.21.1 2026-06-26T21:16:14.809756989 Block States: ornamentum +// 1.21.1 2026-06-26T21:45:38.039346944 Block States: ornamentum def29f564d72e8825a7a76d66e0d240a9611e33f assets/ornamentum/blockstates/black_glow_stained_glass.json b0a9accab5f9ebfd0afcfc0ffd24f604b276aa30 assets/ornamentum/blockstates/blue_glow_stained_glass.json 9227eb60d3215e16f8a93b288304a8aec03c26cc assets/ornamentum/blockstates/brown_glow_stained_glass.json a72209f1ca6c50b5911d4ab672c7fbc7b7966c45 assets/ornamentum/blockstates/cyan_glow_stained_glass.json f85a5a2def3478741740a267898cf33c41056afd assets/ornamentum/blockstates/gray_glow_stained_glass.json c380e42693db5efa36c7427ca4ec46830432843f assets/ornamentum/blockstates/green_glow_stained_glass.json +07dfb90b180383a0e9c03b6e3afeed017e11004c assets/ornamentum/blockstates/iron_grate.json 749271956d3dd1ff3e850a185fad63c018e6fec8 assets/ornamentum/blockstates/light_blue_glow_stained_glass.json 835084135b85ce3503840d4fc11f4c800c480222 assets/ornamentum/blockstates/light_gray_glow_stained_glass.json ebfc54921431b412cbef5633291959022677fea8 assets/ornamentum/blockstates/lime_glow_stained_glass.json @@ -21,6 +22,7 @@ fc821a5304517d010802e9737034edacc800a59f assets/ornamentum/models/block/black_gl 6c7a0f00f50245fde1d890f9b8fbff64acda9af6 assets/ornamentum/models/block/cyan_glow_stained_glass.json f6da7f180322f2d9cd47f2792cc60fc2ce8de442 assets/ornamentum/models/block/gray_glow_stained_glass.json b42c21cea55220e34f7e4b807e0db8da4617da3c assets/ornamentum/models/block/green_glow_stained_glass.json +ec484f5280aee4cf59941cec94ae18d8c68ce581 assets/ornamentum/models/block/iron_grate.json 7fdf53ae7e7bb865b709562a22a4f118836e839b assets/ornamentum/models/block/light_blue_glow_stained_glass.json 1e391c291c07b5b6a95248078c84fed079292d6e assets/ornamentum/models/block/light_gray_glow_stained_glass.json d9ff504be9439be49c87d836ce27e73e9080f5a1 assets/ornamentum/models/block/lime_glow_stained_glass.json @@ -37,6 +39,7 @@ a151ac7e3b81b0350dc49baa55ca7528ca7d1ccf assets/ornamentum/models/item/blue_glow d3ed59110233af9a62fcab01a20ddc6e8d8e64fc assets/ornamentum/models/item/cyan_glow_stained_glass.json d61a6f2bb1dae2fe00522b7e0ee0c1777e5c68cb assets/ornamentum/models/item/gray_glow_stained_glass.json 4c5f586acd8d6e4f271092b322c7ffa53652fd78 assets/ornamentum/models/item/green_glow_stained_glass.json +82628958de9528e241c05c6ff1aa5d5b2ce9c5b3 assets/ornamentum/models/item/iron_grate.json b217747dc73fce30a29142cca1e53ac427f7f190 assets/ornamentum/models/item/light_blue_glow_stained_glass.json cce8331129ab3f7b61e88c99a6db55797216a61c assets/ornamentum/models/item/light_gray_glow_stained_glass.json 4e694e080bf28b39a19ef8c34e45eb047f40cc34 assets/ornamentum/models/item/lime_glow_stained_glass.json diff --git a/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 b/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 index fba78f2..6e8ea81 100644 --- a/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 +++ b/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 @@ -1,2 +1,2 @@ -// 1.21.1 2026-06-26T21:20:07.480362837 Languages: en_us for mod: ornamentum -affa141e10df972d869b304d495bd222773eca37 assets/ornamentum/lang/en_us.json +// 1.21.1 2026-06-26T21:56:35.765919357 Languages: en_us for mod: ornamentum +659624989eacc353433484c61e4716ec2d341ab4 assets/ornamentum/lang/en_us.json diff --git a/src/generated/resources/assets/ornamentum/lang/en_us.json b/src/generated/resources/assets/ornamentum/lang/en_us.json index c9749c0..040faff 100644 --- a/src/generated/resources/assets/ornamentum/lang/en_us.json +++ b/src/generated/resources/assets/ornamentum/lang/en_us.json @@ -5,6 +5,7 @@ "block.ornamentum.cyan_glow_stained_glass": "Cyan Glow Stained Glass", "block.ornamentum.gray_glow_stained_glass": "Gray Glow Stained Glass", "block.ornamentum.green_glow_stained_glass": "Green Glow Stained Glass", + "block.ornamentum.iron_grate": "Iron Grate", "block.ornamentum.light_blue_glow_stained_glass": "Light Blue Glow Stained Glass", "block.ornamentum.light_gray_glow_stained_glass": "Light Gray Glow Stained Glass", "block.ornamentum.lime_glow_stained_glass": "Lime Glow Stained Glass", diff --git a/src/generated/resources/data/minecraft/tags/block/ancient_city_replaceable.json b/src/generated/resources/data/minecraft/tags/block/ancient_city_replaceable.json deleted file mode 100644 index f72d209..0000000 --- a/src/generated/resources/data/minecraft/tags/block/ancient_city_replaceable.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index f72d209..1e25121 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,3 +1,5 @@ { - "values": [] + "values": [ + "ornamentum:iron_grate" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json deleted file mode 100644 index f72d209..0000000 --- a/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/sculk_replaceable_world_gen.json b/src/generated/resources/data/minecraft/tags/block/sculk_replaceable_world_gen.json deleted file mode 100644 index f72d209..0000000 --- a/src/generated/resources/data/minecraft/tags/block/sculk_replaceable_world_gen.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} \ No newline at end of file diff --git a/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java b/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java index 0af7c12..3fc64ca 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/Ornamentum.java @@ -113,6 +113,7 @@ public class Ornamentum { net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.PURPLE_GLOW_STAINED_GLASS.get(), net.minecraft.client.renderer.RenderType.translucent()); net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.MAGENTA_GLOW_STAINED_GLASS.get(), net.minecraft.client.renderer.RenderType.translucent()); net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.PINK_GLOW_STAINED_GLASS.get(), net.minecraft.client.renderer.RenderType.translucent()); + net.minecraft.client.renderer.ItemBlockRenderTypes.setRenderLayer(ModBlocks.IRON_GRATE.get(), net.minecraft.client.renderer.RenderType.translucent()); } } } diff --git a/src/main/java/ovh/glitchlabs/ornamentum/blocks/GrateBlock.java b/src/main/java/ovh/glitchlabs/ornamentum/blocks/GrateBlock.java new file mode 100644 index 0000000..655d1a2 --- /dev/null +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/GrateBlock.java @@ -0,0 +1,19 @@ +package ovh.glitchlabs.ornamentum.blocks; + +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; + +public class GrateBlock extends Block { + public GrateBlock(Properties properties) { + super(properties); + } + + @Override + public boolean skipRendering(BlockState state, BlockState adjacentBlockState, Direction side) { + return adjacentBlockState.getBlock() instanceof GrateBlock || super.skipRendering(state, adjacentBlockState, side); + } +} + + + diff --git a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java index f24e015..24bfadd 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java @@ -24,6 +24,15 @@ public class ModBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Ornamentum.MODID); + //GRATES + + public static final DeferredBlock IRON_GRATE = registerBlock("iron_grate", + () -> new GrateBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.COPPER_GRATE) + .strength(5.0f, 6.0f) + .noOcclusion() + )); + + //GlowGlass public static final DeferredBlock LIME_GLOW_STAINED_GLASS = registerBlock("lime_glow_stained_glass", () -> new GlowGlassBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.GLASS) diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java index bc7dd8a..ba5a1f1 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java @@ -16,6 +16,7 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider { @Override protected void generate() { + dropSelf(ModBlocks.IRON_GRATE.get()); //dropSelf(ModBlocks.OBSIDIAN_BRICKS.get()); dropWhenSilkTouch(ModBlocks.LIME_GLOW_STAINED_GLASS.get()); dropWhenSilkTouch(ModBlocks.WHITE_GLOW_STAINED_GLASS.get()); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java index 2f855eb..b579af3 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java @@ -15,6 +15,10 @@ public class ModBlockStateProvider extends BlockStateProvider { @Override protected void registerStatesAndModels() { + //GRATES + blockWithItem(ModBlocks.IRON_GRATE); + + //GLOW GLASS blockWithItem(ModBlocks.LIME_GLOW_STAINED_GLASS); blockWithItem(ModBlocks.WHITE_GLOW_STAINED_GLASS); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java index 78995f4..a8a4f37 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java @@ -7,6 +7,7 @@ import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import ovh.glitchlabs.ornamentum.Ornamentum; +import ovh.glitchlabs.ornamentum.blocks.ModBlocks; import java.util.concurrent.CompletableFuture; @@ -18,19 +19,19 @@ public class ModBlockTagProvider extends BlockTagsProvider { @Override protected void addTags(HolderLookup.Provider provider) { tag(BlockTags.MINEABLE_WITH_PICKAXE) - //.add(ModBlocks.POLISHED_OBSIDIAN.get()) + .add(ModBlocks.IRON_GRATE.get()) ; - tag(BlockTags.NEEDS_DIAMOND_TOOL) - //.add(ModBlocks.POLISHED_OBSIDIAN.get()) + tag(BlockTags.NEEDS_STONE_TOOL) + .add(ModBlocks.IRON_GRATE.get()) ; - tag(BlockTags.ANCIENT_CITY_REPLACEABLE) - //.add(ModBlocks.OBSIDIAN_BRICKS.get()) + tag(BlockTags.INCORRECT_FOR_GOLD_TOOL) + .add(ModBlocks.IRON_GRATE.get()) ; - tag(BlockTags.SCULK_REPLACEABLE_WORLD_GEN) - //.add(ModBlocks.POLISHED_OBSIDIAN.get()) + tag(BlockTags.INCORRECT_FOR_WOODEN_TOOL) + .add(ModBlocks.IRON_GRATE.get()) ; } diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java index b71e97f..0855870 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java @@ -32,6 +32,8 @@ public class ModLanguageProvider extends LanguageProvider { add(ModBlocks.MAGENTA_GLOW_STAINED_GLASS.get(), "Magenta Glow Stained Glass"); add(ModBlocks.PINK_GLOW_STAINED_GLASS.get(), "Pink Glow Stained Glass"); + add(ModBlocks.IRON_GRATE.get(), "Iron Grate"); + // Items //add(ModItems.EXAMPLE_ITEM.get(), "Example Item");