diff --git a/gradle.properties b/gradle.properties index 14abe08..f1f363f 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=1.0.0 +mod_version=1.2.0 # 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 3a91cae..9c280e4 100644 --- a/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 +++ b/src/generated/resources/.cache/5537763371ce84515b2ba566a215878d32b7df83 @@ -1,6 +1,6 @@ -// 1.21.1 2026-07-26T22:57:23.834633404 Tags for minecraft:block mod id ornamentum +// 1.21.1 2026-08-02T22:24:30.432351142 Tags for minecraft:block mod id ornamentum 585e131e594c65c425b3e81803fae3fdd63e2f03 data/c/tags/block/concretes.json -d6eacbcd8adf316d0d3916d8fb8ce6a41be2bb17 data/c/tags/block/dyed.json +8a593276bf0f1a0b0c1ed9cc71973bca6b52a1e0 data/c/tags/block/dyed.json 8281ec180c87b02f17e4be444a350685b52f1e31 data/c/tags/block/dyed/black.json c5af22efdd6bc4e49db48d9f1c6aa9a6228f3943 data/c/tags/block/dyed/blue.json 23316dbc715ef307fc7403c96e7106aaeb37c78f data/c/tags/block/dyed/brown.json @@ -16,14 +16,14 @@ b986c34a578e990b05a997d58e859e44d1fc3923 data/c/tags/block/dyed/pink.json 7267f692e572d8bb79319ef171602ea18c110856 data/c/tags/block/dyed/purple.json 3e5eaae7741c72bac72ca4a4cd6d4c1e2e33432b data/c/tags/block/dyed/red.json 6c2827ab10f9d45b6fdbb65525f364bca7324300 data/c/tags/block/dyed/white.json -1643bd18c2ec2637fa5e24e63d4588b992d8f6a5 data/c/tags/block/dyed/yellow.json +23f48f832a06267b949e8c1c6f2b9ac35607691c data/c/tags/block/dyed/yellow.json c79b0cf1b19fd14258867e1f8d2c87cf6481ae11 data/c/tags/block/glass_blocks.json c79b0cf1b19fd14258867e1f8d2c87cf6481ae11 data/c/tags/block/glass_blocks/cheap.json b1e1e3c5f1ef9108a9411874a67bb3d9fb46f83a data/c/tags/block/obsidians.json b1e1e3c5f1ef9108a9411874a67bb3d9fb46f83a data/c/tags/block/obsidians/normal.json 3681d2d9c40c84bbf5e4af460e9514b3c9cca3bc data/minecraft/tags/block/ancient_city_replaceable.json 00813da53c71d14e1be0b3750d3082ee8584eddc data/minecraft/tags/block/crystal_sound_blocks.json -f0db6cd47dabe41d4980b4bb0b2751ac66ce97c9 data/minecraft/tags/block/dampens_vibrations.json +7790f70a440a62743072fe45560bc1504cffca43 data/minecraft/tags/block/dampens_vibrations.json b1e1e3c5f1ef9108a9411874a67bb3d9fb46f83a data/minecraft/tags/block/dragon_immune.json c79b0cf1b19fd14258867e1f8d2c87cf6481ae11 data/minecraft/tags/block/impermeable.json ae7d2e386f2eb4df7cd8f8f3e0a4040cae7a13bf data/minecraft/tags/block/incorrect_for_gold_tool.json @@ -31,17 +31,17 @@ ae7d2e386f2eb4df7cd8f8f3e0a4040cae7a13bf data/minecraft/tags/block/incorrect_for 5bf3d2f5afa06168fa3bb8de07bdbaff4f7980db data/minecraft/tags/block/incorrect_for_stone_tool.json ae7d2e386f2eb4df7cd8f8f3e0a4040cae7a13bf data/minecraft/tags/block/incorrect_for_wooden_tool.json 26a948fa0b92ea3e254ed5b6aa26e1ab478e0715 data/minecraft/tags/block/mineable/axe.json -263d2aa2d2053f575e4cbd400bc5a0858a4dce19 data/minecraft/tags/block/mineable/pickaxe.json +5e558813b26f16ff03b3aaf517f5e20d4bd5aa0d data/minecraft/tags/block/mineable/pickaxe.json ec379d82d3fd4ddd3a9f6664ddb9aaaf0290834d data/minecraft/tags/block/needs_diamond_tool.json bad82b905081d37caba6026145cd8611bd369d5c data/minecraft/tags/block/needs_iron_tool.json -33e136c57ab3316e1b553dd00f9cc0b1f77b3283 data/minecraft/tags/block/needs_stone_tool.json -f0db6cd47dabe41d4980b4bb0b2751ac66ce97c9 data/minecraft/tags/block/occludes_vibration_signals.json +f6c07d4b70f139839ab8227ef4de8cd2c0c617f9 data/minecraft/tags/block/needs_stone_tool.json +7790f70a440a62743072fe45560bc1504cffca43 data/minecraft/tags/block/occludes_vibration_signals.json aad2571fcde7dc73bb943c24237eb17699067cfb data/minecraft/tags/block/sculk_replaceable.json 6014324ec06e8974ac7b92e7c0724c7710a6331c data/minecraft/tags/block/sculk_replaceable_world_gen.json 6b90f1b7a2445e2fcd7a94e1868c519346f538b0 data/minecraft/tags/block/slabs.json b6c17e9f0dca3e23e0f1a2216fed15c517307c9d data/minecraft/tags/block/stairs.json 00813da53c71d14e1be0b3750d3082ee8584eddc data/minecraft/tags/block/vibration_resonators.json -f0db6cd47dabe41d4980b4bb0b2751ac66ce97c9 data/minecraft/tags/block/wool.json +7790f70a440a62743072fe45560bc1504cffca43 data/minecraft/tags/block/wool.json e4ae82dd0cb196f34f9128191dac796d24da8bef data/ornamentum/tags/block/countries_flags.json aab679c9c8b8bd6ccf7f2decbcb9e66e5e6282fd data/ornamentum/tags/block/flags.json 6e6f2af444861c953f968ba3a6e5633feed02e44 data/ornamentum/tags/block/pride_flags.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 11216e7..432eb4e 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2026-07-26T22:47:54.704737613 Loot Tables +// 1.21.1 2026-08-02T22:15:44.398016331 Loot Tables b840d3c223a8269ea4ead11f9d1a337f16c87728 data/ornamentum/loot_table/blocks/agender_flag.json c5c3cbbff0b4af321ae05896dbd68e551f598c86 data/ornamentum/loot_table/blocks/amethyst_grate.json f44341b5b821a1ea423b1f9e81a020e324a3952e data/ornamentum/loot_table/blocks/ametist_bricks.json @@ -70,6 +70,7 @@ a5396a39055338fecb45c276985a6d7e004a5b3d data/ornamentum/loot_table/blocks/cyan_ 8e0349fa0d98f7c071dfa0b94609050073255281 data/ornamentum/loot_table/blocks/demisexual_flag.json 3bf1da00d5160a863281eae4449868c077c4aa32 data/ornamentum/loot_table/blocks/denmark_flag.json d5759aa6b55f402e60d0d2034b7706549ca17e82 data/ornamentum/loot_table/blocks/diamond_grate.json +9e63d610e9391c9aa5275b7f277265e457a6adf4 data/ornamentum/loot_table/blocks/duck.json d026ac89fab7221c3f60d828bad42af0562ab9c7 data/ornamentum/loot_table/blocks/finland_flag.json f2c529d110328314d042609045907cbf565aabe9 data/ornamentum/loot_table/blocks/france_flag.json cb1c2b6f83f213c65dae3f8a644479a61c0954bd data/ornamentum/loot_table/blocks/gay_men_flag.json @@ -110,6 +111,7 @@ c114d52e02871e890cb58c297ea6805451193c0f data/ornamentum/loot_table/blocks/green 849f0990dd952d54589b1e333a28c077ec7850a8 data/ornamentum/loot_table/blocks/intersex_flag.json 37d5b2727981ced394920b750406cbc0b74acf31 data/ornamentum/loot_table/blocks/ireland_flag.json 09b444eecc59c7b1d3bd022ed586b02fc453fd79 data/ornamentum/loot_table/blocks/iron_grate.json +5648e73fcde264c5a891be6b255c839d1f9cbde6 data/ornamentum/loot_table/blocks/iron_shelf.json 6e510b676f127b3da6c747448acf7177b47c6cba data/ornamentum/loot_table/blocks/italy_flag.json a2a942324da23c81373348615f879ce7e45613b8 data/ornamentum/loot_table/blocks/japan_flag.json 870553193baf9b8ec6f314de587d4102c85a220e data/ornamentum/loot_table/blocks/latvia_flag.json diff --git a/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 b/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 index 92cc704..9b2176d 100644 --- a/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 +++ b/src/generated/resources/.cache/8eabf35e4ef64464e61dd27839db58b6edc7b568 @@ -1,2 +1,2 @@ -// 1.21.1 2026-07-26T22:50:04.662344965 Languages: en_us for mod: ornamentum -6fbd4ff532ae809d298968e7f54bbdd2fab2e222 assets/ornamentum/lang/en_us.json +// 1.21.1 2026-08-02T22:15:44.404577242 Languages: en_us for mod: ornamentum +88428a6464b98f96f1bab11aef531d0a3e1c00fe 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 364bfcb..9082200 100644 --- a/src/generated/resources/assets/ornamentum/lang/en_us.json +++ b/src/generated/resources/assets/ornamentum/lang/en_us.json @@ -70,6 +70,7 @@ "block.ornamentum.demisexual_flag": "Demisexual Flag", "block.ornamentum.denmark_flag": "Denmark Flag", "block.ornamentum.diamond_grate": "Diamond Grate", + "block.ornamentum.duck": "Duck", "block.ornamentum.finland_flag": "Finland Flag", "block.ornamentum.france_flag": "France Flag", "block.ornamentum.gay_men_flag": "Gay Men Flag", @@ -110,6 +111,7 @@ "block.ornamentum.intersex_flag": "Intersex Flag", "block.ornamentum.ireland_flag": "Ireland Flag", "block.ornamentum.iron_grate": "Iron Grate", + "block.ornamentum.iron_shelf": "Iron Shelf", "block.ornamentum.italy_flag": "Italy Flag", "block.ornamentum.japan_flag": "Japan Flag", "block.ornamentum.latvia_flag": "Latvia Flag", diff --git a/src/generated/resources/data/c/tags/block/dyed.json b/src/generated/resources/data/c/tags/block/dyed.json index c3e6c8b..f8726e8 100644 --- a/src/generated/resources/data/c/tags/block/dyed.json +++ b/src/generated/resources/data/c/tags/block/dyed.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:duck", "ornamentum:white_flag", "ornamentum:orange_flag", "ornamentum:magenta_flag", diff --git a/src/generated/resources/data/c/tags/block/dyed/yellow.json b/src/generated/resources/data/c/tags/block/dyed/yellow.json index cd54627..310bae5 100644 --- a/src/generated/resources/data/c/tags/block/dyed/yellow.json +++ b/src/generated/resources/data/c/tags/block/dyed/yellow.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:duck", "ornamentum:yellow_wool_stairs", "ornamentum:yellow_wool_slab", "ornamentum:yellow_glow_stained_glass", diff --git a/src/generated/resources/data/minecraft/tags/block/dampens_vibrations.json b/src/generated/resources/data/minecraft/tags/block/dampens_vibrations.json index a71d301..513cb0d 100644 --- a/src/generated/resources/data/minecraft/tags/block/dampens_vibrations.json +++ b/src/generated/resources/data/minecraft/tags/block/dampens_vibrations.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:duck", "ornamentum:white_wool_slab", "ornamentum:orange_wool_slab", "ornamentum:magenta_wool_slab", 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 e68faf9..e43de75 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:iron_shelf", "ornamentum:red_pattern_block", "ornamentum:red_pattern_block_stairs", "ornamentum:red_pattern_block_slab", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json index 1e25121..3f7ceed 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:iron_shelf", "ornamentum:iron_grate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/occludes_vibration_signals.json b/src/generated/resources/data/minecraft/tags/block/occludes_vibration_signals.json index a71d301..513cb0d 100644 --- a/src/generated/resources/data/minecraft/tags/block/occludes_vibration_signals.json +++ b/src/generated/resources/data/minecraft/tags/block/occludes_vibration_signals.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:duck", "ornamentum:white_wool_slab", "ornamentum:orange_wool_slab", "ornamentum:magenta_wool_slab", diff --git a/src/generated/resources/data/minecraft/tags/block/wool.json b/src/generated/resources/data/minecraft/tags/block/wool.json index a71d301..513cb0d 100644 --- a/src/generated/resources/data/minecraft/tags/block/wool.json +++ b/src/generated/resources/data/minecraft/tags/block/wool.json @@ -1,5 +1,6 @@ { "values": [ + "ornamentum:duck", "ornamentum:white_wool_slab", "ornamentum:orange_wool_slab", "ornamentum:magenta_wool_slab", diff --git a/src/generated/resources/data/ornamentum/loot_table/blocks/duck.json b/src/generated/resources/data/ornamentum/loot_table/blocks/duck.json new file mode 100644 index 0000000..2ec16c7 --- /dev/null +++ b/src/generated/resources/data/ornamentum/loot_table/blocks/duck.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "ornamentum:duck" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "ornamentum:blocks/duck" +} \ No newline at end of file diff --git a/src/generated/resources/data/ornamentum/loot_table/blocks/iron_shelf.json b/src/generated/resources/data/ornamentum/loot_table/blocks/iron_shelf.json new file mode 100644 index 0000000..4f59d1a --- /dev/null +++ b/src/generated/resources/data/ornamentum/loot_table/blocks/iron_shelf.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "ornamentum:iron_shelf" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "ornamentum:blocks/iron_shelf" +} \ 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 011badd..3556509 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java @@ -20,6 +20,9 @@ public class ModBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Ornamentum.MODID); + public static final DeferredBlock DUCK = registerBlock("duck", + () -> new ShelfBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.YELLOW_CARPET).noOcclusion())); + public static final DeferredBlock IRON_SHELF = registerBlock("iron_shelf", () -> new ShelfBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK).noOcclusion())); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/blocks/custom/duckBlock.java b/src/main/java/ovh/glitchlabs/ornamentum/blocks/custom/duckBlock.java new file mode 100644 index 0000000..e687510 --- /dev/null +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/custom/duckBlock.java @@ -0,0 +1,43 @@ +package ovh.glitchlabs.ornamentum.blocks.custom; + +import com.mojang.serialization.MapCodec; +import net.minecraft.core.BlockPos; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.Nullable; + +public class duckBlock extends HorizontalDirectionalBlock { + public static final MapCodec CODEC = simpleCodec(duckBlock::new); + private static final VoxelShape SHAPE = Block.box(7.0, 0.0, 7.0, 9.0, 4.0, 9.0); + + public duckBlock(Properties properties) { + super(properties); + } + + @Override + protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + return SHAPE; + } + + @Override + protected MapCodec codec() { + return CODEC; + } + + @Nullable + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(FACING); + } +} \ No newline at end of file diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java index 9ec5841..020a16f 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java @@ -17,6 +17,9 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider { @Override protected void generate() { + dropSelf(ModBlocks.DUCK.get()); + dropSelf(ModBlocks.IRON_SHELF.get()); + dropSelf(ModBlocks.OBSIDIAN_BRICKS.get()); dropSelf(ModBlocks.OBSIDIAN_TILES.get()); dropSelf(ModBlocks.CRACKED_OBSIDIAN_BRICKS.get()); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java index 731b52c..28baba8 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockTagProvider.java @@ -23,7 +23,6 @@ public class ModBlockTagProvider extends BlockTagsProvider { 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()) @@ -295,7 +294,6 @@ public class ModBlockTagProvider extends BlockTagsProvider { .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) @@ -589,6 +587,8 @@ public class ModBlockTagProvider extends BlockTagsProvider { ; tag(BlockTags.DAMPENS_VIBRATIONS) + .add(ModBlocks.DUCK.get()) + .add(ModBlocks.WHITE_WOOL_SLAB.get()) .add(ModBlocks.ORANGE_WOOL_SLAB.get()) .add(ModBlocks.MAGENTA_WOOL_SLAB.get()) @@ -626,6 +626,8 @@ public class ModBlockTagProvider extends BlockTagsProvider { ; tag(BlockTags.OCCLUDES_VIBRATION_SIGNALS) + .add(ModBlocks.DUCK.get()) + .add(ModBlocks.WHITE_WOOL_SLAB.get()) .add(ModBlocks.ORANGE_WOOL_SLAB.get()) .add(ModBlocks.MAGENTA_WOOL_SLAB.get()) @@ -662,6 +664,7 @@ public class ModBlockTagProvider extends BlockTagsProvider { ; tag(BlockTags.WOOL) + .add(ModBlocks.DUCK.get()) .add(ModBlocks.WHITE_WOOL_SLAB.get()) .add(ModBlocks.ORANGE_WOOL_SLAB.get()) @@ -699,6 +702,7 @@ public class ModBlockTagProvider extends BlockTagsProvider { ; tag(Tags.Blocks.DYED) + .add(ModBlocks.DUCK.get()) .add(ModBlocks.WHITE_FLAG.get()) .add(ModBlocks.ORANGE_FLAG.get()) @@ -1028,6 +1032,8 @@ public class ModBlockTagProvider extends BlockTagsProvider { ; tag(Tags.Blocks.DYED_YELLOW) + .add(ModBlocks.DUCK.get()) + .add(ModBlocks.YELLOW_WOOL_STAIRS.get()) .add(ModBlocks.YELLOW_WOOL_SLAB.get()) .add(ModBlocks.YELLOW_GLOW_STAINED_GLASS.get()) diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java index 1f69101..65a6f20 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModLanguageProvider.java @@ -342,12 +342,10 @@ public class ModLanguageProvider extends LanguageProvider { add(ModBlocks.CRACKED_OBSIDIAN_TILES.get(), "Cracked Obsidian Tiles"); add(ModBlocks.IRON_SHELF.get(), "Iron Shelf"); + add(ModBlocks.DUCK.get(), "Duck"); add("creativetab.ornamentum.ornamentum", "Ornamentum"); - // Items - //add(ModItems.EXAMPLE_ITEM.get(), "Example Item"); - // Messages //add("message.ornamentum.test", "Hello World!"); } diff --git a/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java b/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java index fb0d80d..5a5d9da 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java @@ -23,6 +23,68 @@ public class ModCreativeModeTabs { .title(Component.translatable("creativetab.ornamentum.ornamentum")) .displayItems((itemDisplayParameters, output) -> { + output.accept(ModBlocks.DUCK); + output.accept(ModBlocks.IRON_SHELF); + + //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); + // Glow Glass output.accept(ModBlocks.WHITE_GLOW_STAINED_GLASS); output.accept(ModBlocks.ORANGE_GLOW_STAINED_GLASS); @@ -197,65 +259,6 @@ 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); diff --git a/src/main/resources/assets/ornamentum/blockstates/duck.json b/src/main/resources/assets/ornamentum/blockstates/duck.json new file mode 100644 index 0000000..cab43e8 --- /dev/null +++ b/src/main/resources/assets/ornamentum/blockstates/duck.json @@ -0,0 +1,16 @@ +{ + "variants": { + "facing=north": [ + { "model": "ornamentum:block/duck"} + ], + "facing=south": [ + { "model": "ornamentum:block/duck", "y": 180} + ], + "facing=east": [ + { "model": "ornamentum:block/duck", "y": 90} + ], + "facing=west": [ + { "model": "ornamentum:block/duck", "y": 270} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json b/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json index 413db98..73a5b82 100644 --- a/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json +++ b/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json @@ -1,20 +1,32 @@ { "variants": { "facing=north": [ - { "model": "ornamentum:block/iron_shelf", "weight": 3 }, - { "model": "ornamentum:block/iron_shelf_things_1", "weight": 1 } + { "model": "ornamentum:block/iron_shelf", "weight": 6 }, + { "model": "ornamentum:block/iron_shelf_things_1", "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_2", "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_3", "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_4", "weight": 3 } ], "facing=south": [ - { "model": "ornamentum:block/iron_shelf", "y": 180, "weight": 3 }, - { "model": "ornamentum:block/iron_shelf_things_1", "y": 180, "weight": 1 } + { "model": "ornamentum:block/iron_shelf", "y": 180, "weight": 6 }, + { "model": "ornamentum:block/iron_shelf_things_1", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_2", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_3", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_4", "y": 180, "weight": 3 } ], "facing=east": [ - { "model": "ornamentum:block/iron_shelf", "y": 90, "weight": 3 }, - { "model": "ornamentum:block/iron_shelf_things_1", "y": 90, "weight": 1 } + { "model": "ornamentum:block/iron_shelf", "y": 90, "weight": 6 }, + { "model": "ornamentum:block/iron_shelf_things_1", "y": 90, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_2", "y": 90, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_3", "y": 90, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_4", "y": 90, "weight": 3 } ], "facing=west": [ - { "model": "ornamentum:block/iron_shelf", "y": 270, "weight": 3 }, - { "model": "ornamentum:block/iron_shelf_things_1", "y": 270, "weight": 1 } + { "model": "ornamentum:block/iron_shelf", "y": 270, "weight": 6 }, + { "model": "ornamentum:block/iron_shelf_things_1", "y": 270, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_2", "y": 270, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_3", "y": 270, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_4", "y": 270, "weight": 3 } ] } } \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/models/block/duck.json b/src/main/resources/assets/ornamentum/models/block/duck.json new file mode 100644 index 0000000..ab5a6ca --- /dev/null +++ b/src/main/resources/assets/ornamentum/models/block/duck.json @@ -0,0 +1,111 @@ +{ + "format_version": "1.21.11", + "credit": "Made with Blockbench by ian1337", + "parent": "block/block", + "textures": { + "0": "ornamentum:block/duck", + "particle": "ornamentum:block/duck" + }, + "elements": [ + { + "from": [6.46339, 0, 7.13839], + "to": [9.46339, 2, 10.13839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [9, 12, 14, 16], "texture": "#0"}, + "east": {"uv": [5, 12, 0, 16], "texture": "#0"}, + "south": {"uv": [9, 12, 14, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 5, 16], "texture": "#0"}, + "up": {"uv": [5, 12, 9, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [5, 12, 9, 16], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [6.96339, 2, 9.88839], + "to": [8.96339, 2.5, 10.38839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [13, 0, 15, 0.5], "texture": "#0"}, + "east": {"uv": [13, 1.5, 13.5, 2], "texture": "#0"}, + "south": {"uv": [13, 0.5, 15, 1], "texture": "#0"}, + "west": {"uv": [13, 1, 13.5, 1.5], "texture": "#0"}, + "up": {"uv": [12.5, 0, 13, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [12, 0, 12.5, 2], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [6.96339, 0.5, 10.13839], + "to": [8.96339, 2, 10.63839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [12, 2.25, 14, 3.75], "texture": "#0"}, + "east": {"uv": [15.5, 2.25, 16, 3.75], "texture": "#0"}, + "south": {"uv": [12, 2.25, 14, 3.75], "texture": "#0"}, + "west": {"uv": [15, 2, 15.5, 3.5], "texture": "#0"}, + "up": {"uv": [14, 2.25, 14.5, 4.25], "rotation": 90, "texture": "#0"}, + "down": {"uv": [14.5, 2.25, 15, 4.25], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [9.46339, 1, 7.88839], + "to": [9.96339, 2, 9.88839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [6.5, 8, 7.5, 9.5], "texture": "#0"}, + "east": {"uv": [4, 8, 6.5, 9.5], "texture": "#0"}, + "south": {"uv": [6.5, 8, 7.5, 9.5], "texture": "#0"}, + "west": {"uv": [4, 8, 6.5, 9.5], "texture": "#0"}, + "up": {"uv": [4, 9.5, 6.5, 10.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 9.5, 6.5, 10.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5.96339, 1, 7.88839], + "to": [6.46339, 2, 9.88839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [2.5, 0, 3, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "west": {"uv": [4, 8, 6.5, 9.5], "texture": "#0"}, + "up": {"uv": [2, 2.5, 4, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [2, 0, 4, 0.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [6.96339, 1.5, 5.63839], + "to": [8.96339, 3.5, 7.63839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "east": {"uv": [4, 4, 0, 8], "texture": "#0"}, + "south": {"uv": [0, 8, 4, 12], "texture": "#0"}, + "west": {"uv": [0, 4, 4, 8], "texture": "#0"}, + "up": {"uv": [4, 0, 8, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 4, 8, 8], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [7.46339, 1.75, 5.13839], + "to": [8.46339, 2.25, 6.13839], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96339, 1.75, 8.13839]}, + "faces": { + "north": {"uv": [9, 0, 11, 0.5], "texture": "#0"}, + "east": {"uv": [9, 1, 11, 1.5], "texture": "#0"}, + "south": {"uv": [9, 1.5, 11, 2], "texture": "#0"}, + "west": {"uv": [9, 0.5, 11, 1], "texture": "#0"}, + "up": {"uv": [11, 0, 12, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 9, 1], "rotation": 270, "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "duck", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_1.json b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_1.json index aea6e4b..bac67c7 100644 --- a/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_1.json +++ b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_1.json @@ -4,7 +4,7 @@ "parent": "block/block", "textures": { "1": "ornamentum:block/iron_shelf/iron_shelf", - "2": "ornamentum:block/iron_shelf/iron_shelf_things_duck", + "2": "ornamentum:block/duck", "particle": "ornamentum:block/iron_shelf/iron_shelf" }, "elements": [ diff --git a/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_2.json b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_2.json new file mode 100644 index 0000000..9309d1f --- /dev/null +++ b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_2.json @@ -0,0 +1,250 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench by ian1337", + "parent": "block/block", + "textures": { + "1": "ornamentum:block/iron_shelf/iron_shelf", + "2": "ornamentum:block/duck", + "3": "minecraft:block/redstone_block", + "particle": "ornamentum:block/iron_shelf/iron_shelf" + }, + "elements": [ + { + "name": "frame_R", + "from": [0, 0, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "south": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [12, 0, 13, 1], "texture": "#1"}, + "down": {"uv": [14, 15, 15, 16], "texture": "#1"} + } + }, + { + "name": "Frame_R_back", + "from": [0, 0, 15], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "south": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "west": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "up": {"uv": [1, 1, 2, 2], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L_back", + "from": [15, 0, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "south": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [10, 14, 11, 15], "texture": "#1"}, + "down": {"uv": [1, 0, 2, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L", + "from": [15, 0, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, + "west": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#1"}, + "down": {"uv": [0, 15, 1, 16], "texture": "#1"} + } + }, + { + "name": "lower_level", + "from": [0.5, 3, 0.5], + "to": [15.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 3, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "upper_level", + "from": [0.5, 11, 0.5], + "to": [15.5, 11, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 11, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [10.375, 3.1, 2.375], + "to": [13.375, 5.1, 5.375], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [9, 12, 14, 16], "texture": "#2"}, + "east": {"uv": [5, 12, 0, 16], "texture": "#2"}, + "south": {"uv": [9, 12, 14, 16], "texture": "#2"}, + "west": {"uv": [0, 12, 5, 16], "texture": "#2"}, + "up": {"uv": [5, 12, 9, 16], "rotation": 90, "texture": "#2"}, + "down": {"uv": [5, 12, 9, 16], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [10.875, 5.1, 5.125], + "to": [12.875, 5.6, 5.625], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [13, 0, 15, 0.5], "texture": "#2"}, + "east": {"uv": [13, 1.5, 13.5, 2], "texture": "#2"}, + "south": {"uv": [13, 0.5, 15, 1], "texture": "#2"}, + "west": {"uv": [13, 1, 13.5, 1.5], "texture": "#2"}, + "up": {"uv": [12.5, 0, 13, 2], "rotation": 90, "texture": "#2"}, + "down": {"uv": [12, 0, 12.5, 2], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [10.875, 3.6, 5.375], + "to": [12.875, 5.1, 5.875], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [12, 2.25, 14, 3.75], "texture": "#2"}, + "east": {"uv": [15.5, 2.25, 16, 3.75], "texture": "#2"}, + "south": {"uv": [12, 2.25, 14, 3.75], "texture": "#2"}, + "west": {"uv": [15, 2, 15.5, 3.5], "texture": "#2"}, + "up": {"uv": [14, 2.25, 14.5, 4.25], "rotation": 90, "texture": "#2"}, + "down": {"uv": [14.5, 2.25, 15, 4.25], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [13.375, 4.1, 3.125], + "to": [13.875, 5.1, 5.125], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [6.5, 8, 7.5, 9.5], "texture": "#2"}, + "east": {"uv": [4, 8, 6.5, 9.5], "texture": "#2"}, + "south": {"uv": [6.5, 8, 7.5, 9.5], "texture": "#2"}, + "west": {"uv": [4, 8, 6.5, 9.5], "texture": "#2"}, + "up": {"uv": [4, 9.5, 6.5, 10.5], "rotation": 90, "texture": "#2"}, + "down": {"uv": [4, 9.5, 6.5, 10.5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [9.875, 4.1, 3.125], + "to": [10.375, 5.1, 5.125], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [2.5, 0, 3, 1], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#2"}, + "south": {"uv": [0, 0, 0.5, 1], "texture": "#2"}, + "west": {"uv": [4, 8, 6.5, 9.5], "texture": "#2"}, + "up": {"uv": [2, 2.5, 4, 3], "rotation": 90, "texture": "#2"}, + "down": {"uv": [2, 0, 4, 0.5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [10.875, 4.6, 0.875], + "to": [12.875, 6.6, 2.875], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#2"}, + "east": {"uv": [4, 4, 0, 8], "texture": "#2"}, + "south": {"uv": [0, 8, 4, 12], "texture": "#2"}, + "west": {"uv": [0, 4, 4, 8], "texture": "#2"}, + "up": {"uv": [4, 0, 8, 4], "rotation": 90, "texture": "#2"}, + "down": {"uv": [4, 4, 8, 8], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [11.375, 4.85, 0.375], + "to": [12.375, 5.35, 1.375], + "rotation": {"angle": 45, "axis": "y", "origin": [11.875, 4.85, 3.25]}, + "faces": { + "north": {"uv": [9, 0, 11, 0.5], "texture": "#2"}, + "east": {"uv": [9, 1, 11, 1.5], "texture": "#2"}, + "south": {"uv": [9, 1.5, 11, 2], "texture": "#2"}, + "west": {"uv": [9, 0.5, 11, 1], "texture": "#2"}, + "up": {"uv": [11, 0, 12, 1], "rotation": 90, "texture": "#2"}, + "down": {"uv": [8, 0, 9, 1], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [5, 3.1, 5], + "to": [9, 7.1, 9], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5, 3.1, 5]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": {}, + "groups": [ + { + "name": "iron_shelf", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "frame", + "origin": [0, 0, 0], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "levels", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + 4, + 5, + { + "name": "things", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "duck", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [6, 7, 8, 9, 10, 11, 12] + }, + { + "name": "block", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [13] + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_3.json b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_3.json new file mode 100644 index 0000000..6513477 --- /dev/null +++ b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_3.json @@ -0,0 +1,250 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench by ian1337", + "parent": "block/block", + "textures": { + "1": "ornamentum:block/iron_shelf/iron_shelf", + "2": "ornamentum:block/duck", + "3": "minecraft:block/redstone_block", + "particle": "ornamentum:block/iron_shelf/iron_shelf" + }, + "elements": [ + { + "name": "frame_R", + "from": [0, 0, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "south": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [12, 0, 13, 1], "texture": "#1"}, + "down": {"uv": [14, 15, 15, 16], "texture": "#1"} + } + }, + { + "name": "Frame_R_back", + "from": [0, 0, 15], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "south": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "west": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "up": {"uv": [1, 1, 2, 2], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L_back", + "from": [15, 0, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "south": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [10, 14, 11, 15], "texture": "#1"}, + "down": {"uv": [1, 0, 2, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L", + "from": [15, 0, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, + "west": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#1"}, + "down": {"uv": [0, 15, 1, 16], "texture": "#1"} + } + }, + { + "name": "lower_level", + "from": [0.5, 3, 0.5], + "to": [15.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 3, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "upper_level", + "from": [0.5, 11, 0.5], + "to": [15.5, 11, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 11, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [4.375, 3.1, 3.375], + "to": [7.375, 5.1, 6.375], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [9, 12, 14, 16], "texture": "#2"}, + "east": {"uv": [5, 12, 0, 16], "texture": "#2"}, + "south": {"uv": [9, 12, 14, 16], "texture": "#2"}, + "west": {"uv": [0, 12, 5, 16], "texture": "#2"}, + "up": {"uv": [5, 12, 9, 16], "rotation": 90, "texture": "#2"}, + "down": {"uv": [5, 12, 9, 16], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [4.875, 5.1, 6.125], + "to": [6.875, 5.6, 6.625], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [13, 0, 15, 0.5], "texture": "#2"}, + "east": {"uv": [13, 1.5, 13.5, 2], "texture": "#2"}, + "south": {"uv": [13, 0.5, 15, 1], "texture": "#2"}, + "west": {"uv": [13, 1, 13.5, 1.5], "texture": "#2"}, + "up": {"uv": [12.5, 0, 13, 2], "rotation": 90, "texture": "#2"}, + "down": {"uv": [12, 0, 12.5, 2], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [4.875, 3.6, 6.375], + "to": [6.875, 5.1, 6.875], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [12, 2.25, 14, 3.75], "texture": "#2"}, + "east": {"uv": [15.5, 2.25, 16, 3.75], "texture": "#2"}, + "south": {"uv": [12, 2.25, 14, 3.75], "texture": "#2"}, + "west": {"uv": [15, 2, 15.5, 3.5], "texture": "#2"}, + "up": {"uv": [14, 2.25, 14.5, 4.25], "rotation": 90, "texture": "#2"}, + "down": {"uv": [14.5, 2.25, 15, 4.25], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.375, 4.1, 4.125], + "to": [7.875, 5.1, 6.125], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [6.5, 8, 7.5, 9.5], "texture": "#2"}, + "east": {"uv": [4, 8, 6.5, 9.5], "texture": "#2"}, + "south": {"uv": [6.5, 8, 7.5, 9.5], "texture": "#2"}, + "west": {"uv": [4, 8, 6.5, 9.5], "texture": "#2"}, + "up": {"uv": [4, 9.5, 6.5, 10.5], "rotation": 90, "texture": "#2"}, + "down": {"uv": [4, 9.5, 6.5, 10.5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [3.875, 4.1, 4.125], + "to": [4.375, 5.1, 6.125], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [2.5, 0, 3, 1], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#2"}, + "south": {"uv": [0, 0, 0.5, 1], "texture": "#2"}, + "west": {"uv": [4, 8, 6.5, 9.5], "texture": "#2"}, + "up": {"uv": [2, 2.5, 4, 3], "rotation": 90, "texture": "#2"}, + "down": {"uv": [2, 0, 4, 0.5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [4.875, 4.6, 1.875], + "to": [6.875, 6.6, 3.875], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#2"}, + "east": {"uv": [4, 4, 0, 8], "texture": "#2"}, + "south": {"uv": [0, 8, 4, 12], "texture": "#2"}, + "west": {"uv": [0, 4, 4, 8], "texture": "#2"}, + "up": {"uv": [4, 0, 8, 4], "rotation": 90, "texture": "#2"}, + "down": {"uv": [4, 4, 8, 8], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [5.375, 4.85, 1.375], + "to": [6.375, 5.35, 2.375], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5.875, 4.85, 4.25]}, + "faces": { + "north": {"uv": [9, 0, 11, 0.5], "texture": "#2"}, + "east": {"uv": [9, 1, 11, 1.5], "texture": "#2"}, + "south": {"uv": [9, 1.5, 11, 2], "texture": "#2"}, + "west": {"uv": [9, 0.5, 11, 1], "texture": "#2"}, + "up": {"uv": [11, 0, 12, 1], "rotation": 90, "texture": "#2"}, + "down": {"uv": [8, 0, 9, 1], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [5, 11.1, 5], + "to": [9, 15.1, 9], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5, 11.1, 5]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": {}, + "groups": [ + { + "name": "iron_shelf", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "frame", + "origin": [0, 0, 0], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "levels", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + 4, + 5, + { + "name": "things", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "duck", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [6, 7, 8, 9, 10, 11, 12] + }, + { + "name": "block", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [13] + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_4.json b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_4.json new file mode 100644 index 0000000..e6cf81f --- /dev/null +++ b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_4.json @@ -0,0 +1,151 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench by Ian1337", + "parent": "block/block", + "textures": { + "1": "ornamentum:block/iron_shelf/iron_shelf", + "3": "minecraft:block/redstone_block", + "particle": "ornamentum:block/iron_shelf/iron_shelf" + }, + "elements": [ + { + "name": "frame_R", + "from": [0, 0, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "south": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [12, 0, 13, 1], "texture": "#1"}, + "down": {"uv": [14, 15, 15, 16], "texture": "#1"} + } + }, + { + "name": "Frame_R_back", + "from": [0, 0, 15], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "south": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "west": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "up": {"uv": [1, 1, 2, 2], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L_back", + "from": [15, 0, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "south": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [10, 14, 11, 15], "texture": "#1"}, + "down": {"uv": [1, 0, 2, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L", + "from": [15, 0, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, + "west": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#1"}, + "down": {"uv": [0, 15, 1, 16], "texture": "#1"} + } + }, + { + "name": "lower_level", + "from": [0.5, 3, 0.5], + "to": [15.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 3, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "upper_level", + "from": [0.5, 11, 0.5], + "to": [15.5, 11, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 11, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [5, 11.1, 5], + "to": [9, 15.1, 9], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5, 11.1, 5]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": {}, + "groups": [ + { + "name": "iron_shelf", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "frame", + "origin": [0, 0, 0], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "levels", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + 4, + 5, + { + "name": "things", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "block", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [6] + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/models/item/duck.json b/src/main/resources/assets/ornamentum/models/item/duck.json new file mode 100644 index 0000000..23c1c98 --- /dev/null +++ b/src/main/resources/assets/ornamentum/models/item/duck.json @@ -0,0 +1,3 @@ +{ + "parent": "ornamentum:block/duck" +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/textures/block/iron_shelf/iron_shelf_things_duck.png b/src/main/resources/assets/ornamentum/textures/block/duck.png similarity index 100% rename from src/main/resources/assets/ornamentum/textures/block/iron_shelf/iron_shelf_things_duck.png rename to src/main/resources/assets/ornamentum/textures/block/duck.png