diff --git a/changelog.md b/changelog.md index 17a42abd..de905f2b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +## Ex Deorum 4.0 +- Added Pale Oak Crucible, Sieve, Compressed Sieve, and Barrel + ## Ex Deorum 3.10 - Now requires KubeJS 7.2 to fix incompatibility (#158) diff --git a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 index 6c5780df..fb857fbb 100644 --- a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 +++ b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.434246363 Tags for minecraft:item mod id exdeorum +// 26.1.1 2026-05-14T19:37:53.714706698 Tags for minecraft:item mod id exdeorum 6c72957356b1d59a27be736fa1da54a5a9795ef7 data/exdeorum/tags/item/barrels.json 6afa16b45f76c0defa1675d07586e2c6e6b0be69 data/exdeorum/tags/item/compressed/andesite.json 31b46613766e4cdc53196850495ab1019f61cb48 data/exdeorum/tags/item/compressed/blackstone.json @@ -33,7 +33,7 @@ b90bd3c642e69b9e800c58a9f8f53e369652e6ba data/exdeorum/tags/item/pebbles.json d6fa5886b22a121a9402c1ca9b7938dc29b19a10 data/exdeorum/tags/item/random_trim_drops.json 8e1b5ab26037123d3948e9ac9f50da1b7cd0a129 data/exdeorum/tags/item/sieve_meshes.json 0152da758e7665bf282f17f466599c7a009d9a15 data/exdeorum/tags/item/stone_barrels.json -8bde4a30abefaa373fa41813da07b6f79f32b874 data/exdeorum/tags/item/wooden_barrels.json +b0790116e2361bd8a4afc9e6e440b61e71c7df50 data/exdeorum/tags/item/wooden_barrels.json 28fd077df8796b5061613218d902549c88f3e2fb data/minecraft/tags/item/enchantable/durability.json 564bef8c17ecd8c359840d05c11c4af926e2a795 data/minecraft/tags/item/enchantable/mining.json 564bef8c17ecd8c359840d05c11c4af926e2a795 data/minecraft/tags/item/enchantable/mining_loot.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 0dfe96f5..5dda069e 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.419886078 Loot Tables +// 26.1.1 2026-05-14T19:37:53.704965043 Loot Tables 105d8a61ea7145d7798146d385d4aad24fd1588d data/exdeorum/loot_table/blocks/acacia_barrel.json 83d50cbd5e45dfa72bf102fd4c0103a388cff9c4 data/exdeorum/loot_table/blocks/acacia_compressed_sieve.json 1e77127a82cbba0937bb02694f65cf1893aeffcb data/exdeorum/loot_table/blocks/acacia_crucible.json @@ -123,6 +123,10 @@ cad973c873a2e50ccfac91e88eadb3c2462d39d1 data/exdeorum/loot_table/blocks/oak_bar 940b82e9fc6bbcda8eaa84eca60b03efa9d5e166 data/exdeorum/loot_table/blocks/oak_compressed_sieve.json f94bc97efbfd26ccf7dba32d414fb5e33decd5f6 data/exdeorum/loot_table/blocks/oak_crucible.json 8d69a87e09fc8a179d5a1bc8eba5faab66e77a6c data/exdeorum/loot_table/blocks/oak_sieve.json +0c3ae38f21f4e6d77ecc4493609dc416378fca0f data/exdeorum/loot_table/blocks/pale_oak_barrel.json +ea23501dc53b610c47d5371f7703bd21d5b0c6ff data/exdeorum/loot_table/blocks/pale_oak_compressed_sieve.json +0c61aac2d480e5598ede91afec91b64bf86a796d data/exdeorum/loot_table/blocks/pale_oak_crucible.json +8e96bbb30d62fafe839bf2015048070558d68d59 data/exdeorum/loot_table/blocks/pale_oak_sieve.json 8b02ade5c505b239d953d9080fec34d2d9c812de data/exdeorum/loot_table/blocks/palm_barrel.json 59a97f2ab82012b5ef1e1fedd5a916752a7e684e data/exdeorum/loot_table/blocks/palm_compressed_sieve.json 843ba3f8cca4445dab6e0be2e3b3af48c3603489 data/exdeorum/loot_table/blocks/palm_crucible.json diff --git a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 index 0c454306..e455bdb2 100644 --- a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 +++ b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 @@ -1,8 +1,8 @@ -// 26.1.1 2026-04-06T22:07:00.433617829 Tags for minecraft:block mod id exdeorum +// 26.1.1 2026-05-14T19:37:53.7142837 Tags for minecraft:block mod id exdeorum c2f6fb7224bd1e2fdb87249751113c4d66dbc21f data/exdeorum/tags/block/mineable/hammer.json 77dfab311d3714c77bcac2df0397d23d4707f03b data/exdeorum/tags/block/watering_can_tickable.json f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/block/leaves.json -133e5ec65e3916d03320a67e2f4a475188028d08 data/minecraft/tags/block/mineable/axe.json +6487030487a094082c219a02705b423e0a4eacd8 data/minecraft/tags/block/mineable/axe.json 6eacf4b84abd2ad9b9671966c74f22d02d8208d6 data/minecraft/tags/block/mineable/hoe.json ef50fd58cd0831ca14958819cfb6af97d4dabee8 data/minecraft/tags/block/mineable/pickaxe.json 7a2ffab44cdf6dca9d9c3a0f3a610d2af88700bf data/minecraft/tags/block/mineable/shovel.json diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index 37059401..34f0498c 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 26.1.1 2026-04-06T22:07:00.414371506 ModKit Language: en_us for mod 'exdeorum' -f143e489b7dbb8f29e47d2e19b8336052c1044c2 assets/exdeorum/lang/en_us.json +// 26.1.1 2026-05-14T19:37:53.699684597 ModKit Language: en_us for mod 'exdeorum' +7710223f1e3d7313116cdec689ac157a248fe3af assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 b/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 index 30ab9eaf..f2f6656d 100644 --- a/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 +++ b/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.420592265 ModKit Recipes for mod 'exdeorum' +// 26.1.1 2026-05-14T21:40:52.187136309 ModKit Recipes for mod 'exdeorum' 0060d0e16dba2df44cc115f8ed68ef5dc52c74f1 data/exdeorum/advancement/recipes/building_blocks/andesite.json b9c5d12771d724cd646e637641da7a4d6b0a6bbf data/exdeorum/advancement/recipes/building_blocks/basalt.json d87a237248c140367dbfb748d45f532534e5b45c data/exdeorum/advancement/recipes/building_blocks/blackstone.json @@ -149,6 +149,10 @@ e427a00c409b605d6eaec71abe633d928e5f56cf data/exdeorum/advancement/recipes/misc/ 8fb2ed665671177256dab128a243b8e49f8fd1ad data/exdeorum/advancement/recipes/misc/oak_compressed_sieve.json e3f2c8d06e30854a1923a901051cfeecfa95ae37 data/exdeorum/advancement/recipes/misc/oak_crucible.json a6557c1185130b640811feae16852a24ca690e0d data/exdeorum/advancement/recipes/misc/oak_sieve.json +5814013bc9c9aa1613a95c60c639bd31253e6d97 data/exdeorum/advancement/recipes/misc/pale_oak_barrel.json +38e39737165af4c00e76f639428feec440174fe2 data/exdeorum/advancement/recipes/misc/pale_oak_compressed_sieve.json +4207b5007502c715cb9e98da4d96693d16afea38 data/exdeorum/advancement/recipes/misc/pale_oak_crucible.json +83833d68114775dfd16335b4029e84bffd3b5566 data/exdeorum/advancement/recipes/misc/pale_oak_sieve.json fdfe05ab66211d3c146cb0a91dc15add89e69c50 data/exdeorum/advancement/recipes/misc/palm_barrel.json 629d92b4f9fd8bc27c5dd3577930ffb0dc13706e data/exdeorum/advancement/recipes/misc/palm_compressed_sieve.json 06705fb6dbc25ae6dd51c38ce8a67738c50a7516 data/exdeorum/advancement/recipes/misc/palm_crucible.json @@ -1368,6 +1372,10 @@ c5472d2fb80d22dedc7411bd34f5113017acf938 data/exdeorum/recipe/ores/silver_from_c e58731237fb0b6df5228887dcd3eecdadddb587e data/exdeorum/recipe/ores/tin_from_chunks.json a66466ae61d9826c14b159cfa3f6c79e8a7c4035 data/exdeorum/recipe/ores/uranium_from_chunks.json ef87e4ed7da37ccf35033fd85b0c15458c8cfb31 data/exdeorum/recipe/ores/zinc_from_chunks.json +357ced318480b9cee2d5808662207bddc28fcab6 data/exdeorum/recipe/pale_oak_barrel.json +2145a75cedd72299d40fa5f43e7ba5d629632bd5 data/exdeorum/recipe/pale_oak_compressed_sieve.json +36021ca263b9558d70bbacb75aa68b5d0a7a617d data/exdeorum/recipe/pale_oak_crucible.json +2bad103fec80006a3eeaeccb7cd9d2c9ec3dbc57 data/exdeorum/recipe/pale_oak_sieve.json d099979caef1e43fa37ed395b57efa5472ae1939 data/exdeorum/recipe/palm_barrel.json 2fb527fb6417cb1c026dcf1ef1c75ca968a578d3 data/exdeorum/recipe/palm_compressed_sieve.json e2f297f6da8cce20dfcc521b7aa9d96fb3c68b5e data/exdeorum/recipe/palm_crucible.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index 7d0a834f..7b63a963 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.415337776 ModKit Item Models for mod 'exdeorum' +// 26.1.1 2026-05-14T19:37:53.700441026 ModKit Item Models for mod 'exdeorum' 8cfb1fdb327d53288205eb62b8b7857eafa2a091 assets/exdeorum/items/acacia_barrel.json 8c5b35194de98a2325ed84334623e72596e50b0f assets/exdeorum/items/acacia_compressed_sieve.json 930e698609436fdf71a3ab0b738f7566adfe15c7 assets/exdeorum/items/acacia_crucible.json @@ -168,6 +168,10 @@ ef5cb562ae6c776553260a076fcf184993883031 assets/exdeorum/items/oak_barrel.json 3bf68f94254969fdaa0d2edce263e6db33d9fe47 assets/exdeorum/items/oak_crucible.json cb33df651329894f07d3e33ee0ec77d9396507b8 assets/exdeorum/items/oak_sieve.json 1967684b3e84a110eb730a3cd1961522b1ac0624 assets/exdeorum/items/osmium_ore_chunk.json +8dced9b4636526ea5871d01c453d07565eb65d0b assets/exdeorum/items/pale_oak_barrel.json +0c8f1422ed94b383b1f35a3a9644c62d3503d6c8 assets/exdeorum/items/pale_oak_compressed_sieve.json +9f8754a3e2f7732a916d6b8e620fc455ce264950 assets/exdeorum/items/pale_oak_crucible.json +cf47115520e396dbf872320c3e609ff415feccb0 assets/exdeorum/items/pale_oak_sieve.json f076496ca71f8978f64bd58af9b46bd9e2055be6 assets/exdeorum/items/palm_barrel.json d0a63fc56d3cd6d4c23c6a2a088c304c939d8df6 assets/exdeorum/items/palm_compressed_sieve.json 3d6efe8173a53919f06da1de85a0fd0be3a89910 assets/exdeorum/items/palm_crucible.json @@ -403,6 +407,10 @@ e1146a92fae3c6214644a46a7d188feaac12cb24 assets/exdeorum/models/item/oak_compres dd1d9002a22eb6f5a187d53e041cd498f4ef998b assets/exdeorum/models/item/oak_crucible.json 4de21205436d30940d690f457a3614c9235f5e88 assets/exdeorum/models/item/oak_sieve.json 353fd99ec064d6e768d83f88804086bf4083c3b8 assets/exdeorum/models/item/osmium_ore_chunk.json +74c01e5e3e45488886c1fde03e2df7f3e729797f assets/exdeorum/models/item/pale_oak_barrel.json +ff1b5b32ecacc031f3860b0e7eff45bdefe28256 assets/exdeorum/models/item/pale_oak_compressed_sieve.json +159bdb28f424ef94190aaf0828f98b822b9537a1 assets/exdeorum/models/item/pale_oak_crucible.json +9fbc746c7307b9c9092d09493f3e0564028f39ab assets/exdeorum/models/item/pale_oak_sieve.json b2aa282668919cfcaf3a987d90ae7d872d5cd348 assets/exdeorum/models/item/palm_barrel.json 54e32cae95fb8c5b9061a43fd00da42ecd755b71 assets/exdeorum/models/item/palm_compressed_sieve.json 7d252a577065678c74bf0fd4bf932f9974832152 assets/exdeorum/models/item/palm_crucible.json diff --git a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 index 29ce2303..9298ed3e 100644 --- a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 +++ b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.418703971 ModKit Block Models for mod 'exdeorum' +// 26.1.1 2026-05-14T21:40:52.184629639 ModKit Block Models for mod 'exdeorum' c73197f2dc770a353883c387b2b1f0b082283576 assets/exdeorum/blockstates/acacia_barrel.json e36a3d22e00c0eae2336a39f3d0c904ef1d89119 assets/exdeorum/blockstates/acacia_compressed_sieve.json a3ef4562a4c7833439d8d66ff9c210406d317995 assets/exdeorum/blockstates/acacia_crucible.json @@ -120,6 +120,10 @@ eae290513fb18b4939057ff9d2b5c1c01c27d24f assets/exdeorum/blockstates/maple_barre 4c6d676b3bc9eb7e655dfeb03b68f4f3cecd59e1 assets/exdeorum/blockstates/oak_compressed_sieve.json 426eb8511dae435c2bcf78343cf7552c7bddcb38 assets/exdeorum/blockstates/oak_crucible.json 119a076801031739f1b4323050260c0f2af7cb94 assets/exdeorum/blockstates/oak_sieve.json +42e3d537d757c5b2c28c2c421c45d1b12965e5a9 assets/exdeorum/blockstates/pale_oak_barrel.json +b507279b1f503b255c98720e5d5968887b9cce86 assets/exdeorum/blockstates/pale_oak_compressed_sieve.json +ab7d81756bb9aea44a9adb4f5d63640309424d5a assets/exdeorum/blockstates/pale_oak_crucible.json +d55e5d7e5be29fe7222d88d6054dc1d2078a9902 assets/exdeorum/blockstates/pale_oak_sieve.json ea8ce1e2d897636e796c53271928e47a4e568746 assets/exdeorum/blockstates/palm_barrel.json 44804539c68bb6d30676f284c4b391faa555fb36 assets/exdeorum/blockstates/palm_compressed_sieve.json e6cc311733a888fcbb7f1b54d295375b9a01b1df assets/exdeorum/blockstates/palm_crucible.json @@ -280,6 +284,10 @@ ab7dc4690a875587d3db6f7434c17bcf1f791ce5 assets/exdeorum/models/block/oak_barrel cc4607279d85b27800c5a7c1be3278a0dc57a74e assets/exdeorum/models/block/oak_compressed_sieve.json c38c960b89de5cf12880ade53b2e5d93353999a3 assets/exdeorum/models/block/oak_crucible.json e99bd2a977838d228af9431c39adbf9209b21484 assets/exdeorum/models/block/oak_sieve.json +eb5e085cb9dade615582ecd18abbcf3133ae9253 assets/exdeorum/models/block/pale_oak_barrel.json +7a5dd9a6e9be8868b5d661a1edc5ec1f467b0490 assets/exdeorum/models/block/pale_oak_compressed_sieve.json +45f5363af1582411afc3b0ef0b8d8d92910a4deb assets/exdeorum/models/block/pale_oak_crucible.json +647b9245ed6e41b9bd83c504e32d67a8dc74e52c assets/exdeorum/models/block/pale_oak_sieve.json cf4d2e0edae49e117f740ce0ddfe91ac2914aae7 assets/exdeorum/models/block/palm_barrel.json fbc63a0229cf70f2f9975ebcff59a022f819ad55 assets/exdeorum/models/block/palm_compressed_sieve.json 14c6411a10b0ec4491a4b9009d1892d5331ad4c3 assets/exdeorum/models/block/palm_crucible.json diff --git a/src/generated/resources/assets/exdeorum/blockstates/pale_oak_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_barrel.json new file mode 100644 index 00000000..036a71c6 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/pale_oak_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/pale_oak_compressed_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..da71c5fa --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_compressed_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/pale_oak_compressed_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/pale_oak_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_crucible.json new file mode 100644 index 00000000..e82e0b49 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/pale_oak_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/pale_oak_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_sieve.json new file mode 100644 index 00000000..93055cc8 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/pale_oak_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/pale_oak_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/items/pale_oak_barrel.json b/src/generated/resources/assets/exdeorum/items/pale_oak_barrel.json new file mode 100644 index 00000000..ce256218 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/items/pale_oak_barrel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "exdeorum:item/pale_oak_barrel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/items/pale_oak_compressed_sieve.json b/src/generated/resources/assets/exdeorum/items/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..b6b8c77a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/items/pale_oak_compressed_sieve.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "exdeorum:item/pale_oak_compressed_sieve" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/items/pale_oak_crucible.json b/src/generated/resources/assets/exdeorum/items/pale_oak_crucible.json new file mode 100644 index 00000000..5f716e4f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/items/pale_oak_crucible.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "exdeorum:item/pale_oak_crucible" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/items/pale_oak_sieve.json b/src/generated/resources/assets/exdeorum/items/pale_oak_sieve.json new file mode 100644 index 00000000..14f45a4c --- /dev/null +++ b/src/generated/resources/assets/exdeorum/items/pale_oak_sieve.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "exdeorum:item/pale_oak_sieve" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/lang/en_us.json b/src/generated/resources/assets/exdeorum/lang/en_us.json index 5f393376..b43079ad 100644 --- a/src/generated/resources/assets/exdeorum/lang/en_us.json +++ b/src/generated/resources/assets/exdeorum/lang/en_us.json @@ -135,6 +135,10 @@ "block.exdeorum.oak_compressed_sieve": "Oak Compressed Sieve", "block.exdeorum.oak_crucible": "Oak Crucible", "block.exdeorum.oak_sieve": "Oak Sieve", + "block.exdeorum.pale_oak_barrel": "Pale Oak Barrel", + "block.exdeorum.pale_oak_compressed_sieve": "Pale Oak Compressed Sieve", + "block.exdeorum.pale_oak_crucible": "Pale Oak Crucible", + "block.exdeorum.pale_oak_sieve": "Pale Oak Sieve", "block.exdeorum.palm_barrel": "Palm Barrel", "block.exdeorum.palm_compressed_sieve": "Palm Compressed Sieve", "block.exdeorum.palm_crucible": "Palm Crucible", @@ -403,6 +407,10 @@ "item.exdeorum.oak_crucible": "Oak Crucible", "item.exdeorum.oak_sieve": "Oak Sieve", "item.exdeorum.osmium_ore_chunk": "Osmium Ore Chunk", + "item.exdeorum.pale_oak_barrel": "Pale Oak Barrel", + "item.exdeorum.pale_oak_compressed_sieve": "Pale Oak Compressed Sieve", + "item.exdeorum.pale_oak_crucible": "Pale Oak Crucible", + "item.exdeorum.pale_oak_sieve": "Pale Oak Sieve", "item.exdeorum.palm_barrel": "Palm Barrel", "item.exdeorum.palm_compressed_sieve": "Palm Compressed Sieve", "item.exdeorum.palm_crucible": "Palm Crucible", diff --git a/src/generated/resources/assets/exdeorum/models/block/pale_oak_barrel.json b/src/generated/resources/assets/exdeorum/models/block/pale_oak_barrel.json new file mode 100644 index 00000000..3df8ce83 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/pale_oak_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "minecraft:block/pale_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/pale_oak_compressed_sieve.json b/src/generated/resources/assets/exdeorum/models/block/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..ec2ee3ad --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/pale_oak_compressed_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_compressed_sieve", + "textures": { + "texture": "minecraft:block/pale_oak_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/pale_oak_crucible.json b/src/generated/resources/assets/exdeorum/models/block/pale_oak_crucible.json new file mode 100644 index 00000000..99066562 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/pale_oak_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "minecraft:block/pale_oak_log", + "inside": "minecraft:block/pale_oak_log", + "side": "minecraft:block/pale_oak_log", + "top": "minecraft:block/pale_oak_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/pale_oak_sieve.json b/src/generated/resources/assets/exdeorum/models/block/pale_oak_sieve.json new file mode 100644 index 00000000..a8c32da8 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/pale_oak_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "minecraft:block/pale_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/pale_oak_barrel.json b/src/generated/resources/assets/exdeorum/models/item/pale_oak_barrel.json new file mode 100644 index 00000000..89c536ee --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/pale_oak_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/pale_oak_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/pale_oak_compressed_sieve.json b/src/generated/resources/assets/exdeorum/models/item/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..6d1306ec --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/pale_oak_compressed_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/pale_oak_compressed_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/pale_oak_crucible.json b/src/generated/resources/assets/exdeorum/models/item/pale_oak_crucible.json new file mode 100644 index 00000000..e6c5429c --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/pale_oak_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/pale_oak_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/pale_oak_sieve.json b/src/generated/resources/assets/exdeorum/models/item/pale_oak_sieve.json new file mode 100644 index 00000000..7341b54b --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/pale_oak_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/pale_oak_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_barrel.json b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_barrel.json new file mode 100644 index 00000000..9549edb1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_barrel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "minecraft:pale_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:pale_oak_barrel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:pale_oak_barrel" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..a0ef6aa8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_compressed_sieve.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "minecraft:pale_oak_log" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:pale_oak_compressed_sieve" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:pale_oak_compressed_sieve" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_crucible.json b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_crucible.json new file mode 100644 index 00000000..afbc5d0f --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_crucible.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "minecraft:pale_oak_log" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:pale_oak_crucible" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:pale_oak_crucible" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_sieve.json b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_sieve.json new file mode 100644 index 00000000..70aaab53 --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancement/recipes/misc/pale_oak_sieve.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "minecraft:pale_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:pale_oak_sieve" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:pale_oak_sieve" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_barrel.json b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_barrel.json new file mode 100644 index 00000000..108d6b11 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:pale_oak_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/pale_oak_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..00e233bb --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_compressed_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:pale_oak_compressed_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/pale_oak_compressed_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_crucible.json b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_crucible.json new file mode 100644 index 00000000..b98145ef --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:pale_oak_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/pale_oak_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_sieve.json b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_sieve.json new file mode 100644 index 00000000..cd3b44e7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_table/blocks/pale_oak_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:pale_oak_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/pale_oak_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/pale_oak_barrel.json b/src/generated/resources/data/exdeorum/recipe/pale_oak_barrel.json new file mode 100644 index 00000000..f6514c85 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipe/pale_oak_barrel.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "m": "minecraft:pale_oak_slab", + "s": "minecraft:pale_oak_planks" + }, + "pattern": [ + "s s", + "s s", + "sms" + ], + "result": { + "id": "exdeorum:pale_oak_barrel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/pale_oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipe/pale_oak_compressed_sieve.json new file mode 100644 index 00000000..7d440ab1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipe/pale_oak_compressed_sieve.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": "#c:rods/wooden", + "O": "minecraft:pale_oak_log", + "_": "#c:ingots/iron" + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "id": "exdeorum:pale_oak_compressed_sieve" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/pale_oak_crucible.json b/src/generated/resources/data/exdeorum/recipe/pale_oak_crucible.json new file mode 100644 index 00000000..bce22d5a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipe/pale_oak_crucible.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "m": "minecraft:pale_oak_slab", + "s": "minecraft:pale_oak_log" + }, + "pattern": [ + "s s", + "s s", + "sms" + ], + "result": { + "id": "exdeorum:pale_oak_crucible" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/pale_oak_sieve.json b/src/generated/resources/data/exdeorum/recipe/pale_oak_sieve.json new file mode 100644 index 00000000..58ae3532 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipe/pale_oak_sieve.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": "#c:rods/wooden", + "O": "minecraft:pale_oak_planks", + "_": "minecraft:pale_oak_slab" + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "id": "exdeorum:pale_oak_sieve" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/item/wooden_barrels.json b/src/generated/resources/data/exdeorum/tags/item/wooden_barrels.json index 73bc0ae8..9e089796 100644 --- a/src/generated/resources/data/exdeorum/tags/item/wooden_barrels.json +++ b/src/generated/resources/data/exdeorum/tags/item/wooden_barrels.json @@ -8,6 +8,7 @@ "exdeorum:dark_oak_barrel", "exdeorum:mangrove_barrel", "exdeorum:cherry_barrel", + "exdeorum:pale_oak_barrel", "exdeorum:bamboo_barrel", "exdeorum:crimson_barrel", "exdeorum:warped_barrel", diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json index 4853e434..3a60ed4d 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json @@ -8,6 +8,7 @@ "exdeorum:dark_oak_barrel", "exdeorum:mangrove_barrel", "exdeorum:cherry_barrel", + "exdeorum:pale_oak_barrel", "exdeorum:bamboo_barrel", "exdeorum:crimson_barrel", "exdeorum:warped_barrel", @@ -38,6 +39,7 @@ "exdeorum:dark_oak_sieve", "exdeorum:mangrove_sieve", "exdeorum:cherry_sieve", + "exdeorum:pale_oak_sieve", "exdeorum:bamboo_sieve", "exdeorum:crimson_sieve", "exdeorum:warped_sieve", @@ -68,6 +70,7 @@ "exdeorum:dark_oak_crucible", "exdeorum:mangrove_crucible", "exdeorum:cherry_crucible", + "exdeorum:pale_oak_crucible", "exdeorum:bamboo_crucible", "exdeorum:fir_crucible", "exdeorum:redwood_crucible", @@ -102,6 +105,7 @@ "exdeorum:dark_oak_compressed_sieve", "exdeorum:mangrove_compressed_sieve", "exdeorum:cherry_compressed_sieve", + "exdeorum:pale_oak_compressed_sieve", "exdeorum:bamboo_compressed_sieve", "exdeorum:warped_compressed_sieve", "exdeorum:crimson_compressed_sieve", diff --git a/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java b/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java index 473d8e0d..8eca51ed 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java +++ b/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java @@ -73,6 +73,7 @@ class BlockModels { barrel(models, DefaultMaterials.DARK_OAK_BARREL.getBlock(), Blocks.DARK_OAK_PLANKS); barrel(models, DefaultMaterials.MANGROVE_BARREL.getBlock(), Blocks.MANGROVE_PLANKS); barrel(models, DefaultMaterials.CHERRY_BARREL.getBlock(), Blocks.CHERRY_PLANKS); + barrel(models, DefaultMaterials.PALE_OAK_BARREL.getBlock(), Blocks.PALE_OAK_PLANKS); barrel(models, DefaultMaterials.BAMBOO_BARREL.getBlock(), Blocks.BAMBOO_PLANKS); barrel(models, DefaultMaterials.CRIMSON_BARREL.getBlock(), Blocks.CRIMSON_PLANKS); barrel(models, DefaultMaterials.WARPED_BARREL.getBlock(), Blocks.WARPED_PLANKS); @@ -86,6 +87,7 @@ class BlockModels { sieve(models, DefaultMaterials.DARK_OAK_SIEVE.getBlock(), Blocks.DARK_OAK_PLANKS); sieve(models, DefaultMaterials.MANGROVE_SIEVE.getBlock(), Blocks.MANGROVE_PLANKS); sieve(models, DefaultMaterials.CHERRY_SIEVE.getBlock(), Blocks.CHERRY_PLANKS); + sieve(models, DefaultMaterials.PALE_OAK_SIEVE.getBlock(), Blocks.PALE_OAK_PLANKS); sieve(models, DefaultMaterials.BAMBOO_SIEVE.getBlock(), Blocks.BAMBOO_PLANKS); sieve(models, DefaultMaterials.CRIMSON_SIEVE.getBlock(), Blocks.CRIMSON_PLANKS); sieve(models, DefaultMaterials.WARPED_SIEVE.getBlock(), Blocks.WARPED_PLANKS); @@ -99,6 +101,7 @@ class BlockModels { compressedSieve(models, DefaultMaterials.DARK_OAK_COMPRESSED_SIEVE.getBlock(), Blocks.DARK_OAK_LOG); compressedSieve(models, DefaultMaterials.MANGROVE_COMPRESSED_SIEVE.getBlock(), Blocks.MANGROVE_LOG); compressedSieve(models, DefaultMaterials.CHERRY_COMPRESSED_SIEVE.getBlock(), Blocks.CHERRY_LOG); + compressedSieve(models, DefaultMaterials.PALE_OAK_COMPRESSED_SIEVE.getBlock(), Blocks.PALE_OAK_LOG); compressedSieve(models, DefaultMaterials.BAMBOO_COMPRESSED_SIEVE.getBlock(), Blocks.BAMBOO_BLOCK); compressedSieve(models, DefaultMaterials.WARPED_COMPRESSED_SIEVE.getBlock(), Blocks.WARPED_STEM); compressedSieve(models, DefaultMaterials.CRIMSON_COMPRESSED_SIEVE.getBlock(), Blocks.CRIMSON_STEM); @@ -118,6 +121,7 @@ class BlockModels { crucible(models, DefaultMaterials.DARK_OAK_CRUCIBLE.getBlock(), Blocks.DARK_OAK_LOG); crucible(models, DefaultMaterials.MANGROVE_CRUCIBLE.getBlock(), Blocks.MANGROVE_LOG); crucible(models, DefaultMaterials.CHERRY_CRUCIBLE.getBlock(), Blocks.CHERRY_LOG); + crucible(models, DefaultMaterials.PALE_OAK_CRUCIBLE.getBlock(), Blocks.PALE_OAK_LOG); crucible(models, DefaultMaterials.BAMBOO_CRUCIBLE.getBlock(), Blocks.BAMBOO_BLOCK); // Mod compat diff --git a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java index 6450aa3c..0bfa3331 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java @@ -29,6 +29,7 @@ import net.neoforged.neoforge.data.loading.DatagenModLoader; import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; +import org.jspecify.annotations.NonNull; import thedarkcolour.exdeorum.compat.ModIds; import java.util.HashMap; @@ -40,6 +41,7 @@ public class ModCompatData { private static final Map itemRegistries = new HashMap<>(); private static final Map blockRegistries = new HashMap<>(); + @NonNull @SuppressWarnings("DataFlowIssue") private static DeferredItem item(String modid, String name) { if (DatagenModLoader.isRunningDataGen()) { @@ -50,6 +52,7 @@ public class ModCompatData { } } + @NonNull @SuppressWarnings("DataFlowIssue") private static DeferredBlock block(String modid, String name) { if (DatagenModLoader.isRunningDataGen()) { diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java index 97f4b308..4aa67770 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java @@ -24,9 +24,7 @@ import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.Identifier; - import net.minecraft.resources.ResourceKey; -import net.minecraft.world.item.crafting.Recipe; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -51,7 +49,6 @@ import net.neoforged.neoforge.common.conditions.ICondition; import net.neoforged.neoforge.common.conditions.ModLoadedCondition; import net.neoforged.neoforge.common.conditions.NotCondition; import net.neoforged.neoforge.common.conditions.TagEmptyCondition; -import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidStackTemplate; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; @@ -60,10 +57,13 @@ import thedarkcolour.exdeorum.block.InfestedLeavesBlock; import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.data.ModCompatData; import thedarkcolour.exdeorum.material.DefaultMaterials; +import thedarkcolour.exdeorum.recipe.BlockPredicate; import thedarkcolour.exdeorum.recipe.OreChunkRecipe; import thedarkcolour.exdeorum.recipe.WeightedList; -import thedarkcolour.exdeorum.recipe.barrel.*; -import thedarkcolour.exdeorum.recipe.BlockPredicate; +import thedarkcolour.exdeorum.recipe.barrel.BarrelCompostRecipe; +import thedarkcolour.exdeorum.recipe.barrel.BarrelFluidMixingRecipe; +import thedarkcolour.exdeorum.recipe.barrel.BarrelMixingRecipe; +import thedarkcolour.exdeorum.recipe.barrel.FluidTransformationRecipe; import thedarkcolour.exdeorum.recipe.crook.CrookRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleHeatRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; @@ -84,7 +84,6 @@ import static net.minecraft.world.level.storage.loot.providers.number.BinomialDi import static net.minecraft.world.level.storage.loot.providers.number.ConstantValue.exactly; import static net.minecraft.world.level.storage.loot.providers.number.UniformGenerator.between; import static thedarkcolour.modkit.data.MKRecipeProvider.*; -import static thedarkcolour.modkit.data.MKRecipeProvider.id; public class Recipes { private static final Ingredient SPORES_AND_SEEDS = ingredient(EItems.GRASS_SEEDS, EItems.MYCELIUM_SPORES, EItems.WARPED_NYLIUM_SPORES, EItems.CRIMSON_NYLIUM_SPORES); @@ -126,6 +125,7 @@ public class Recipes { uShaped(recipes, DefaultMaterials.DARK_OAK_CRUCIBLE.getItem(), ingredient(Items.DARK_OAK_LOG), ingredient(Items.DARK_OAK_SLAB)); uShaped(recipes, DefaultMaterials.MANGROVE_CRUCIBLE.getItem(), ingredient(Items.MANGROVE_LOG), ingredient(Items.MANGROVE_SLAB)); uShaped(recipes, DefaultMaterials.CHERRY_CRUCIBLE.getItem(), ingredient(Items.CHERRY_LOG), ingredient(Items.CHERRY_SLAB)); + uShaped(recipes, DefaultMaterials.PALE_OAK_CRUCIBLE.getItem(), ingredient(Items.PALE_OAK_LOG), ingredient(Items.PALE_OAK_SLAB)); uShaped(recipes, DefaultMaterials.BAMBOO_CRUCIBLE.getItem(), ingredient(Items.BAMBOO_BLOCK), ingredient(Items.BAMBOO_SLAB)); uShaped(recipes, DefaultMaterials.CRIMSON_CRUCIBLE.getItem(), ingredient(Items.CRIMSON_STEM), ingredient(Items.CRIMSON_SLAB)); uShaped(recipes, DefaultMaterials.WARPED_CRUCIBLE.getItem(), ingredient(Items.WARPED_STEM), ingredient(Items.WARPED_SLAB)); @@ -168,6 +168,7 @@ public class Recipes { uShaped(recipes, DefaultMaterials.DARK_OAK_BARREL.getItem(), ingredient(Items.DARK_OAK_PLANKS), ingredient(Items.DARK_OAK_SLAB)); uShaped(recipes, DefaultMaterials.MANGROVE_BARREL.getItem(), ingredient(Items.MANGROVE_PLANKS), ingredient(Items.MANGROVE_SLAB)); uShaped(recipes, DefaultMaterials.CHERRY_BARREL.getItem(), ingredient(Items.CHERRY_PLANKS), ingredient(Items.CHERRY_SLAB)); + uShaped(recipes, DefaultMaterials.PALE_OAK_BARREL.getItem(), ingredient(Items.PALE_OAK_PLANKS), ingredient(Items.PALE_OAK_SLAB)); uShaped(recipes, DefaultMaterials.BAMBOO_BARREL.getItem(), ingredient(Items.BAMBOO_PLANKS), ingredient(Items.BAMBOO_SLAB)); uShaped(recipes, DefaultMaterials.CRIMSON_BARREL.getItem(), ingredient(Items.CRIMSON_PLANKS), ingredient(Items.CRIMSON_SLAB)); uShaped(recipes, DefaultMaterials.WARPED_BARREL.getItem(), ingredient(Items.WARPED_PLANKS), ingredient(Items.WARPED_SLAB)); @@ -248,6 +249,7 @@ public class Recipes { compressedSieve(recipes, DefaultMaterials.DARK_OAK_COMPRESSED_SIEVE, ingredient(Items.DARK_OAK_LOG)); compressedSieve(recipes, DefaultMaterials.MANGROVE_COMPRESSED_SIEVE, ingredient(Items.MANGROVE_LOG)); compressedSieve(recipes, DefaultMaterials.CHERRY_COMPRESSED_SIEVE, ingredient(Items.CHERRY_LOG)); + compressedSieve(recipes, DefaultMaterials.PALE_OAK_COMPRESSED_SIEVE, ingredient(Items.PALE_OAK_LOG)); compressedSieve(recipes, DefaultMaterials.BAMBOO_COMPRESSED_SIEVE, ingredient(Items.BAMBOO_BLOCK)); compressedSieve(recipes, DefaultMaterials.WARPED_COMPRESSED_SIEVE, ingredient(Items.WARPED_STEM)); compressedSieve(recipes, DefaultMaterials.CRIMSON_COMPRESSED_SIEVE, ingredient(Items.CRIMSON_STEM)); @@ -303,6 +305,7 @@ public class Recipes { sieve(recipes, DefaultMaterials.DARK_OAK_SIEVE.getItem(), Items.DARK_OAK_PLANKS, Items.DARK_OAK_SLAB); sieve(recipes, DefaultMaterials.MANGROVE_SIEVE.getItem(), Items.MANGROVE_PLANKS, Items.MANGROVE_SLAB); sieve(recipes, DefaultMaterials.CHERRY_SIEVE.getItem(), Items.CHERRY_PLANKS, Items.CHERRY_SLAB); + sieve(recipes, DefaultMaterials.PALE_OAK_SIEVE.getItem(), Items.PALE_OAK_PLANKS, Items.PALE_OAK_SLAB); sieve(recipes, DefaultMaterials.BAMBOO_SIEVE.getItem(), Items.BAMBOO_PLANKS, Items.BAMBOO_SLAB); sieve(recipes, DefaultMaterials.CRIMSON_SIEVE.getItem(), Items.CRIMSON_PLANKS, Items.CRIMSON_SLAB); sieve(recipes, DefaultMaterials.WARPED_SIEVE.getItem(), Items.WARPED_PLANKS, Items.WARPED_SLAB); @@ -317,7 +320,7 @@ public class Recipes { modSieve(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.MAGIC_PLANKS_ITEM, ModCompatData.MAGIC_SLAB, DefaultMaterials.MAGIC_SIEVE.getItem()); modSieve(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.UMBRAN_PLANKS_ITEM, ModCompatData.UMBRAN_SLAB, DefaultMaterials.UMBRAN_SIEVE.getItem()); modSieve(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.HELLBARK_PLANKS_ITEM, ModCompatData.HELLBARK_SLAB, DefaultMaterials.HELLBARK_SIEVE.getItem()); - modSieve(recipes, ModIds.ARS_NOUVEAU, ModCompatData.ARCHWOOD_PLANKS_ITEM, ModCompatData.ARCHWOOD_SLAB, DefaultMaterials.ARCHWOOD_SIEVE.getItem()); + modSieve(recipes, ModIds.ARS_NOUVEAU, ModCompatData.ARCHWOOD_PLANKS_ITEM, ModCompatData.ARCHWOOD_SLAB, DefaultMaterials.ARCHWOOD_SIEVE.getItem()); modSieve(recipes, ModIds.AETHER, ModCompatData.SKYROOT_PLANKS_ITEM, ModCompatData.SKYROOT_SLAB, DefaultMaterials.SKYROOT_SIEVE.getItem()); modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.BLUEBRIGHT_PLANKS_ITEM, ModCompatData.BLUEBRIGHT_SLAB, DefaultMaterials.BLUEBRIGHT_SIEVE.getItem()); modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.STARLIT_PLANKS_ITEM, ModCompatData.STARLIT_SLAB, DefaultMaterials.STARLIT_SIEVE.getItem()); @@ -505,6 +508,7 @@ public class Recipes { recipes.foodCooking(EItems.SILKWORM.get(), EItems.COOKED_SILKWORM.get(), 0.1f); } + private static void crucibleRecipes(RecipeOutput writer, MKRecipeProvider recipes) { lavaCrucible(writer, "cobblestone", recipes.ingredient(Tags.Items.COBBLESTONES), 250); lavaCrucible(writer, "stone", recipes.ingredient(Tags.Items.STONES), 250); diff --git a/src/main/java/thedarkcolour/exdeorum/material/DefaultMaterials.java b/src/main/java/thedarkcolour/exdeorum/material/DefaultMaterials.java index 32f238d6..d4af5602 100644 --- a/src/main/java/thedarkcolour/exdeorum/material/DefaultMaterials.java +++ b/src/main/java/thedarkcolour/exdeorum/material/DefaultMaterials.java @@ -40,6 +40,7 @@ public class DefaultMaterials { public static final BarrelMaterial DARK_OAK_BARREL = addDefaultWoodBarrel("dark_oak", SoundType.WOOD, false, MapColor.COLOR_BROWN, ExDeorum.ID); public static final BarrelMaterial MANGROVE_BARREL = addDefaultWoodBarrel("mangrove", SoundType.WOOD, false, MapColor.COLOR_RED, ExDeorum.ID); public static final BarrelMaterial CHERRY_BARREL = addDefaultWoodBarrel("cherry", SoundType.CHERRY_WOOD, false, MapColor.TERRACOTTA_WHITE, ExDeorum.ID); + public static final BarrelMaterial PALE_OAK_BARREL = addDefaultWoodBarrel("pale_oak", SoundType.WOOD, false, MapColor.QUARTZ, ExDeorum.ID); public static final BarrelMaterial BAMBOO_BARREL = addDefaultWoodBarrel("bamboo", SoundType.BAMBOO_WOOD, false, MapColor.COLOR_YELLOW, ExDeorum.ID); public static final BarrelMaterial CRIMSON_BARREL = addDefaultWoodBarrel("crimson", SoundType.NETHER_WOOD, true, MapColor.CRIMSON_STEM, ExDeorum.ID); public static final BarrelMaterial WARPED_BARREL = addDefaultWoodBarrel("warped", SoundType.NETHER_WOOD, true, MapColor.WARPED_STEM, ExDeorum.ID); @@ -78,6 +79,7 @@ public class DefaultMaterials { public static final SieveMaterial DARK_OAK_SIEVE = addDefaultSieve("dark_oak", SoundType.WOOD, ExDeorum.ID); public static final SieveMaterial MANGROVE_SIEVE = addDefaultSieve("mangrove", SoundType.WOOD, ExDeorum.ID); public static final SieveMaterial CHERRY_SIEVE = addDefaultSieve("cherry", SoundType.CHERRY_WOOD, ExDeorum.ID); + public static final SieveMaterial PALE_OAK_SIEVE = addDefaultSieve("pale_oak", SoundType.WOOD, ExDeorum.ID); public static final SieveMaterial BAMBOO_SIEVE = addDefaultSieve("bamboo", SoundType.BAMBOO_WOOD, ExDeorum.ID); public static final SieveMaterial CRIMSON_SIEVE = addDefaultSieve("crimson", SoundType.NETHER_WOOD, ExDeorum.ID); public static final SieveMaterial WARPED_SIEVE = addDefaultSieve("warped", SoundType.NETHER_WOOD, ExDeorum.ID); @@ -115,6 +117,7 @@ public class DefaultMaterials { public static final CompressedSieveMaterial DARK_OAK_COMPRESSED_SIEVE = addDefaultCompressedSieve("dark_oak", SoundType.WOOD, ExDeorum.ID); public static final CompressedSieveMaterial MANGROVE_COMPRESSED_SIEVE = addDefaultCompressedSieve("mangrove", SoundType.WOOD, ExDeorum.ID); public static final CompressedSieveMaterial CHERRY_COMPRESSED_SIEVE = addDefaultCompressedSieve("cherry", SoundType.CHERRY_WOOD, ExDeorum.ID); + public static final CompressedSieveMaterial PALE_OAK_COMPRESSED_SIEVE = addDefaultCompressedSieve("pale_oak", SoundType.WOOD, ExDeorum.ID); public static final CompressedSieveMaterial BAMBOO_COMPRESSED_SIEVE = addDefaultCompressedSieve("bamboo", SoundType.BAMBOO_WOOD, ExDeorum.ID); public static final CompressedSieveMaterial WARPED_COMPRESSED_SIEVE = addDefaultCompressedSieve("warped", SoundType.NETHER_WOOD, ExDeorum.ID); public static final CompressedSieveMaterial CRIMSON_COMPRESSED_SIEVE = addDefaultCompressedSieve("crimson", SoundType.NETHER_WOOD, ExDeorum.ID); @@ -165,6 +168,7 @@ public class DefaultMaterials { public static final WaterCrucibleMaterial DARK_OAK_CRUCIBLE = addDefaultWaterCrucible("dark_oak", SoundType.WOOD, MapColor.COLOR_BROWN, ExDeorum.ID); public static final WaterCrucibleMaterial MANGROVE_CRUCIBLE = addDefaultWaterCrucible("mangrove", SoundType.WOOD, MapColor.COLOR_RED, ExDeorum.ID); public static final WaterCrucibleMaterial CHERRY_CRUCIBLE = addDefaultWaterCrucible("cherry", SoundType.CHERRY_WOOD, MapColor.TERRACOTTA_WHITE, ExDeorum.ID); + public static final WaterCrucibleMaterial PALE_OAK_CRUCIBLE = addDefaultWaterCrucible("pale_oak", SoundType.WOOD, MapColor.QUARTZ, ExDeorum.ID); public static final WaterCrucibleMaterial BAMBOO_CRUCIBLE = addDefaultWaterCrucible("bamboo", SoundType.BAMBOO_WOOD, MapColor.COLOR_YELLOW, ExDeorum.ID); // Biomes O' Plenty public static final WaterCrucibleMaterial FIR_CRUCIBLE = addDefaultWaterCrucible("fir", SoundType.WOOD, MapColor.TERRACOTTA_WHITE, ModIds.BIOMES_O_PLENTY);