From 71a2bc2392b4e3654157dcf49aac7a2354ecc1af Mon Sep 17 00:00:00 2001 From: Zepalesque <60141811+Zepalesque@users.noreply.github.com> Date: Sun, 26 May 2024 13:10:56 -0400 Subject: [PATCH] datagen --- gradle.properties | 2 +- .../22373c0826f5c6678d0d4a856e70f468cc114367 | 4 +- .../55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 | 4 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 +- .../9bb0d0a1b08b171b571281155e5d00494716cc5c | 5 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 +- .../d51b30d66fe5735362ecf234620f76878f395620 | 3 +- .../blockstates/crystal_bookshelf.json | 7 +++ .../assets/aether_redux/lang/en_us.json | 10 ++-- .../models/block/crystal_bookshelf.json | 7 +++ .../models/item/crystal_bookshelf.json | 3 ++ .../loot_tables/blocks/crystal_bookshelf.json | 50 +++++++++++++++++++ .../data/forge/tags/blocks/bookshelves.json | 5 ++ .../crystal_planks_to_crystal_bookshelf.json | 34 +++++++++++++ .../crystal_planks_to_crystal_bookshelf.json | 20 ++++++++ .../minecraft/tags/blocks/mineable/axe.json | 3 +- 16 files changed, 150 insertions(+), 14 deletions(-) create mode 100644 src/generated/resources/assets/aether_redux/blockstates/crystal_bookshelf.json create mode 100644 src/generated/resources/assets/aether_redux/models/block/crystal_bookshelf.json create mode 100644 src/generated/resources/assets/aether_redux/models/item/crystal_bookshelf.json create mode 100644 src/generated/resources/data/aether_redux/loot_tables/blocks/crystal_bookshelf.json create mode 100644 src/generated/resources/data/forge/tags/blocks/bookshelves.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_planks_to_crystal_bookshelf.json create mode 100644 src/generated/resources/data/minecraft/recipes/crystal_planks_to_crystal_bookshelf.json diff --git a/gradle.properties b/gradle.properties index 2dd2dd126..3bdbe05d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ aether_version=1.20.4-1.4.1-neoforge nitrogen_version=1.20.4-1.1.4-neoforge cumulus_version=1.20.4-1.0.1-neoforge curios_version=7.3.4 -zenith_version=1.0.16 +zenith_version=1.0.17 aeroblender_version=5271794 terrablender_version=1.20.4-3.3.0.12 terrablender_version_minimum=1.20.4-3.3.0.0 diff --git a/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 b/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 index 6478ae985..f970953a3 100644 --- a/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 +++ b/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 @@ -1,2 +1,2 @@ -// 1.20.4 2024-05-25T14:57:02.8051671 Languages: en_us for mod: aether_redux -e08d2b0c9d6814f7846efbf5b99d93bace1fd0f7 assets/aether_redux/lang/en_us.json +// 1.20.4 2024-05-26T12:28:47.3520672 Languages: en_us for mod: aether_redux +191abeb20d94e587e1d9272a6f089a6913f6ee45 assets/aether_redux/lang/en_us.json diff --git a/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 b/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 index 97e15674f..47e35ac86 100644 --- a/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 +++ b/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 @@ -1,4 +1,5 @@ -// 1.20.4 2024-05-25T14:57:02.8121624 Block States: aether_redux +// 1.20.4 2024-05-26T12:28:47.3580631 Block States: aether_redux +aedb88fad36ded58a1a30ea670fdbf8e3607afd6 assets/aether_redux/blockstates/crystal_bookshelf.json f723cf30b51993cbed8ca517b7f847953747ca73 assets/aether_redux/blockstates/crystal_button.json be620a2c78b38529dddc414046d465b39f4dc237 assets/aether_redux/blockstates/crystal_door.json 72d715f50f2f1d21bf1037ab2cbf78961dfe4a7d assets/aether_redux/blockstates/crystal_fence.json @@ -21,6 +22,7 @@ d7f9901e89a7818ccd07730bae56b8ff8983f04f assets/aether_redux/blockstates/crystal 3dfefb51cf3cdcc8235e85f74ab540f452b15914 assets/aether_redux/blockstates/stripped_crystal_log_wall.json 0ad51c45ec19e74c7fbbfa63e55ccdbca81ee3cb assets/aether_redux/blockstates/stripped_crystal_wood.json d17dd82d8ec79ac5fe047845cea80887c600e2f2 assets/aether_redux/blockstates/stripped_crystal_wood_wall.json +00310adf0ca01f869b322f84ff8ea9c91ad8fa7d assets/aether_redux/models/block/crystal_bookshelf.json d94940d494340fc1fd007174b192525b9400d888 assets/aether_redux/models/block/crystal_button.json 0bae9953c35f2c8e3ac9cc89f768d0bc1b9e1c8c assets/aether_redux/models/block/crystal_button_pressed.json 94290889a48b6c4576012cee8fe42d6bb36af8f0 assets/aether_redux/models/block/crystal_door_bottom_left.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index af7b364dd..752f9bef0 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,5 @@ -// 1.20.4 2024-05-25T14:57:02.8081648 Loot Tables +// 1.20.4 2024-05-26T12:28:47.3530663 Loot Tables +b880a82b2bc2cccca94237db8bd3abb171997d93 data/aether_redux/loot_tables/blocks/crystal_bookshelf.json da9680fe6445055c1187c6ff24d9cd82d9bcd824 data/aether_redux/loot_tables/blocks/crystal_button.json 9f765836d6f43d586c2682572fd9dd76dd1ec3a7 data/aether_redux/loot_tables/blocks/crystal_door.json e1242882a19b9fd87054a56aa3b7f015c0983b6b data/aether_redux/loot_tables/blocks/crystal_fence.json diff --git a/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c b/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c index 77c853873..4c5ac25ca 100644 --- a/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c +++ b/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c @@ -1,8 +1,9 @@ -// 1.20.4 2024-05-25T14:57:02.8011691 Tags for minecraft:block mod id aether_redux +// 1.20.4 2024-05-26T12:28:47.3420743 Tags for minecraft:block mod id aether_redux ff76e071710735bec611ec58205f07d13cb675bd data/aether_redux/tags/blocks/crystal_logs.json +eb1ddd122f7ca012d425a54274500f1e589e180d data/forge/tags/blocks/bookshelves.json 49ad498cef1154d6380c5317f026c7a11b62238d data/minecraft/tags/blocks/fence_gates.json 5295d732f1c22a1f48681f9c064f14692726fdb3 data/minecraft/tags/blocks/logs.json -955a10023679a8e61c6cd792e67db4906ad57b4c data/minecraft/tags/blocks/mineable/axe.json +9c45368b08909c3be45110e285aa25ee5c55221a data/minecraft/tags/blocks/mineable/axe.json 761d9af3851563316242dac11105074c9f83e129 data/minecraft/tags/blocks/planks.json 2216fd082ca15e16aa11c8c0da689d112499381f data/minecraft/tags/blocks/standing_signs.json 7cda59183028b6e5eea368168213a6dcc88647ac data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 72835d8cc..fc0141d05 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.4 2024-05-25T14:57:02.8101637 Recipes +// 1.20.4 2024-05-26T12:28:47.3550651 Recipes acb6e638c5a04859eeae08778600fa10bc36e4fb data/aether_redux/advancements/recipes/building_blocks/crystal_log_wall.json 77c1c7872712d00ddf0aa43ab579d0033bf24e26 data/aether_redux/advancements/recipes/building_blocks/crystal_planks.json 753a432c6879215e53995e48ee8e8427a4fa3763 data/aether_redux/advancements/recipes/building_blocks/crystal_slab.json @@ -37,3 +37,5 @@ afe50532279c1334e7fd1ff142288bacc53d290d data/aether_redux/recipes/crystal_slab. b31981b24ac7bbcfe28e6e17c749a0f9321a4e22 data/aether_redux/recipes/stripped_crystal_log_wall.json 7c0f8bc139b9c565c159b5f9fde5c4ff3e033c20 data/aether_redux/recipes/stripped_crystal_wood.json 9ac37d2357aa958811b9814dad4c00110602b1f3 data/aether_redux/recipes/stripped_crystal_wood_wall.json +14d03367868db5f3db1e3a967cbee6036d738e75 data/minecraft/advancements/recipes/building_blocks/crystal_planks_to_crystal_bookshelf.json +197eb74a9f2f0ae76cdb4fe05fd85a84adfb8026 data/minecraft/recipes/crystal_planks_to_crystal_bookshelf.json diff --git a/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 b/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 index 3aff0e85c..5f6e3baf5 100644 --- a/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 +++ b/src/generated/resources/.cache/d51b30d66fe5735362ecf234620f76878f395620 @@ -1,5 +1,6 @@ -// 1.20.4 2024-05-25T14:57:02.803168 Item Models: aether_redux +// 1.20.4 2024-05-26T12:28:47.3500686 Item Models: aether_redux 5fdf5a3add16d05500fe0387c2a8610d2ee1f2f8 assets/aether_redux/models/item/crystal_boat.json +07ce966d98e80d692506b8b644839f577b457301 assets/aether_redux/models/item/crystal_bookshelf.json 133f4578698e67f8587d89cabbffee55319dc165 assets/aether_redux/models/item/crystal_button.json 623b05f96b37ac475ec5667d70ece76502b41e32 assets/aether_redux/models/item/crystal_chest_boat.json f6a0b14764dc001ae8685074008f96b30e93a97e assets/aether_redux/models/item/crystal_door.json diff --git a/src/generated/resources/assets/aether_redux/blockstates/crystal_bookshelf.json b/src/generated/resources/assets/aether_redux/blockstates/crystal_bookshelf.json new file mode 100644 index 000000000..7bb02a5c2 --- /dev/null +++ b/src/generated/resources/assets/aether_redux/blockstates/crystal_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aether_redux:block/crystal_bookshelf" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/lang/en_us.json b/src/generated/resources/assets/aether_redux/lang/en_us.json index 18140668a..f1087830b 100644 --- a/src/generated/resources/assets/aether_redux/lang/en_us.json +++ b/src/generated/resources/assets/aether_redux/lang/en_us.json @@ -1,4 +1,5 @@ { + "block.aether_redux.crystal_bookshelf": "Crystal Bookshelf", "block.aether_redux.crystal_button": "Crystal Button", "block.aether_redux.crystal_door": "Crystal Door", "block.aether_redux.crystal_fence": "Crystal Fence", @@ -23,13 +24,14 @@ "entity.aether_redux.crystal_chest_boat": "Crystal Boat with Chest", "item.aether_redux.crystal_boat": "Crystal Boat", "item.aether_redux.crystal_chest_boat": "Crystal Boat with Chest", + "lore.block.aether_redux.crystal_bookshelf": "A nice bookshelf made of Crystal wood. These are nice for decoration, and also will enhance the abilities of Enchanting Tables!", "lore.block.aether_redux.crystal_button": "Crafted from Crystal Planks, a button used to activate mechanisms and redstone.", "lore.block.aether_redux.crystal_door": "Crafted from Crystal Planks. Doors are an ornate entrance helpful for keeping an enclosed and safe space without worry of monsters wandering in!", "lore.block.aether_redux.crystal_fence": "Crafted from Crystal Planks and Skyroot Sticks. Fences are great for keeping your livestock safe from wandering predators!", "lore.block.aether_redux.crystal_fence_gate": "Crafted from Crystal Planks and Skyroot Sticks. Fence gates give a homely entrance and exit to your precious enclosures.", "lore.block.aether_redux.crystal_hanging_sign": "Crafted from Crystal Planks. A helpful hanging sign perfect for writing messages and directions on.", "lore.block.aether_redux.crystal_log": "These spawn with Crystal trees. They can be double dropped with Skyroot Axes. When put in a crafting table they will provide 4 Crystal Planks.", - "lore.block.aether_redux.crystal_log_wall": "Crafted from Crystal Logs. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", + "lore.block.aether_redux.crystal_log_wall": "Crafted from Crystal _logs. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", "lore.block.aether_redux.crystal_planks": "Planks from the Crystal tree. Can be used as a building material, along with several other useful things.", "lore.block.aether_redux.crystal_pressure_plate": "Crafted from Crystal Planks. A wooden pressure plate used to activate mechanisms and redstone.", "lore.block.aether_redux.crystal_sign": "Crafted from Crystal Planks. A helpful sign perfect for writing messages and directions on.", @@ -37,11 +39,11 @@ "lore.block.aether_redux.crystal_stairs": "Crafted from Crystal Planks. Stairs are useful for adding verticality to builds and are often used for decoration too!", "lore.block.aether_redux.crystal_trapdoor": "Crafted from Crystal Planks. Trapdoors are useful for covering entryways one block wide. They are often used to add extra protection to staircases.", "lore.block.aether_redux.crystal_wood": "Six-sided variant of Crystal Logs. When put in a crafting table they will provide 4 Crystal Planks.", - "lore.block.aether_redux.crystal_wood_wall": "Crafted from Crystal Wood. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", + "lore.block.aether_redux.crystal_wood_wall": "Crafted from Crystal _wood. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", "lore.block.aether_redux.stripped_crystal_log": "ACrystal Log that has had its bark stripped away with an Axe. When put in a crafting table they will provide 4 Crystal Planks.", - "lore.block.aether_redux.stripped_crystal_log_wall": "Crafted from Stripped Crystal Logs. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", + "lore.block.aether_redux.stripped_crystal_log_wall": "Crafted from Stripped Crystal _logs. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", "lore.block.aether_redux.stripped_crystal_wood": "Crystal Wood that has had its bark stripped away with an Axe. When put in a crafting table they will provide 4 Crystal Planks.", - "lore.block.aether_redux.stripped_crystal_wood_wall": "Crafted from Stripped Crystal Wood. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", + "lore.block.aether_redux.stripped_crystal_wood_wall": "Crafted from Stripped Crystal _wood. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", "lore.item.aether_redux.crystal_boat": "Crafted from Crystal Planks. While the Aether does not have many large bodies of water, a boat can occasionally be a useful tool for crossing large distances over ice!", "lore.item.aether_redux.crystal_chest_boat": "ACrystal Boat with a handy chest in the back. Helpful for transporting more items over long stretches of water, which are famously difficult to find in the Aether.", "pack.aether_redux.mod.description": "The Aether: Redux Resources" diff --git a/src/generated/resources/assets/aether_redux/models/block/crystal_bookshelf.json b/src/generated/resources/assets/aether_redux/models/block/crystal_bookshelf.json new file mode 100644 index 000000000..36311d23c --- /dev/null +++ b/src/generated/resources/assets/aether_redux/models/block/crystal_bookshelf.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "aether_redux:block/construction/crystal_planks", + "side": "aether_redux:block/construction/crystal_bookshelf" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/item/crystal_bookshelf.json b/src/generated/resources/assets/aether_redux/models/item/crystal_bookshelf.json new file mode 100644 index 000000000..efdbdf8f8 --- /dev/null +++ b/src/generated/resources/assets/aether_redux/models/item/crystal_bookshelf.json @@ -0,0 +1,3 @@ +{ + "parent": "aether_redux:block/crystal_bookshelf" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_redux/loot_tables/blocks/crystal_bookshelf.json b/src/generated/resources/data/aether_redux/loot_tables/blocks/crystal_bookshelf.json new file mode 100644 index 000000000..6c8ba7b77 --- /dev/null +++ b/src/generated/resources/data/aether_redux/loot_tables/blocks/crystal_bookshelf.json @@ -0,0 +1,50 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "aether_redux:crystal_bookshelf" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:book" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "aether_redux:blocks/crystal_bookshelf" +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/bookshelves.json b/src/generated/resources/data/forge/tags/blocks/bookshelves.json new file mode 100644 index 000000000..94248cf31 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/bookshelves.json @@ -0,0 +1,5 @@ +{ + "values": [ + "aether_redux:crystal_bookshelf" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_planks_to_crystal_bookshelf.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_planks_to_crystal_bookshelf.json new file mode 100644 index 000000000..9d282ec28 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_planks_to_crystal_bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_book": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:book" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:crystal_planks_to_crystal_bookshelf" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_book" + ] + ], + "rewards": { + "recipes": [ + "minecraft:crystal_planks_to_crystal_bookshelf" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/crystal_planks_to_crystal_bookshelf.json b/src/generated/resources/data/minecraft/recipes/crystal_planks_to_crystal_bookshelf.json new file mode 100644 index 000000000..8e2b40445 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/crystal_planks_to_crystal_bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "B": { + "item": "minecraft:book" + }, + "P": { + "item": "aether_redux:crystal_planks" + } + }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "result": { + "item": "aether_redux:crystal_bookshelf" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index f479ab3a1..f75d2a3c5 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -13,6 +13,7 @@ "aether_redux:crystal_log_wall", "aether_redux:stripped_crystal_log_wall", "aether_redux:crystal_wood_wall", - "aether_redux:stripped_crystal_wood_wall" + "aether_redux:stripped_crystal_wood_wall", + "aether_redux:crystal_bookshelf" ] } \ No newline at end of file