From d11add92ea4a0a666b80666886c35a2fddf25d0d Mon Sep 17 00:00:00 2001 From: Zepalesque <60141811+Zepalesque@users.noreply.github.com> Date: Sun, 2 Jun 2024 14:51:17 -0400 Subject: [PATCH] chore: sanity gone (datagen) --- .../d51b30d66fe5735362ecf234620f76878f395620 | 26 +++++------ .../item/boss_doorway_carved_stone_base.json | 41 +----------------- .../boss_doorway_carved_stone_pillar.json | 41 +----------------- .../item/boss_doorway_sentry_stone_base.json | 41 +----------------- .../boss_doorway_sentry_stone_pillar.json | 41 +----------------- .../models/item/locked_carved_stone_base.json | 41 +----------------- .../item/locked_carved_stone_pillar.json | 41 +----------------- .../models/item/locked_sentry_stone_base.json | 41 +----------------- .../item/locked_sentry_stone_pillar.json | 41 +----------------- .../item/trapped_carved_stone_base.json | 43 +------------------ .../item/trapped_carved_stone_pillar.json | 43 +------------------ .../item/trapped_sentry_stone_base.json | 43 +------------------ .../item/trapped_sentry_stone_pillar.json | 43 +------------------ 13 files changed, 29 insertions(+), 497 deletions(-) diff --git a/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 b/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 index 96b12d49b..13339f0a8 100644 --- a/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 +++ b/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 @@ -1,12 +1,12 @@ -// 1.20.4 2024-06-02T14:29:21.2269072 Item Models: aether_redux +// 1.20.4 2024-06-02T14:50:12.642259 Item Models: aether_redux a083a7311bfd77483a76afa2e0b34a2dca856c28 assets/aether_redux/models/item/blightmoss_holystone.json 693490b382231c95e748c88f8daa13be00cd8ceb assets/aether_redux/models/item/blightmoss_holystone_slab.json e073f529066aa534f560372ff463759fa6a01401 assets/aether_redux/models/item/blightmoss_holystone_stairs.json 01182452db12ba6aaf27b32a62ee4b122ee5541c assets/aether_redux/models/item/blightmoss_holystone_wall.json -5baec8681324bdce6ab2fb3ce280e175c225129a assets/aether_redux/models/item/boss_doorway_carved_stone_base.json -dedfee81b0cf5df09b9181c20f2d1febdc5e3f81 assets/aether_redux/models/item/boss_doorway_carved_stone_pillar.json -050ca3328722bd9aa4ec238ffa46b44c9bdac5bb assets/aether_redux/models/item/boss_doorway_sentry_stone_base.json -19434a991264ad1fee0d5b445607763d46716828 assets/aether_redux/models/item/boss_doorway_sentry_stone_pillar.json +d72101ea519bd349a6499f9df04bf0518f44b5dd assets/aether_redux/models/item/boss_doorway_carved_stone_base.json +19e98f31be7aeaa197678aafc8d6704d5ab69617 assets/aether_redux/models/item/boss_doorway_carved_stone_pillar.json +4c072b1ea75447c2528cc8256598e94bcb20a400 assets/aether_redux/models/item/boss_doorway_sentry_stone_base.json +8713b9fe956564a7a23f2642ab06349cff0e4730 assets/aether_redux/models/item/boss_doorway_sentry_stone_pillar.json 5920be65ced5882c7950596b4b73cf658a1d5fc2 assets/aether_redux/models/item/carved_stone_base.json 6f2d8b47f3fbf96c466c1904b0894fcb77b6491b assets/aether_redux/models/item/carved_stone_pillar.json 1cc369d3b78fff9bbe9ffc53a2c12f814a2a07fc assets/aether_redux/models/item/cloudroot_leaves.json @@ -33,10 +33,10 @@ c21384e3c0f2e7cf2838fc78bd300726ad88099d assets/aether_redux/models/item/gilded_ 7cc45ca1892d40585fe787a30634854a783d1ef1 assets/aether_redux/models/item/gilded_holystone_slab.json 462c33cc11eaca761757d91060550f705d13724b assets/aether_redux/models/item/gilded_holystone_stairs.json b94d7ae7552984746c011a3c414646a7b5538436 assets/aether_redux/models/item/gilded_holystone_wall.json -2de8e892c77879e820b1253525833525dd816a87 assets/aether_redux/models/item/locked_carved_stone_base.json -43792961eac5dc3550a1dd3940135b132f71901a assets/aether_redux/models/item/locked_carved_stone_pillar.json -b6ae24c5ae2d4586cd78f6f24f8613c1345aeda0 assets/aether_redux/models/item/locked_sentry_stone_base.json -e121038a85a06f84e497428f52ea5417937ee14c assets/aether_redux/models/item/locked_sentry_stone_pillar.json +1baf82d2a72ff31e9632f74548e778afd0adcb73 assets/aether_redux/models/item/locked_carved_stone_base.json +0f11c365e48c79fff2e530f00b695be544425a2f assets/aether_redux/models/item/locked_carved_stone_pillar.json +3b30c0d2f0a82a5bb8c055f113346db3c05d829a assets/aether_redux/models/item/locked_sentry_stone_base.json +cac4c0e7ccd173070846259b285c791dc745bf4b assets/aether_redux/models/item/locked_sentry_stone_pillar.json 85fdfd7f1fdd7ddb47b784671c569c7c72659f65 assets/aether_redux/models/item/sentrite.json 78eb2611f9163ac081067a4558ff42ad67da6250 assets/aether_redux/models/item/sentrite_bricks.json 047fe8ef6fa08212f587a5ca906bd4b5de9af340 assets/aether_redux/models/item/sentrite_brick_slab.json @@ -52,7 +52,7 @@ e7bfb6b8c011a971909445c8ed6b5f55674ec196 assets/aether_redux/models/item/strippe 3309c49e4daa375a5737eed499cd6556832136f7 assets/aether_redux/models/item/stripped_crystal_log_wall.json ede5284a9a6d92cd5ea829abe975db3c0afeef88 assets/aether_redux/models/item/stripped_crystal_wood.json f4e55469e88be034a3e02ea3752dd4b77cbbfbb0 assets/aether_redux/models/item/stripped_crystal_wood_wall.json -1325794e172921cdf53c8a3c1950d84577c3e530 assets/aether_redux/models/item/trapped_carved_stone_base.json -16e97ebd0767a427bedff16a30846671df4fffb8 assets/aether_redux/models/item/trapped_carved_stone_pillar.json -eacf4366b69abaf546934869560891b60cf71ffc assets/aether_redux/models/item/trapped_sentry_stone_base.json -3e7d2f405d365ba3b61ef3b1b230c8bac4c36116 assets/aether_redux/models/item/trapped_sentry_stone_pillar.json +097cb32fefebeee07a81ebd1506ff5e735f802e8 assets/aether_redux/models/item/trapped_carved_stone_base.json +ea0cb841f7fab8a4353c4f370781268373432a5c assets/aether_redux/models/item/trapped_carved_stone_pillar.json +0609e9a3a507134735e5631900cdacaeba142c26 assets/aether_redux/models/item/trapped_sentry_stone_base.json +851e62a1cc88984130ebb89945adf11f4460c898 assets/aether_redux/models/item/trapped_sentry_stone_pillar.json diff --git a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_base.json b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_base.json index b506de0c2..c7e1f4c28 100644 --- a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_base.json +++ b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_base.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/carved_stone_base", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/carved_stone_base", "overlay": "aether:block/dungeon/door" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_pillar.json b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_pillar.json index 02bc4553d..e834661ed 100644 --- a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_pillar.json +++ b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_carved_stone_pillar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/carved_stone_pillar", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/carved_stone_pillar", "overlay": "aether:block/dungeon/door" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_base.json b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_base.json index 38ff391d8..da7aedb30 100644 --- a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_base.json +++ b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_base.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/sentry_stone_base", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/sentry_stone_base", "overlay": "aether:block/dungeon/door" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_pillar.json b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_pillar.json index 6b98fc901..0ba63ba58 100644 --- a/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_pillar.json +++ b/src/generated/resources/assets/aether_redux/models/item/boss_doorway_sentry_stone_pillar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/sentry_stone_pillar", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/sentry_stone_pillar", "overlay": "aether:block/dungeon/door" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_base.json b/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_base.json index 893b0c6b3..218a06874 100644 --- a/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_base.json +++ b/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_base.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/carved_stone_base", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/carved_stone_base", "overlay": "aether:block/dungeon/lock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_pillar.json b/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_pillar.json index 6d04edabf..eca6b5572 100644 --- a/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_pillar.json +++ b/src/generated/resources/assets/aether_redux/models/item/locked_carved_stone_pillar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/carved_stone_pillar", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/carved_stone_pillar", "overlay": "aether:block/dungeon/lock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_base.json b/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_base.json index ab1edc2dd..fb4527226 100644 --- a/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_base.json +++ b/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_base.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/sentry_stone_base", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/sentry_stone_base", "overlay": "aether:block/dungeon/lock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_pillar.json b/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_pillar.json index ef5852b41..6217b5813 100644 --- a/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_pillar.json +++ b/src/generated/resources/assets/aether_redux/models/item/locked_sentry_stone_pillar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/sentry_stone_pillar", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/sentry_stone_pillar", "overlay": "aether:block/dungeon/lock" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_base.json b/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_base.json index e5acf5eac..651d7cde9 100644 --- a/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_base.json +++ b/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_base.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/carved_stone_base", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/carved_stone_base", - "overlay": "aether:block/dungeon/exclamation" + "overlay": "aether:block/dungon/exclamation" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_pillar.json b/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_pillar.json index 06c3fc862..86e3d8f03 100644 --- a/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_pillar.json +++ b/src/generated/resources/assets/aether_redux/models/item/trapped_carved_stone_pillar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/carved_stone_pillar", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/carved_stone_pillar", - "overlay": "aether:block/dungeon/exclamation" + "overlay": "aether:block/dungon/exclamation" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_base.json b/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_base.json index cc589b490..e5f0e482b 100644 --- a/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_base.json +++ b/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_base.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/sentry_stone_base", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/sentry_stone_base", - "overlay": "aether:block/dungeon/exclamation" + "overlay": "aether:block/dungon/exclamation" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_pillar.json b/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_pillar.json index 933650e65..afabc85d1 100644 --- a/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_pillar.json +++ b/src/generated/resources/assets/aether_redux/models/item/trapped_sentry_stone_pillar.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube", + "parent": "aether_redux:block/sentry_stone_pillar", "display": { "firstperson_lefthand": { "rotation": [ @@ -97,44 +97,6 @@ } }, "elements": [ - { - "faces": { - "down": { - "cullface": "down", - "texture": "#face" - }, - "east": { - "cullface": "east", - "texture": "#face" - }, - "north": { - "cullface": "north", - "texture": "#face" - }, - "south": { - "cullface": "south", - "texture": "#face" - }, - "up": { - "cullface": "up", - "texture": "#face" - }, - "west": { - "cullface": "west", - "texture": "#face" - } - }, - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ] - }, { "faces": { "north": { @@ -167,7 +129,6 @@ } ], "textures": { - "face": "aether_redux:block/dungeon/sentry_stone_pillar", - "overlay": "aether:block/dungeon/exclamation" + "overlay": "aether:block/dungon/exclamation" } } \ No newline at end of file