From b62de9f78c967e4844872bd7ebeeff239336fb82 Mon Sep 17 00:00:00 2001 From: Glitchlabs Date: Sat, 25 Jul 2026 21:08:33 +0200 Subject: [PATCH] + update flag model --- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 4 +- .../76fa529304d84db1465431f69702c7947fc3a5d2 | 8 +- .../blockstates/progress_pride_flag.json | 19 +++++ .../ornamentum/blockstates/test_flag.json | 19 ----- ...est_flag.json => progress_pride_flag.json} | 2 +- .../models/item/progress_pride_flag.json | 3 + .../ornamentum/models/item/test_flag.json | 3 - ...est_flag.json => progress_pride_flag.json} | 4 +- .../ornamentum/blocks/ModBlocks.java | 2 +- .../datagen/ModBlockLootTableProvider.java | 2 +- .../datagen/ModBlockStateProvider.java | 2 +- .../ornamentum/items/ModCreativeModeTabs.java | 2 + .../models/block/template_flag.json | 75 +++++++++--------- .../block/flags/progress_pride_flag.png | Bin 0 -> 274 bytes .../textures/block/flags/test_flag.png | Bin 219 -> 0 bytes 15 files changed, 73 insertions(+), 72 deletions(-) create mode 100644 src/generated/resources/assets/ornamentum/blockstates/progress_pride_flag.json delete mode 100644 src/generated/resources/assets/ornamentum/blockstates/test_flag.json rename src/generated/resources/assets/ornamentum/models/block/{test_flag.json => progress_pride_flag.json} (56%) create mode 100644 src/generated/resources/assets/ornamentum/models/item/progress_pride_flag.json delete mode 100644 src/generated/resources/assets/ornamentum/models/item/test_flag.json rename src/generated/resources/data/ornamentum/loot_table/blocks/{test_flag.json => progress_pride_flag.json} (72%) create mode 100644 src/main/resources/assets/ornamentum/textures/block/flags/progress_pride_flag.png delete mode 100644 src/main/resources/assets/ornamentum/textures/block/flags/test_flag.png diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 927f54f..f987ba3 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2026-07-25T20:27:48.574282864 Loot Tables +// 1.21.1 2026-07-25T21:05:29.893445751 Loot Tables c5c3cbbff0b4af321ae05896dbd68e551f598c86 data/ornamentum/loot_table/blocks/amethyst_grate.json f44341b5b821a1ea423b1f9e81a020e324a3952e data/ornamentum/loot_table/blocks/ametist_bricks.json 45e380c3f67f2a7eb3eabe9364929d9b9efc5b76 data/ornamentum/loot_table/blocks/ametist_bricks_slab.json @@ -168,6 +168,7 @@ d836515148db64b9248dfb8ce7cff4850f6e35db data/ornamentum/loot_table/blocks/pool_ caa5b244a147e54b90eb48aadb21d7814db66687 data/ornamentum/loot_table/blocks/pool_tiles1_stairs.json 5790488f25c25778920c7281a251496a4615fbf2 data/ornamentum/loot_table/blocks/pool_tiles_slab.json 2ecf7bbcdabd93021e28c05e14286a640d8e6510 data/ornamentum/loot_table/blocks/pool_tiles_stairs.json +848af87e9bdaea9e6f1d523b564533431992bb91 data/ornamentum/loot_table/blocks/progress_pride_flag.json d4bdd1835d1a7b8147db84502c7d44ba4b0b8895 data/ornamentum/loot_table/blocks/purple_bricks.json 7302b874a456a797a7f4a65251580bcf612e016a data/ornamentum/loot_table/blocks/purple_bricks_slab.json 615f6784477e775fe94d1875ddf49e946af89bf2 data/ornamentum/loot_table/blocks/purple_bricks_stairs.json @@ -198,7 +199,6 @@ f477ebd0e0fe21e7be3e81bf4aa99a794773eb9b data/ornamentum/loot_table/blocks/red_w 1507f4311dcc09e0f57838231d41b03901f4aeb6 data/ornamentum/loot_table/blocks/smooth_basalt_bricks.json 2cbe0836062a04955c5b0e14b3e0e7d5d5d0e3d4 data/ornamentum/loot_table/blocks/smooth_basalt_bricks_slab.json 70acce0530e54306728421b99736d889bb563a52 data/ornamentum/loot_table/blocks/smooth_basalt_bricks_stairs.json -0ae7fb08472a85a9be6ac4a336f3b7224cfc92c1 data/ornamentum/loot_table/blocks/test_flag.json af3d85d2369f5d69b8cc10673bc0a408beb27025 data/ornamentum/loot_table/blocks/white_bricks.json 92732b45f3b4ad57f707c89f1dcbcbddc85a99ad data/ornamentum/loot_table/blocks/white_bricks_slab.json ac53410a3a8aa056ecf56d7b9ef369421ef53052 data/ornamentum/loot_table/blocks/white_bricks_stairs.json diff --git a/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 b/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 index d8786f2..ea85e59 100644 --- a/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 +++ b/src/generated/resources/.cache/76fa529304d84db1465431f69702c7947fc3a5d2 @@ -1,4 +1,4 @@ -// 1.21.1 2026-07-25T20:27:48.568923238 Block States: ornamentum +// 1.21.1 2026-07-25T21:05:29.888002485 Block States: ornamentum d6c0778339a79db4e2ec3f14d7399d1f908ce1fa assets/ornamentum/blockstates/amethyst_grate.json 7224d37e27fcaf8977fe2624b697fbb13d4b7276 assets/ornamentum/blockstates/ametist_bricks.json 8eec3960f8fa6c0c79d80fcd9abe29d5b79caf48 assets/ornamentum/blockstates/ametist_bricks_slab.json @@ -168,6 +168,7 @@ c9008ed834682755482513edafa98cda2ef33036 assets/ornamentum/blockstates/polished_ e29703231d6a4d7064be77f80065a09144d7962c assets/ornamentum/blockstates/pool_tiles1_stairs.json a4cf37ceafd721727fff53eef85b8b55a1c88559 assets/ornamentum/blockstates/pool_tiles_slab.json 4b5ac68e297ccca85a2234830b1d5bb7b3ab945c assets/ornamentum/blockstates/pool_tiles_stairs.json +3d04847ff6073e1413c8e3702c80ef5d345c43d0 assets/ornamentum/blockstates/progress_pride_flag.json 288cdde810a9e0f2490185fbbce6a8c86c200fc1 assets/ornamentum/blockstates/purple_bricks.json 077c8d4800d199878e78fac81047d42bfcb277f2 assets/ornamentum/blockstates/purple_bricks_slab.json 3db7afae239dafa2d3a439d16a39ff32ee54b107 assets/ornamentum/blockstates/purple_bricks_stairs.json @@ -198,7 +199,6 @@ c74ade90b9173c75341ea7b88c88b4348cd8b3e2 assets/ornamentum/blockstates/red_patte b0099f1ab55f9a39bb7014d7e1b040f48a250a1c assets/ornamentum/blockstates/smooth_basalt_bricks.json 08cef6ad27d982eef0e68dc86cc56447ffa38b93 assets/ornamentum/blockstates/smooth_basalt_bricks_slab.json fe307d0ee1b3a35e0282010750b0d8eb5b90df09 assets/ornamentum/blockstates/smooth_basalt_bricks_stairs.json -b242577b5095b8190c85633f82dda51a786bcd89 assets/ornamentum/blockstates/test_flag.json 2303024183c5769915bd1421e9beb672e9f5c7c9 assets/ornamentum/blockstates/white_bricks.json 7cf7bab75d3eac5e1d459ae9d0355f1248124942 assets/ornamentum/blockstates/white_bricks_slab.json 0807a7edaa81470e71c25213df2ee57af112b907 assets/ornamentum/blockstates/white_bricks_stairs.json @@ -626,6 +626,7 @@ b3a72b5a43db0d22224e86d11b2ecc5fac7649e2 assets/ornamentum/models/block/pool_til 22a9efb5f22b91bb048d57e144d2920843c49c37 assets/ornamentum/models/block/pool_tiles_stairs.json 86d68920274cd936b487c9f750bd08db97567885 assets/ornamentum/models/block/pool_tiles_stairs_inner.json e87ae094d8f3d6514a0a1ce9a3d3629c31186555 assets/ornamentum/models/block/pool_tiles_stairs_outer.json +00090d5eafd6d8ddc3ad780b5c3b1f31d4569c62 assets/ornamentum/models/block/progress_pride_flag.json 370c433be5595e9912ad3c35e71adab991ee52e1 assets/ornamentum/models/block/purple_bricks.json 85896c7a85c1738374801a6176ace50b3c9cbff7 assets/ornamentum/models/block/purple_bricks_slab.json d72c397c3532fee36bfe4a1c75c88e071fdf85bf assets/ornamentum/models/block/purple_bricks_slab_top.json @@ -686,7 +687,6 @@ d8d20715fd6af3425a65d4b4cb5859a2056b8e70 assets/ornamentum/models/block/smooth_b 61def7f41d131165a4cacf75d3a51ffe8dcd0400 assets/ornamentum/models/block/smooth_basalt_bricks_stairs.json f544eaf507aace46734285d5fb163f671a32fed0 assets/ornamentum/models/block/smooth_basalt_bricks_stairs_inner.json 49359bdafe1d6cfc2ab382aae21bf7a0e97b4614 assets/ornamentum/models/block/smooth_basalt_bricks_stairs_outer.json -e5e18b18b553d15ea87737e3d90ca9cc096647ac assets/ornamentum/models/block/test_flag.json 2e59c48d33b5ce24f70ee289f8abe0702871b426 assets/ornamentum/models/block/white_bricks.json cd3a212617ff37dc8a6c30a5a97b73f0ae10c912 assets/ornamentum/models/block/white_bricks_slab.json 1b86fbb63deaf2ace17ed92e9e11ef232a254680 assets/ornamentum/models/block/white_bricks_slab_top.json @@ -904,6 +904,7 @@ a7209c6c6beaf58cfe2adbc1ba8133a806d29981 assets/ornamentum/models/item/pool_tile f50a39451dc2475f1df928c3fcb8ad2f3f237db2 assets/ornamentum/models/item/pool_tiles1_stairs.json 9693eed6b3a989378fa8ebebc2202f38e13f2d7d assets/ornamentum/models/item/pool_tiles_slab.json c91bfe97e51740c1ebc5c4cbc805ca8b8baf950c assets/ornamentum/models/item/pool_tiles_stairs.json +6d8c9e6f73a8af8010fcb438519c5f28c8b1e9d0 assets/ornamentum/models/item/progress_pride_flag.json 43680550da0e96a3df07e039bfbfaddd436be4b7 assets/ornamentum/models/item/purple_bricks.json a18f2af432be179fd98294654eff84329246f5c9 assets/ornamentum/models/item/purple_bricks_slab.json 3349a5a4514ced6cbd86cb47521ad37c493cd390 assets/ornamentum/models/item/purple_bricks_stairs.json @@ -934,7 +935,6 @@ c834b7fe2e386033a4963029dd558e73bc46be06 assets/ornamentum/models/item/red_wool_ 37ac053b698caa3bce55322f9a2f53c3bdde9247 assets/ornamentum/models/item/smooth_basalt_bricks.json af265ad80d8b4c2fabb0dbd1c3e478c055cace14 assets/ornamentum/models/item/smooth_basalt_bricks_slab.json 507195218a2280231f6db54aa29524a36510a4bb assets/ornamentum/models/item/smooth_basalt_bricks_stairs.json -3673542766b506d13e6af3d41991005a681cd1d5 assets/ornamentum/models/item/test_flag.json c61c7f0d652a3d13fd14c9ab83b36f0f1b68e18d assets/ornamentum/models/item/white_bricks.json 6a22d3b5c5f85d69e81c36c3367d807cfaa00970 assets/ornamentum/models/item/white_bricks_slab.json f65855f810baa06c5228a0c242a682b4cf1171a1 assets/ornamentum/models/item/white_bricks_stairs.json diff --git a/src/generated/resources/assets/ornamentum/blockstates/progress_pride_flag.json b/src/generated/resources/assets/ornamentum/blockstates/progress_pride_flag.json new file mode 100644 index 0000000..d616dc2 --- /dev/null +++ b/src/generated/resources/assets/ornamentum/blockstates/progress_pride_flag.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "ornamentum:block/progress_pride_flag", + "y": 90 + }, + "facing=north": { + "model": "ornamentum:block/progress_pride_flag" + }, + "facing=south": { + "model": "ornamentum:block/progress_pride_flag", + "y": 180 + }, + "facing=west": { + "model": "ornamentum:block/progress_pride_flag", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ornamentum/blockstates/test_flag.json b/src/generated/resources/assets/ornamentum/blockstates/test_flag.json deleted file mode 100644 index d05de00..0000000 --- a/src/generated/resources/assets/ornamentum/blockstates/test_flag.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "ornamentum:block/test_flag", - "y": 90 - }, - "facing=north": { - "model": "ornamentum:block/test_flag" - }, - "facing=south": { - "model": "ornamentum:block/test_flag", - "y": 180 - }, - "facing=west": { - "model": "ornamentum:block/test_flag", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ornamentum/models/block/test_flag.json b/src/generated/resources/assets/ornamentum/models/block/progress_pride_flag.json similarity index 56% rename from src/generated/resources/assets/ornamentum/models/block/test_flag.json rename to src/generated/resources/assets/ornamentum/models/block/progress_pride_flag.json index 3365f58..1916e7f 100644 --- a/src/generated/resources/assets/ornamentum/models/block/test_flag.json +++ b/src/generated/resources/assets/ornamentum/models/block/progress_pride_flag.json @@ -1,6 +1,6 @@ { "parent": "ornamentum:block/template_flag", "textures": { - "2": "ornamentum:block/flags/test_flag" + "2": "ornamentum:block/flags/progress_pride_flag" } } \ No newline at end of file diff --git a/src/generated/resources/assets/ornamentum/models/item/progress_pride_flag.json b/src/generated/resources/assets/ornamentum/models/item/progress_pride_flag.json new file mode 100644 index 0000000..20c03e4 --- /dev/null +++ b/src/generated/resources/assets/ornamentum/models/item/progress_pride_flag.json @@ -0,0 +1,3 @@ +{ + "parent": "ornamentum:block/progress_pride_flag" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ornamentum/models/item/test_flag.json b/src/generated/resources/assets/ornamentum/models/item/test_flag.json deleted file mode 100644 index 9a5b991..0000000 --- a/src/generated/resources/assets/ornamentum/models/item/test_flag.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ornamentum:block/test_flag" -} \ No newline at end of file diff --git a/src/generated/resources/data/ornamentum/loot_table/blocks/test_flag.json b/src/generated/resources/data/ornamentum/loot_table/blocks/progress_pride_flag.json similarity index 72% rename from src/generated/resources/data/ornamentum/loot_table/blocks/test_flag.json rename to src/generated/resources/data/ornamentum/loot_table/blocks/progress_pride_flag.json index 8fb37d2..614a1dd 100644 --- a/src/generated/resources/data/ornamentum/loot_table/blocks/test_flag.json +++ b/src/generated/resources/data/ornamentum/loot_table/blocks/progress_pride_flag.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "ornamentum:test_flag" + "name": "ornamentum:progress_pride_flag" } ], "rolls": 1.0 } ], - "random_sequence": "ornamentum:blocks/test_flag" + "random_sequence": "ornamentum:blocks/progress_pride_flag" } \ 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 dc0cb44..37f727f 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/blocks/ModBlocks.java @@ -16,7 +16,7 @@ public class ModBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Ornamentum.MODID); - public static final DeferredBlock TEST_FLAG = registerBlock("test_flag", + public static final DeferredBlock PROGRESS_PRIDE_FLAG = registerBlock("progress_pride_flag", () -> new FlagBlock(BlockBehaviour.Properties.of().strength(1.0f))); // Pattern Blocks diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java index d45f6f2..1ef77d5 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockLootTableProvider.java @@ -17,7 +17,7 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider { @Override protected void generate() { - dropSelf(ModBlocks.TEST_FLAG.get()); + dropSelf(ModBlocks.PROGRESS_PRIDE_FLAG.get()); dropSelf(ModBlocks.RED_PATTERN_BLOCK.get()); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java index 62c886c..c540304 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/datagen/ModBlockStateProvider.java @@ -20,7 +20,7 @@ public class ModBlockStateProvider extends BlockStateProvider { protected void registerStatesAndModels() { // FLAGS - createFlag(ModBlocks.TEST_FLAG, "test_flag"); + createFlag(ModBlocks.PROGRESS_PRIDE_FLAG, "progress_pride_flag"); blockWithItem(ModBlocks.WHITE_PATTERN_BLOCK); createStairsAndSlab(ModBlocks.WHITE_PATTERN_BLOCK_STAIRS, ModBlocks.WHITE_PATTERN_BLOCK_SLAB, "white_pattern_block"); diff --git a/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java b/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java index 0ef0318..ae54af7 100644 --- a/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java +++ b/src/main/java/ovh/glitchlabs/ornamentum/items/ModCreativeModeTabs.java @@ -23,6 +23,8 @@ public class ModCreativeModeTabs { .title(Component.translatable("creativetab.ornamentum.ornamentum")) .displayItems((itemDisplayParameters, output) -> { + output.accept(ModBlocks.PROGRESS_PRIDE_FLAG); + // Grates output.accept(ModBlocks.IRON_GRATE); output.accept(ModBlocks.GOLD_GRATE); diff --git a/src/main/resources/assets/ornamentum/models/block/template_flag.json b/src/main/resources/assets/ornamentum/models/block/template_flag.json index 0f8dbad..115468b 100644 --- a/src/main/resources/assets/ornamentum/models/block/template_flag.json +++ b/src/main/resources/assets/ornamentum/models/block/template_flag.json @@ -1,9 +1,8 @@ { "format_version": "1.9.0", "credit": "Made with Blockbench by Ian1337", - "texture_size": [32, 32], "textures": { - "1": "#flag", + "2": "#flag", "3": "minecraft:block/spruce_planks", "particle": "minecraft:block/spruce_planks" }, @@ -56,12 +55,12 @@ "to": [7.5, 18, 8.25], "rotation": {"angle": 0, "axis": "y", "origin": [5.5, 0, -0.75]}, "faces": { - "north": {"uv": [0, 0, 4, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "south": {"uv": [4, 0, 0, 9], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "up": {"uv": [4, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 0, 0, 0], "texture": "#1"} + "north": {"uv": [0, 0, 4, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "south": {"uv": [4, 0, 0, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "up": {"uv": [4, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 0, 0], "texture": "#2"} } }, { @@ -70,12 +69,12 @@ "to": [7.5, 18, 7.75], "rotation": {"angle": 0, "axis": "y", "origin": [5.5, 0, -1.25]}, "faces": { - "north": {"uv": [0, 0, 4, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 9], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "up": {"uv": [4, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 0, 0, 0], "texture": "#1"} + "north": {"uv": [0, 0, 4, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "south": {"uv": [0, 0, 4, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "up": {"uv": [4, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 0, 0], "texture": "#2"} } }, { @@ -84,12 +83,12 @@ "to": [3.5, 18, 8], "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 0, -1]}, "faces": { - "north": {"uv": [4, 0, 8, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "south": {"uv": [8, 0, 4, 9], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "up": {"uv": [4, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 0, 0, 0], "texture": "#1"} + "north": {"uv": [4, 0, 8, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "south": {"uv": [8, 0, 4, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "up": {"uv": [4, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 0, 0], "texture": "#2"} } }, { @@ -98,12 +97,12 @@ "to": [-0.5, 18, 8.25], "rotation": {"angle": 0, "axis": "y", "origin": [-2.5, 0, -0.75]}, "faces": { - "north": {"uv": [8, 0, 12, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "south": {"uv": [12, 0, 8, 9], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "up": {"uv": [4, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 0, 0, 0], "texture": "#1"} + "north": {"uv": [8, 0, 12, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "south": {"uv": [12, 0, 8, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "up": {"uv": [4, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 0, 0], "texture": "#2"} } }, { @@ -112,12 +111,12 @@ "to": [-0.5, 18, 7.75], "rotation": {"angle": 0, "axis": "y", "origin": [-2.5, 0, -1.25]}, "faces": { - "north": {"uv": [8, 0, 12, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "south": {"uv": [8, 0, 12, 9], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "up": {"uv": [4, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 0, 0, 0], "texture": "#1"} + "north": {"uv": [8, 0, 12, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "south": {"uv": [8, 0, 12, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "up": {"uv": [4, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 0, 0], "texture": "#2"} } }, { @@ -126,12 +125,12 @@ "to": [-4.5, 18, 8], "rotation": {"angle": 0, "axis": "y", "origin": [-6.5, 0, -1]}, "faces": { - "north": {"uv": [12, 0, 16, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "south": {"uv": [16, 0, 12, 9], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9], "texture": "#1"}, - "up": {"uv": [4, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 0, 0, 0], "texture": "#1"} + "north": {"uv": [12, 0, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "south": {"uv": [16, 0, 12, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#2"}, + "up": {"uv": [4, 0, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 0, 0], "texture": "#2"} } } ], diff --git a/src/main/resources/assets/ornamentum/textures/block/flags/progress_pride_flag.png b/src/main/resources/assets/ornamentum/textures/block/flags/progress_pride_flag.png new file mode 100644 index 0000000000000000000000000000000000000000..4e0c2d25f60dffbca988f6d5a4f937d45491c060 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`$30yfLn;`TTr}i5WFW%!U_XCh zp(sn~dJee*C%G#)=Grv6svp00^W@p$9hR1soR^qiJYc+YWmfnG72nLsBER@~f9{_k z&NRVh#Y34{z1A;k?;k4sy+S@NkbPljO>^_u|n5*x@%%nYRo Wd+fAbdHw@M7(8A5T-G@yGywny(MIYI5%7L|Ps+&du1;msHEbdQbqCmGo+H%`eo*vKn+$)!1L(1 zoNJTLZVdgw3srgG4eJbvdZ3g3|G$-c>l={4267uSgQ!KPqky~Cd!Pt|r>mdKI;Vst E05rQ$r2qf`