diff --git a/gradle.properties b/gradle.properties index 85a353e..11f8577 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ mod_name=Ornamentum # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=0.0.3 +mod_version=0.0.4 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 index 0aec179..330e05f 100644 --- a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 +++ b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 @@ -1,7 +1,7 @@ -// 1.21.1 2026-06-27T10:16:51.767188002 Tags for minecraft:block mod id ornamentum -0b742a36ffa1bee7a83e97b19e8a3e1c5254310d data/minecraft/tags/block/incorrect_for_gold_tool.json -208a14225721712aae8dca7aa0bf72ffff18109a data/minecraft/tags/block/incorrect_for_wooden_tool.json -294b1851d2fb385fb380e88550a9813d88870384 data/minecraft/tags/block/mineable/pickaxe.json +// 1.21.1 2026-06-28T10:26:21.478612443 Tags for minecraft:block mod id ornamentum +eda5aa450bd4c4ebbd0604d99f25b95ac53e0d10 data/minecraft/tags/block/incorrect_for_gold_tool.json +c6bbc5d24c303802e592fbe7f60ff29de6487822 data/minecraft/tags/block/incorrect_for_wooden_tool.json +5ed05e4f9dc2ab891592d31a7c4a30cb40f43fab data/minecraft/tags/block/mineable/pickaxe.json 8746b07cb20507229809e554193318dd4c83883e data/minecraft/tags/block/needs_diamond_tool.json -215037b981540fa0d88b2163f79575718eae5a67 data/minecraft/tags/block/needs_iron_tool.json +0355bdb0b9aaa7046903be5e8419b8b4f714bb5b data/minecraft/tags/block/needs_iron_tool.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 1916820..0f21da2 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2026-06-27T10:16:51.765940922 Loot Tables +// 1.21.1 2026-06-28T10:26:21.477583421 Loot Tables c5c3cbbff0b4af321ae05896dbd68e551f598c86 data/ornamentum/loot_table/blocks/amethyst_grate.json d6cadc723b59697611653ba8b077467af3032e20 data/ornamentum/loot_table/blocks/black_glow_block.json 1179e46db3d46fc3c3ed5468855ed87d2fb60019 data/ornamentum/loot_table/blocks/black_glow_stained_glass.json @@ -29,6 +29,8 @@ ac685a0f0dda5aaaca6757054941f5af22a1349f data/ornamentum/loot_table/blocks/obsid f3bf293e7d0b5e4fb3e5a12feb822164b9372323 data/ornamentum/loot_table/blocks/orange_glow_stained_glass.json 0c1efb8aea1a4b8fdec04f568652b4c3959fa84b data/ornamentum/loot_table/blocks/pink_glow_block.json 699bc10cccf0fc9dbb07ad419e8ab3d85db57ce2 data/ornamentum/loot_table/blocks/pink_glow_stained_glass.json +6120a05aff508eb580eef4adf3400dfcdaa821a3 data/ornamentum/loot_table/blocks/pool_tiles.json +d836515148db64b9248dfb8ce7cff4850f6e35db data/ornamentum/loot_table/blocks/pool_tiles1.json 515244f2b5b8dc4d163ee77e81ab87d67d730b28 data/ornamentum/loot_table/blocks/purple_glow_block.json da40ee30a48e13e39920278d3693013778fa3b90 data/ornamentum/loot_table/blocks/purple_glow_stained_glass.json c8ed783c578945eba756818d8115020a3ab779ce data/ornamentum/loot_table/blocks/red_glow_block.json diff --git a/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 b/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 index 021ac6b..e2a4717 100644 --- a/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 +++ b/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 @@ -1,4 +1,4 @@ -// 1.21.1 2026-06-27T10:16:51.763982334 Block States: ornamentum +// 1.21.1 2026-06-28T10:26:21.475254826 Block States: ornamentum d6c0778339a79db4e2ec3f14d7399d1f908ce1fa assets/ornamentum/blockstates/amethyst_grate.json 7f171f7ecdf713275e6fad8f2ad2f60843a18dbd assets/ornamentum/blockstates/black_glow_block.json def29f564d72e8825a7a76d66e0d240a9611e33f assets/ornamentum/blockstates/black_glow_stained_glass.json @@ -29,6 +29,8 @@ cf79a95c3f9ab4f34f16da9ef26ff72fb973e4ba assets/ornamentum/blockstates/obsidian_ 588721dd792b506c26839cebeb001a49fdc87d6a assets/ornamentum/blockstates/orange_glow_stained_glass.json 3576983f98cb779b11971b72798b8f312cd528df assets/ornamentum/blockstates/pink_glow_block.json 3833ce62b92ec5743f12275ef9fe7371e1048eff assets/ornamentum/blockstates/pink_glow_stained_glass.json +1952f32a71f7c476adc948f62e997f6a90504953 assets/ornamentum/blockstates/pool_tiles.json +8ca5faa5ac86e024f06583ed294fb75065450f8a assets/ornamentum/blockstates/pool_tiles1.json b5a183107733fcac1461bbf33112d7448856a504 assets/ornamentum/blockstates/purple_glow_block.json e3d1d58b1032cd69193f3ff014856b4130fb54d6 assets/ornamentum/blockstates/purple_glow_stained_glass.json f32d607e82dc7719e8abc2817466e76f171574d5 assets/ornamentum/blockstates/red_glow_block.json @@ -67,6 +69,8 @@ bc42ad56bb421a1321d33b0aeeec659359aa869c assets/ornamentum/models/block/orange_g 9e47009db1be0a81f798f19cd42089f7ab242b90 assets/ornamentum/models/block/orange_glow_stained_glass.json 7c80347fb18f68d843b44e9527b7e0a9f5004534 assets/ornamentum/models/block/pink_glow_block.json 36b037368364135203ce2892e4fc25f56699ee4f assets/ornamentum/models/block/pink_glow_stained_glass.json +12cd70c1d9ce4e5955b0352d2e91697f826beb9c assets/ornamentum/models/block/pool_tiles.json +6afdb021d42c15156d6afbb2ef6b5cffb962992e assets/ornamentum/models/block/pool_tiles1.json 2008d3c1c23d01b92c8e7b9774534a36837d3ce1 assets/ornamentum/models/block/purple_glow_block.json ac3eebf8debb654edbf1b7c8c1f6d36ebfd99625 assets/ornamentum/models/block/purple_glow_stained_glass.json c10c32f316a438a156b8ad3a7d83e492762e1925 assets/ornamentum/models/block/red_glow_block.json @@ -105,6 +109,8 @@ ef48292ba292964eff25f608c55ee9ea663958fe assets/ornamentum/models/item/lime_glow ca6d440109a9370197f9d97f246e5e290dd5f3c7 assets/ornamentum/models/item/orange_glow_stained_glass.json 607643321c2eeefa64924f9ec9c0340ff62bba18 assets/ornamentum/models/item/pink_glow_block.json 0cb183d2d271f1e815a96f6ea86b4bab6b2d5181 assets/ornamentum/models/item/pink_glow_stained_glass.json +defc529d0b026561167f6eb60b616a37a4417913 assets/ornamentum/models/item/pool_tiles.json +486320d47c9e11407b21e1a3775718567fbfb49f assets/ornamentum/models/item/pool_tiles1.json 6e715a774558640e929d488521e3433a635932fb assets/ornamentum/models/item/purple_glow_block.json b2fc8da917d78178a0ef6c6276d3b9945162cff1 assets/ornamentum/models/item/purple_glow_stained_glass.json db9a73dcec9dbe05bdd56fa057e24bccdb9714d9 assets/ornamentum/models/item/red_glow_block.json diff --git a/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 b/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 index 87d26a8..6425efb 100644 --- a/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 +++ b/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 @@ -1,2 +1,2 @@ -// 1.21.1 2026-06-27T10:16:51.766495367 Languages: en_us for mod: ornamentum -7528646f5362b9684e346291a0f694c20e8a4231 assets/ornamentum/lang/en_us.json +// 1.21.1 2026-06-28T10:26:21.478263034 Languages: en_us for mod: ornamentum +6ef0bfb067e907421d76ab43cf54ff49834962c9 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 54929a1..fe09bc5 100644 --- a/src/generated/resources/assets/ornamentum/lang/en_us.json +++ b/src/generated/resources/assets/ornamentum/lang/en_us.json @@ -1,6 +1,4 @@ { - "creativetab.ornamentum.ornamentum": "Ornamentum", - "block.ornamentum.amethyst_grate": "Amethyst Grate", "block.ornamentum.black_glow_block": "Black Glow Block", "block.ornamentum.black_glow_stained_glass": "Black Glow Stained Glass", @@ -31,6 +29,8 @@ "block.ornamentum.orange_glow_stained_glass": "Orange Glow Stained Glass", "block.ornamentum.pink_glow_block": "Pink Glow Block", "block.ornamentum.pink_glow_stained_glass": "Pink Glow Stained Glass", + "block.ornamentum.pool_tiles": "Pool Tiles", + "block.ornamentum.pool_tiles1": "Pool Tiles", "block.ornamentum.purple_glow_block": "Purple Glow Block", "block.ornamentum.purple_glow_stained_glass": "Purple Glow Stained Glass", "block.ornamentum.red_glow_block": "Red Glow Block", diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json index ca9e332..3c59140 100644 --- a/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json @@ -5,6 +5,8 @@ "ornamentum:diamond_grate", "ornamentum:amethyst_grate", "ornamentum:obsidian_grate", - "ornamentum:netherite_grate" + "ornamentum:netherite_grate", + "ornamentum:pool_tiles", + "ornamentum:pool_tiles1" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json index f8dd07b..1f57ff8 100644 --- a/src/generated/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json @@ -21,6 +21,8 @@ "ornamentum:blue_glow_block", "ornamentum:purple_glow_block", "ornamentum:magenta_glow_block", - "ornamentum:pink_glow_block" + "ornamentum:pink_glow_block", + "ornamentum:pool_tiles", + "ornamentum:pool_tiles1" ] } \ 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 53f0c01..672aa8e 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -21,6 +21,8 @@ "ornamentum:blue_glow_block", "ornamentum:purple_glow_block", "ornamentum:magenta_glow_block", - "ornamentum:pink_glow_block" + "ornamentum:pink_glow_block", + "ornamentum:pool_tiles", + "ornamentum:pool_tiles1" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index 8e4caf3..6b7e50b 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -18,6 +18,8 @@ "ornamentum:pink_glow_block", "ornamentum:gold_grate", "ornamentum:diamond_grate", - "ornamentum:amethyst_grate" + "ornamentum:amethyst_grate", + "ornamentum:pool_tiles", + "ornamentum:pool_tiles1" ] } \ No newline at end of file diff --git a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java index 7d4dca4..1109d1b 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java @@ -17,6 +17,18 @@ public class ModBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Ornamentum.MODID); + public static final DeferredBlock POOL_TILES = registerBlock("pool_tiles", + () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK) + .strength(5.0f, 6.0f) + .noOcclusion() + )); + + public static final DeferredBlock POOL_TILES1 = registerBlock("pool_tiles1", + () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK) + .strength(5.0f, 6.0f) + .noOcclusion() + )); + //GRATES public static final DeferredBlock IRON_GRATE = registerBlock("iron_grate", diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java index 019c04a..8f436d5 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java @@ -16,6 +16,9 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider { @Override protected void generate() { + dropSelf(ModBlocks.POOL_TILES.get()); + dropSelf(ModBlocks.POOL_TILES1.get()); + dropSelf(ModBlocks.IRON_GRATE.get()); dropSelf(ModBlocks.GOLD_GRATE.get()); dropSelf(ModBlocks.DIAMOND_GRATE.get()); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java index 5c44dac..ea35a6e 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java @@ -15,6 +15,9 @@ public class ModBlockStateProvider extends BlockStateProvider { @Override protected void registerStatesAndModels() { + blockWithItem(ModBlocks.POOL_TILES); + blockWithItem(ModBlocks.POOL_TILES1); + //GRATES blockWithItem(ModBlocks.IRON_GRATE); blockWithItem(ModBlocks.GOLD_GRATE); @@ -58,6 +61,7 @@ public class ModBlockStateProvider extends BlockStateProvider { blockWithItem(ModBlocks.PURPLE_GLOW_STAINED_GLASS); blockWithItem(ModBlocks.MAGENTA_GLOW_STAINED_GLASS); blockWithItem(ModBlocks.PINK_GLOW_STAINED_GLASS); + } private void blockWithItem(DeferredBlock deferredBlock) { diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java index 86ad22a..b038469 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java @@ -42,6 +42,9 @@ public class ModBlockTagProvider extends BlockTagsProvider { .add(ModBlocks.PURPLE_GLOW_BLOCK.get()) .add(ModBlocks.MAGENTA_GLOW_BLOCK.get()) .add(ModBlocks.PINK_GLOW_BLOCK.get()) + + .add(ModBlocks.POOL_TILES.get()) + .add(ModBlocks.POOL_TILES1.get()) ; tag(BlockTags.NEEDS_IRON_TOOL) @@ -65,6 +68,9 @@ public class ModBlockTagProvider extends BlockTagsProvider { .add(ModBlocks.GOLD_GRATE.get()) .add(ModBlocks.DIAMOND_GRATE.get()) .add(ModBlocks.AMETHYST_GRATE.get()) + + .add(ModBlocks.POOL_TILES.get()) + .add(ModBlocks.POOL_TILES1.get()) ; tag(BlockTags.NEEDS_DIAMOND_TOOL) @@ -84,6 +90,9 @@ public class ModBlockTagProvider extends BlockTagsProvider { .add(ModBlocks.AMETHYST_GRATE.get()) .add(ModBlocks.OBSIDIAN_GRATE.get()) .add(ModBlocks.NETHERITE_GRATE.get()) + + .add(ModBlocks.POOL_TILES.get()) + .add(ModBlocks.POOL_TILES1.get()) ; tag(BlockTags.INCORRECT_FOR_WOODEN_TOOL) @@ -110,6 +119,9 @@ public class ModBlockTagProvider extends BlockTagsProvider { .add(ModBlocks.PURPLE_GLOW_BLOCK.get()) .add(ModBlocks.MAGENTA_GLOW_BLOCK.get()) .add(ModBlocks.PINK_GLOW_BLOCK.get()) + + .add(ModBlocks.POOL_TILES.get()) + .add(ModBlocks.POOL_TILES1.get()) ; } diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java index 4168daf..71e0e7a 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java @@ -56,6 +56,9 @@ public class ModLanguageProvider extends LanguageProvider { add(ModBlocks.AMETHYST_GRATE.get(), "Amethyst Grate"); add(ModBlocks.OBSIDIAN_GRATE.get(), "Obsidian Grate"); + add(ModBlocks.POOL_TILES.get(), "Pool Tiles"); + add(ModBlocks.POOL_TILES1.get(), "Pool Tiles"); + // Items //add(ModItems.EXAMPLE_ITEM.get(), "Example Item"); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java b/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java index 6a5b87d..5d95ffe 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java @@ -67,6 +67,9 @@ public class ModCreativeModeTabs { output.accept(ModBlocks.MAGENTA_GLOW_BLOCK); output.accept(ModBlocks.PINK_GLOW_BLOCK); + output.accept(ModBlocks.POOL_TILES); + output.accept(ModBlocks.POOL_TILES1); + }).build());