diff --git a/gradle.properties b/gradle.properties index 66f3e88..3ea21d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Eternal Items # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=0.0.1 +mod_version=0.0.2 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 2a9eba4..7fcb158 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,5 +1,7 @@ -// 1.21.1 2024-11-14T03:28:04.307682 Registries +// 1.21.1 2024-11-22T18:21:18.1225962 Registries 7e27b4462ec1fe5bfb2233d2407788dde146d8ea data/eternalitems/neoforge/biome_modifier/add_aluminum_ore.json +9002e9360bb1358bd57951a8d565357b3cb3142a data/eternalitems/neoforge/biome_modifier/add_apatite_ore.json +b3d382a9fdb82a636ab889ee47b6ca7ca7022717 data/eternalitems/neoforge/biome_modifier/add_cinnabar_ore.json 94df7a3fdd25aa688c4bb3bee9af2b8dc589cb6d data/eternalitems/neoforge/biome_modifier/add_cobalt_ore.json f871fd7b2b27ca9f13ca348b49046bfe9dff8911 data/eternalitems/neoforge/biome_modifier/add_fluorite_ore.json a18f020e9e293157e01cf956e79e5060763a9810 data/eternalitems/neoforge/biome_modifier/add_lead_ore.json @@ -14,6 +16,8 @@ f4a7af1a81a39f80a1a4338c2ad6968ed9c9dee2 data/eternalitems/neoforge/biome_modifi bda5bfe12bf689bd79ec8d7c0703c800272cada7 data/eternalitems/neoforge/biome_modifier/add_uranium_ore.json e2e7eb05672f5b03313773749c91d0bed58322bd data/eternalitems/neoforge/biome_modifier/add_zinc_ore.json 066d137a4a1ba7350083956c1a587d90a9ac541c data/eternalitems/worldgen/configured_feature/aluminum_ore.json +3b8850965469dfd02b56e7a0a7ede004406faefc data/eternalitems/worldgen/configured_feature/apatite_ore.json +c60e42f126a9ce59e32d65d69dd5d05c501a3de9 data/eternalitems/worldgen/configured_feature/cinnabar_ore.json bf610701be1b69b8c61b015bd10e31abccea600c data/eternalitems/worldgen/configured_feature/cobalt_ore.json 47a19d1e15ad62e7dd3ea1e4c71a36d2d6e182f7 data/eternalitems/worldgen/configured_feature/fluorite_ore.json 12eaf0efe4a0f71567b0bb0ed76731a63f6ace20 data/eternalitems/worldgen/configured_feature/lead_ore.json @@ -27,17 +31,19 @@ d2841c9ce20b38bc0ede1f5240d1fccf8e066788 data/eternalitems/worldgen/configured_f fc814ad0d8ed6b4aa14e47b6256a94d8a1887cca data/eternalitems/worldgen/configured_feature/tin_ore.json 65fc0d5f6fc06d2caf6d3ad70ff13347d7245fa8 data/eternalitems/worldgen/configured_feature/uranium_ore.json 04d36527968ee94ade0da248501338dff9847aa4 data/eternalitems/worldgen/configured_feature/zinc_ore.json -80ca525f4a789b2ca265298d527ad63bad20ed26 data/eternalitems/worldgen/placed_feature/aluminum_ore_placed.json -ea433d2d761bc11f3290b428f64c3593f3d4a75b data/eternalitems/worldgen/placed_feature/cobalt_ore_placed.json -570dc0c461b1493c2c11ab1381baa7837d6c8c5d data/eternalitems/worldgen/placed_feature/fluorite_ore_placed.json -1f72daaf9cb3d4d7fa71702bd5208cc2e54dd56b data/eternalitems/worldgen/placed_feature/lead_ore_placed.json -57ffb423c75250312c2557e419ea889973296864 data/eternalitems/worldgen/placed_feature/nickel_ore_placed.json -b9cf848ca9bc4eba37b452675ef419529d638ed6 data/eternalitems/worldgen/placed_feature/osmium_ore_placed.json -0db6001788409198384957570d788b8aed6d03ba data/eternalitems/worldgen/placed_feature/platinum_ore_placed.json -9cdfed2a25012336a3f9118f653568c6a1388bfd data/eternalitems/worldgen/placed_feature/plutonium_ore_placed.json -964ddc68365358269066782c001e02157db2e08d data/eternalitems/worldgen/placed_feature/sapphire_ore_placed.json -f73e4aa2deb57771852476741f376d6164381f02 data/eternalitems/worldgen/placed_feature/silver_ore_placed.json -4809dac416d1ec0f0d856d9c1816c286c801d2c2 data/eternalitems/worldgen/placed_feature/sulfur_ore_placed.json -6155aacd0c6ed6274032654b9ea629e4e0d20b76 data/eternalitems/worldgen/placed_feature/tin_ore_placed.json -2cfbdea0747aecf995ad577072c06838434c9ffa data/eternalitems/worldgen/placed_feature/uranium_ore_placed.json -dc47c579ad92b57393cc01efde8e6503158af463 data/eternalitems/worldgen/placed_feature/zinc_ore_placed.json +78ac3ef87fd38b9cceb4449836dabb2f5a87d7fb data/eternalitems/worldgen/placed_feature/aluminum_ore_placed.json +b240e9a04625daa6d72777ef1f0efa8ffc247e73 data/eternalitems/worldgen/placed_feature/apatite_ore_placed.json +9139ea6f458137429f279dfde6e5530dcb732e18 data/eternalitems/worldgen/placed_feature/cinnabar_ore_placed.json +d5ee2f438c75ba55b23da27fef109305eef381e5 data/eternalitems/worldgen/placed_feature/cobalt_ore_placed.json +ddd2ab2416fbb9cf56df5c6090fadeddd9860f0b data/eternalitems/worldgen/placed_feature/fluorite_ore_placed.json +9f6809c0c9ce428628a3b9815bbb39ecbf9011c2 data/eternalitems/worldgen/placed_feature/lead_ore_placed.json +39ce33db4d989919d472e51e940ca921ed891421 data/eternalitems/worldgen/placed_feature/nickel_ore_placed.json +0b2b0ca0d14538c2b3437ee24e1526638967ca75 data/eternalitems/worldgen/placed_feature/osmium_ore_placed.json +2dafcca6d3b0516e6c725ddfa4ad67cf3cad997d data/eternalitems/worldgen/placed_feature/platinum_ore_placed.json +92c3f6bc89c066b70684769e5f8246e2edb04032 data/eternalitems/worldgen/placed_feature/plutonium_ore_placed.json +80a8cd229b92c246b889ec457d6ba018c63ff1e6 data/eternalitems/worldgen/placed_feature/sapphire_ore_placed.json +462eb40bc68685c3848ad63727c6ae2d5dde6e7a data/eternalitems/worldgen/placed_feature/silver_ore_placed.json +8cb6e133705fa4599b3a3201d4a066d260c22e27 data/eternalitems/worldgen/placed_feature/sulfur_ore_placed.json +ac3f40eb7c7a320e6d1e25e6f1b2540b085a186e data/eternalitems/worldgen/placed_feature/tin_ore_placed.json +ea8fb74322bff24525171fff9c0767243662a523 data/eternalitems/worldgen/placed_feature/uranium_ore_placed.json +0960ac892dd16cb4043b8f1bb451488508fb389d data/eternalitems/worldgen/placed_feature/zinc_ore_placed.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 0d8388a..3d3d0df 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,20 +1,26 @@ -// 1.21.1 2024-11-14T02:46:13.4501218 Loot Tables +// 1.21.1 2024-11-22T18:11:59.783141 Loot Tables 9d46450fd9d06e90e4eb79749240d146deca5fb7 data/eternalitems/loot_table/blocks/aluminum_block.json b2e8a28cbbf1a0885dc667c6a432a0e69b43a51a data/eternalitems/loot_table/blocks/aluminum_ore_block.json +78daf713eb7a2fe0a1937db3a1b2b8713518e886 data/eternalitems/loot_table/blocks/apatite_block.json +8d49cc0be8bed80dd5d5a6cde0a0b7e5c1c79c8e data/eternalitems/loot_table/blocks/apatite_ore_block.json 237a2854a7a139938396c3429319bb7426d79a09 data/eternalitems/loot_table/blocks/brass_block.json 7c037f2ee0817a7fc0f723bd0c1258d8f857abcf data/eternalitems/loot_table/blocks/bronze_block.json +6c3243f645883dc57d705b9431ce9f527d21ac90 data/eternalitems/loot_table/blocks/cinnabar_block.json +00c1a27a306f40b4c9cd68ba227ee976d503c45e data/eternalitems/loot_table/blocks/cinnabar_ore_block.json 71e9ca95aee845370092d26ad0d93c25828fcec3 data/eternalitems/loot_table/blocks/cobalt_block.json 9e7d499569907b6131575b98bdd7de126bda784f data/eternalitems/loot_table/blocks/cobalt_ore_block.json ae68dbe51a73190121e4e9f16bc667223c20abb1 data/eternalitems/loot_table/blocks/constantan_block.json f9ee71e0f4158d1a22e492c63d870525dca8d668 data/eternalitems/loot_table/blocks/deepslate_aluminum_ore_block.json +dee11b727d39c3d69a58c59394d7ef18d888496f data/eternalitems/loot_table/blocks/deepslate_apatite_ore_block.json +28092c2637183f70022a3783097277cb71bff35c data/eternalitems/loot_table/blocks/deepslate_cinnabar_ore_block.json 89e9bb73715f5441084736e63e4e26dafe050dd1 data/eternalitems/loot_table/blocks/deepslate_cobalt_ore_block.json -10600377e8c2eeca25d8939fa1bfb50b5bc04dd2 data/eternalitems/loot_table/blocks/deepslate_fluorite_ore_block.json +3fd47b021f01e5f73a6b2ae3c0f1316765ae0506 data/eternalitems/loot_table/blocks/deepslate_fluorite_ore_block.json d947a29efc53fdb62a1feebd63815ff3eec8cff5 data/eternalitems/loot_table/blocks/deepslate_lead_ore_block.json 1e1695b80c5856f7588e0f6c1c31cdbdbd287483 data/eternalitems/loot_table/blocks/deepslate_nickel_ore_block.json 3cbc0c9a1ef9c8d53855fcb5d948fe583c5cdb9f data/eternalitems/loot_table/blocks/deepslate_osmium_ore_block.json d3be656bbe88391c049736168b90abfc09aa498c data/eternalitems/loot_table/blocks/deepslate_platinum_ore_block.json dd67ae819c8788cdb20208da38b2d507be280a14 data/eternalitems/loot_table/blocks/deepslate_plutonium_ore_block.json -ae2afe43602a04ce4dea19d62db917cc3b749920 data/eternalitems/loot_table/blocks/deepslate_sapphire_ore_block.json +03a789f8c5deb61d17cabaa1e466e101f52ef06c data/eternalitems/loot_table/blocks/deepslate_sapphire_ore_block.json 93eae4e325a62214d87fe777f4fffa9a78ff115e data/eternalitems/loot_table/blocks/deepslate_silver_ore_block.json ee9b5a2923b892efa77fd85bf18aa24b6989b5a4 data/eternalitems/loot_table/blocks/deepslate_sulfur_ore_block.json a7f3f3c553b465cc0e743402926fffc601b3735a data/eternalitems/loot_table/blocks/deepslate_tin_ore_block.json @@ -23,7 +29,7 @@ e4e83ad4ec785108db84e1edf24ee8504c76a101 data/eternalitems/loot_table/blocks/dee 13b6f075a1b7b72b1e62914d87d8b2fdc7023366 data/eternalitems/loot_table/blocks/electrum_block.json 0ceffc8eba3080b08f02c6f2177420fb4df15441 data/eternalitems/loot_table/blocks/enderium_block.json d3b4b5f0271cc2bc1ee76633b1d3090b616a0412 data/eternalitems/loot_table/blocks/fluorite_block.json -c3de1780735104c42e6a4a30d2d5c2e5946fbb60 data/eternalitems/loot_table/blocks/fluorite_ore_block.json +668f7edcd859024c3ef1195cbfedbd98a59b1165 data/eternalitems/loot_table/blocks/fluorite_ore_block.json 0b83cf834e50ebd060460819073289f0928a6d69 data/eternalitems/loot_table/blocks/graphite_block.json fb9c5e390c2788e98d542cdc1d46e132c366972f data/eternalitems/loot_table/blocks/invar_block.json d335bacd4ab4c71043e9e33fd6fb04d885a7ad70 data/eternalitems/loot_table/blocks/lead_block.json @@ -49,7 +55,7 @@ ce1a8a1c63220ce91b4590c52c01daa2be0569b4 data/eternalitems/loot_table/blocks/raw 7eff06ccab3fd94b2fe3fdd3b124df60c7df96f6 data/eternalitems/loot_table/blocks/raw_uranium_block.json 64339475a3d2fa1d4a5deed5735027dfda111f89 data/eternalitems/loot_table/blocks/raw_zinc_block.json ad5a01cb05f54e0f97714397431b596e1d2018e0 data/eternalitems/loot_table/blocks/sapphire_block.json -aa2f2d07f61f4ba84f87194a1c84616c4f819aa6 data/eternalitems/loot_table/blocks/sapphire_ore_block.json +bd3d6d7ad96e52dbc8ec78ae8bd9b20b2b1f2232 data/eternalitems/loot_table/blocks/sapphire_ore_block.json 2b11a220f95bff7809e0b49671c452837ec4af5b data/eternalitems/loot_table/blocks/signalum_block.json 41b270503fff0191a34ad2f47d26efe91f0a954f data/eternalitems/loot_table/blocks/silver_block.json bd3030a08147ca6354eaa7ee2f3f100d5c336c73 data/eternalitems/loot_table/blocks/silver_ore_block.json diff --git a/src/generated/resources/.cache/5c218228dfbe07ada306527b9e846614d574de89 b/src/generated/resources/.cache/5c218228dfbe07ada306527b9e846614d574de89 index 8ab454f..6756d69 100644 --- a/src/generated/resources/.cache/5c218228dfbe07ada306527b9e846614d574de89 +++ b/src/generated/resources/.cache/5c218228dfbe07ada306527b9e846614d574de89 @@ -1,13 +1,15 @@ -// 1.21.1 2024-11-14T03:06:39.0141042 Item Models: eternalitems +// 1.21.1 2024-11-22T18:11:59.7771399 Item Models: eternalitems f8b4dc9c72f694edafd5a8dfc6923f2eb1eb1761 assets/eternalitems/models/item/aluminum_dust.json 02c83395e9f13183b3f678e7dca5cd980e623572 assets/eternalitems/models/item/aluminum_ingot.json dadf922c6870a58f314f1653d3a4c8b6504f6e34 assets/eternalitems/models/item/aluminum_nugget.json +87edeb6f44510c4155abdbb655e9bdba2f1d8702 assets/eternalitems/models/item/apatite_dust.json 2a5d04124c787b429bc1a177685473a7db6e784a assets/eternalitems/models/item/brass_dust.json cf7501e5cd74a86ceee629567f394f8dc8cf34b3 assets/eternalitems/models/item/brass_ingot.json 06ed34231feca5aeba8a25141cb8ad74ecb0dc37 assets/eternalitems/models/item/brass_nugget.json afce91b30c58c9f15686f395a10cddfb53aea0b1 assets/eternalitems/models/item/bronze_dust.json 874a5b5c1d2fc2ee15b07eb2b1e50db3fb06ea55 assets/eternalitems/models/item/bronze_ingot.json 5f5253760c10df15a711301233e06bfcf499bf80 assets/eternalitems/models/item/bronze_nugget.json +c4ff6d4ea78cb00f34366e9fc46898a708bcbb2f assets/eternalitems/models/item/cinnabar_dust.json 3b6593992da00ee90321eddd28969cf96d87f405 assets/eternalitems/models/item/coal_dust.json aaca3e57943a42f5736bd8805f18e7daa5daaf98 assets/eternalitems/models/item/cobalt_dust.json 193b61d1f9b191b103e04e2d01daca23f5096a41 assets/eternalitems/models/item/cobalt_hammer.json @@ -31,6 +33,8 @@ c65659a75b5d30335115270d74ca7a74a3d294a3 assets/eternalitems/models/item/ender_d 869ec02392532238e1b3c58f16e7bf035a43f2eb assets/eternalitems/models/item/eternal_light_ingot.json b54b07327139e2f07c76abca6aa6eed8288ce53f assets/eternalitems/models/item/fluorite.json 779943fd74d7b216171170bd22b1a88c9bfad557 assets/eternalitems/models/item/fluorite_dust.json +018dd5dda45a8516da2ffd01d3b8798f803f76f7 assets/eternalitems/models/item/gem_apatite.json +b69b6f09e8eea96be217dc698abeee14f47c933b assets/eternalitems/models/item/gem_cinnabar.json d347eb13f705f5ec1314dac1daec1209cc67347f assets/eternalitems/models/item/gem_obsidian_shard.json 7fe728b649b153684fdb8d3197c534dece47aa83 assets/eternalitems/models/item/gem_onyx.json 0a849f2f4e80aff43524c647e3684f9c7fd2ca5c assets/eternalitems/models/item/gem_peridot.json diff --git a/src/generated/resources/.cache/d2ab0c7aaa4d7f1eba7e17d10575eaa6c0ca15f5 b/src/generated/resources/.cache/d2ab0c7aaa4d7f1eba7e17d10575eaa6c0ca15f5 index 9cb04d5..e02122e 100644 --- a/src/generated/resources/.cache/d2ab0c7aaa4d7f1eba7e17d10575eaa6c0ca15f5 +++ b/src/generated/resources/.cache/d2ab0c7aaa4d7f1eba7e17d10575eaa6c0ca15f5 @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-14T02:46:13.4481206 Tags for minecraft:block mod id eternalitems -f000f010ccc1f554d1d3deab4ec4c872ae23aa81 data/minecraft/tags/block/mineable/pickaxe.json +// 1.21.1 2024-11-22T18:11:59.7821408 Tags for minecraft:block mod id eternalitems +17f85779f75ee18a731c37147f42dd502a131c2a data/minecraft/tags/block/mineable/pickaxe.json 03237abdb9d266df82fa61c493720b33fde93ae8 data/minecraft/tags/block/needs_diamond_tool.json -785f5df25fe66d96366df3eb5b157eb6267af26c data/minecraft/tags/block/needs_iron_tool.json +397596ffe48abe7dee458a7f0ff77aa895d33248 data/minecraft/tags/block/needs_iron_tool.json diff --git a/src/generated/resources/.cache/e4266b57f3fc507507d95bfbc65bb6458776bf9e b/src/generated/resources/.cache/e4266b57f3fc507507d95bfbc65bb6458776bf9e index f55c7c8..268b2b3 100644 --- a/src/generated/resources/.cache/e4266b57f3fc507507d95bfbc65bb6458776bf9e +++ b/src/generated/resources/.cache/e4266b57f3fc507507d95bfbc65bb6458776bf9e @@ -1,12 +1,18 @@ -// 1.21.1 2024-11-14T02:46:13.4521219 Block States: eternalitems +// 1.21.1 2024-11-22T18:11:59.7861428 Block States: eternalitems f40d4cdcc09485a90bf9f7c5248c9adcdf95d1dd assets/eternalitems/blockstates/aluminum_block.json 065006eee49806bb9edcf4280f1988727faee35d assets/eternalitems/blockstates/aluminum_ore_block.json +6e6d0eea5ee6e118210726a4318e32af19f6a795 assets/eternalitems/blockstates/apatite_block.json +63fe9d54d52aadea665e1d60dc7a47272c873615 assets/eternalitems/blockstates/apatite_ore_block.json 4cb0a04ef08def3637e7057ebf2be98ad959003b assets/eternalitems/blockstates/brass_block.json c104c4f247b4af765ff5ae94d1e2980c54117fdb assets/eternalitems/blockstates/bronze_block.json +b3c63735ca56f92a0391834b73b31e562fe275cc assets/eternalitems/blockstates/cinnabar_block.json +f2f7993152e8b3ffdced4a3b2957606004ecb15f assets/eternalitems/blockstates/cinnabar_ore_block.json 80115f16ed885de9c3715904545800bba3498d62 assets/eternalitems/blockstates/cobalt_block.json 978b4801f968153504510bbc94736fed2804c75e assets/eternalitems/blockstates/cobalt_ore_block.json c3ad0e422e21373c309884ef9231857b6dec3c0c assets/eternalitems/blockstates/constantan_block.json a3823689323a91a94f5df58efe2dd7d428ae9d4f assets/eternalitems/blockstates/deepslate_aluminum_ore_block.json +3d33de2fd9637a8c425493244411033d121c75ce assets/eternalitems/blockstates/deepslate_apatite_ore_block.json +5c087c810c73cfcc36eb04a19128daa951aacab4 assets/eternalitems/blockstates/deepslate_cinnabar_ore_block.json c3c12ad74e154a94cd1ec24c852834cd8ac288df assets/eternalitems/blockstates/deepslate_cobalt_ore_block.json c56831032f7370a58c1240668573319cb1e51ea9 assets/eternalitems/blockstates/deepslate_fluorite_ore_block.json babcfa73bf4f2e80f7e4f4d4b2a396a231af96fd assets/eternalitems/blockstates/deepslate_lead_ore_block.json @@ -65,12 +71,18 @@ f43ae8a467ecad9bffd1a44cddd499ebeb672146 assets/eternalitems/blockstates/zinc_bl c059824b9b904beb9abd008e929c419f0f0da817 assets/eternalitems/blockstates/zinc_ore_block.json 0bffa36214c8bb369b741637627be99f2e8b8503 assets/eternalitems/models/block/aluminum_block.json 003da36c1b2751b0077f65abdad0e04b1fff9b1d assets/eternalitems/models/block/aluminum_ore_block.json +e798125cc459ad8d6cd51a7d94df18ab3d27a4fb assets/eternalitems/models/block/apatite_block.json +081c7309c77e5147973de1c8a2e8058ee736a0c9 assets/eternalitems/models/block/apatite_ore_block.json ecd637507545f4709ccef3f03d36f0729c2b4053 assets/eternalitems/models/block/brass_block.json 9514149ddc37cce6c9d8f8bab14e3ec563a6ec3a assets/eternalitems/models/block/bronze_block.json +325da85537c20b4b988cb65d3cec9018a62f68fd assets/eternalitems/models/block/cinnabar_block.json +5e953da69eaf266c817f387bc11f35c23f8129c6 assets/eternalitems/models/block/cinnabar_ore_block.json ddea10770cea4b701a7758540d8539fb3a836cfa assets/eternalitems/models/block/cobalt_block.json 37ab36c4495cf97a6d033faa2d821a737086f634 assets/eternalitems/models/block/cobalt_ore_block.json 18b7bf06d489998637bc161e08eb10b50c3075ff assets/eternalitems/models/block/constantan_block.json af64c7840db9a9c313cca615bb39690c2840d4e8 assets/eternalitems/models/block/deepslate_aluminum_ore_block.json +c5eaa6b0718bc852698023aed60b28463bfedeff assets/eternalitems/models/block/deepslate_apatite_ore_block.json +1efc5e56b59c7cebb42d3966b32d35a09680e040 assets/eternalitems/models/block/deepslate_cinnabar_ore_block.json 313dbc832fbefe8c02da526a3d119ef7fd4b899d assets/eternalitems/models/block/deepslate_cobalt_ore_block.json e4ea5dc98636af14974cfec67ecd82d97a937f62 assets/eternalitems/models/block/deepslate_fluorite_ore_block.json 02c60966b0e71fcb1c3d9eba21eef740b4513942 assets/eternalitems/models/block/deepslate_lead_ore_block.json @@ -129,12 +141,18 @@ aad8945bbbcc9565d52ed45071715d5aa07d1b00 assets/eternalitems/models/block/uraniu d2520b3fa9326431ffeda7e77d8b8a20046757a8 assets/eternalitems/models/block/zinc_ore_block.json 4601a0130e5ae8e81ce5b732acdcb90a6136352a assets/eternalitems/models/item/aluminum_block.json 33d8c63b80ec9885b1ded10f949d354c8693e85d assets/eternalitems/models/item/aluminum_ore_block.json +b7ea298fb50f6d4bc63fff65cb04c5bc1499704c assets/eternalitems/models/item/apatite_block.json +d39df3918571e1f3678eb908dc85dd277e766e61 assets/eternalitems/models/item/apatite_ore_block.json f38cd028763b860411ae194142d41c033da1fe30 assets/eternalitems/models/item/brass_block.json db251e42b8f987dabc0e2cd3aa3b6b1ca50361a3 assets/eternalitems/models/item/bronze_block.json +0d5e5777b597847616a2fb64a9d7bffbd4b1c926 assets/eternalitems/models/item/cinnabar_block.json +9eb0a6c8069b12807b63d6704465ae42b262c264 assets/eternalitems/models/item/cinnabar_ore_block.json e7de2fab1c20675b52570044a7e2e0bf28e4319d assets/eternalitems/models/item/cobalt_block.json 78ebbdb11585cf727de6c20762e671e92a7281b6 assets/eternalitems/models/item/cobalt_ore_block.json 23fa74708a6abf1bb33d69fafb0b2602309df838 assets/eternalitems/models/item/constantan_block.json a2ce343c76d50b99ec72f987d90ea20f282a4f8c assets/eternalitems/models/item/deepslate_aluminum_ore_block.json +8e1ae42bf5c0d79890b15118c9c70108bae63c96 assets/eternalitems/models/item/deepslate_apatite_ore_block.json +65f9958b1e4316cf6a4a1b463698e6d74c7b061d assets/eternalitems/models/item/deepslate_cinnabar_ore_block.json 9e3a4472f1f054f6ecfdd8ba1c5210d605029ec4 assets/eternalitems/models/item/deepslate_cobalt_ore_block.json e1346f414dfc95b1544106c2ff9c4f3adffcce2b assets/eternalitems/models/item/deepslate_fluorite_ore_block.json 47669a0498004efb18ad79c8a70cbbcd9f8c354e assets/eternalitems/models/item/deepslate_lead_ore_block.json diff --git a/src/generated/resources/assets/eternalitems/blockstates/apatite_block.json b/src/generated/resources/assets/eternalitems/blockstates/apatite_block.json new file mode 100644 index 0000000..e33a7e5 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/blockstates/apatite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eternalitems:block/apatite_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/blockstates/apatite_ore_block.json b/src/generated/resources/assets/eternalitems/blockstates/apatite_ore_block.json new file mode 100644 index 0000000..1d181ca --- /dev/null +++ b/src/generated/resources/assets/eternalitems/blockstates/apatite_ore_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eternalitems:block/apatite_ore_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/blockstates/cinnabar_block.json b/src/generated/resources/assets/eternalitems/blockstates/cinnabar_block.json new file mode 100644 index 0000000..d3dcb4f --- /dev/null +++ b/src/generated/resources/assets/eternalitems/blockstates/cinnabar_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eternalitems:block/cinnabar_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/blockstates/cinnabar_ore_block.json b/src/generated/resources/assets/eternalitems/blockstates/cinnabar_ore_block.json new file mode 100644 index 0000000..501411c --- /dev/null +++ b/src/generated/resources/assets/eternalitems/blockstates/cinnabar_ore_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eternalitems:block/cinnabar_ore_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/blockstates/deepslate_apatite_ore_block.json b/src/generated/resources/assets/eternalitems/blockstates/deepslate_apatite_ore_block.json new file mode 100644 index 0000000..f1b2aee --- /dev/null +++ b/src/generated/resources/assets/eternalitems/blockstates/deepslate_apatite_ore_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eternalitems:block/deepslate_apatite_ore_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/blockstates/deepslate_cinnabar_ore_block.json b/src/generated/resources/assets/eternalitems/blockstates/deepslate_cinnabar_ore_block.json new file mode 100644 index 0000000..b7affed --- /dev/null +++ b/src/generated/resources/assets/eternalitems/blockstates/deepslate_cinnabar_ore_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "eternalitems:block/deepslate_cinnabar_ore_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/block/apatite_block.json b/src/generated/resources/assets/eternalitems/models/block/apatite_block.json new file mode 100644 index 0000000..7811cec --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/block/apatite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "eternalitems:block/apatite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/block/apatite_ore_block.json b/src/generated/resources/assets/eternalitems/models/block/apatite_ore_block.json new file mode 100644 index 0000000..957680b --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/block/apatite_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "eternalitems:block/apatite_ore_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/block/cinnabar_block.json b/src/generated/resources/assets/eternalitems/models/block/cinnabar_block.json new file mode 100644 index 0000000..a97596b --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/block/cinnabar_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "eternalitems:block/cinnabar_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/block/cinnabar_ore_block.json b/src/generated/resources/assets/eternalitems/models/block/cinnabar_ore_block.json new file mode 100644 index 0000000..b26f19a --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/block/cinnabar_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "eternalitems:block/cinnabar_ore_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/block/deepslate_apatite_ore_block.json b/src/generated/resources/assets/eternalitems/models/block/deepslate_apatite_ore_block.json new file mode 100644 index 0000000..3590573 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/block/deepslate_apatite_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "eternalitems:block/deepslate_apatite_ore_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/block/deepslate_cinnabar_ore_block.json b/src/generated/resources/assets/eternalitems/models/block/deepslate_cinnabar_ore_block.json new file mode 100644 index 0000000..1601464 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/block/deepslate_cinnabar_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "eternalitems:block/deepslate_cinnabar_ore_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/apatite_block.json b/src/generated/resources/assets/eternalitems/models/item/apatite_block.json new file mode 100644 index 0000000..53ff1e2 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/apatite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "eternalitems:block/apatite_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/apatite_dust.json b/src/generated/resources/assets/eternalitems/models/item/apatite_dust.json new file mode 100644 index 0000000..9aec8d3 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/apatite_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "eternalitems:item/apatite_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/apatite_ore_block.json b/src/generated/resources/assets/eternalitems/models/item/apatite_ore_block.json new file mode 100644 index 0000000..1a5274d --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/apatite_ore_block.json @@ -0,0 +1,3 @@ +{ + "parent": "eternalitems:block/apatite_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/cinnabar_block.json b/src/generated/resources/assets/eternalitems/models/item/cinnabar_block.json new file mode 100644 index 0000000..3958986 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/cinnabar_block.json @@ -0,0 +1,3 @@ +{ + "parent": "eternalitems:block/cinnabar_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/cinnabar_dust.json b/src/generated/resources/assets/eternalitems/models/item/cinnabar_dust.json new file mode 100644 index 0000000..2fe1553 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/cinnabar_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "eternalitems:item/cinnabar_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/cinnabar_ore_block.json b/src/generated/resources/assets/eternalitems/models/item/cinnabar_ore_block.json new file mode 100644 index 0000000..6591e2d --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/cinnabar_ore_block.json @@ -0,0 +1,3 @@ +{ + "parent": "eternalitems:block/cinnabar_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/deepslate_apatite_ore_block.json b/src/generated/resources/assets/eternalitems/models/item/deepslate_apatite_ore_block.json new file mode 100644 index 0000000..c68ef4b --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/deepslate_apatite_ore_block.json @@ -0,0 +1,3 @@ +{ + "parent": "eternalitems:block/deepslate_apatite_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/deepslate_cinnabar_ore_block.json b/src/generated/resources/assets/eternalitems/models/item/deepslate_cinnabar_ore_block.json new file mode 100644 index 0000000..a082e0a --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/deepslate_cinnabar_ore_block.json @@ -0,0 +1,3 @@ +{ + "parent": "eternalitems:block/deepslate_cinnabar_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/gem_apatite.json b/src/generated/resources/assets/eternalitems/models/item/gem_apatite.json new file mode 100644 index 0000000..969bb1c --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/gem_apatite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "eternalitems:item/gem_apatite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/eternalitems/models/item/gem_cinnabar.json b/src/generated/resources/assets/eternalitems/models/item/gem_cinnabar.json new file mode 100644 index 0000000..1b2a681 --- /dev/null +++ b/src/generated/resources/assets/eternalitems/models/item/gem_cinnabar.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "eternalitems:item/gem_cinnabar" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/apatite_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/apatite_block.json new file mode 100644 index 0000000..de7db1c --- /dev/null +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/apatite_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "eternalitems:apatite_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "eternalitems:blocks/apatite_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/apatite_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/apatite_ore_block.json new file mode 100644 index 0000000..50df503 --- /dev/null +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/apatite_ore_block.json @@ -0,0 +1,58 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "eternalitems:apatite_ore_block" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + } + ], + "name": "eternalitems:gem_apatite" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "eternalitems:blocks/apatite_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/cinnabar_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/cinnabar_block.json new file mode 100644 index 0000000..d9c21ac --- /dev/null +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/cinnabar_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "eternalitems:cinnabar_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "eternalitems:blocks/cinnabar_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/cinnabar_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/cinnabar_ore_block.json new file mode 100644 index 0000000..06728e3 --- /dev/null +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/cinnabar_ore_block.json @@ -0,0 +1,58 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "eternalitems:cinnabar_ore_block" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + } + ], + "name": "eternalitems:gem_cinnabar" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "eternalitems:blocks/cinnabar_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_apatite_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_apatite_ore_block.json new file mode 100644 index 0000000..61c90ae --- /dev/null +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_apatite_ore_block.json @@ -0,0 +1,58 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "eternalitems:deepslate_apatite_ore_block" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + } + ], + "name": "eternalitems:gem_apatite" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "eternalitems:blocks/deepslate_apatite_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_cinnabar_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_cinnabar_ore_block.json new file mode 100644 index 0000000..977d55f --- /dev/null +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_cinnabar_ore_block.json @@ -0,0 +1,58 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "eternalitems:deepslate_cinnabar_ore_block" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + } + ], + "name": "eternalitems:gem_cinnabar" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "eternalitems:blocks/deepslate_cinnabar_ore_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_fluorite_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_fluorite_ore_block.json index e6f94cf..bdd9afe 100644 --- a/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_fluorite_ore_block.json +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_fluorite_ore_block.json @@ -35,7 +35,7 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 5.0, + "max": 3.0, "min": 1.0 }, "function": "minecraft:set_count" diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_sapphire_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_sapphire_ore_block.json index 3bbcbe2..ef5349e 100644 --- a/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_sapphire_ore_block.json +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/deepslate_sapphire_ore_block.json @@ -35,7 +35,7 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 5.0, + "max": 3.0, "min": 1.0 }, "function": "minecraft:set_count" diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/fluorite_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/fluorite_ore_block.json index ced5eb6..500b97f 100644 --- a/src/generated/resources/data/eternalitems/loot_table/blocks/fluorite_ore_block.json +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/fluorite_ore_block.json @@ -35,7 +35,7 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 5.0, + "max": 3.0, "min": 1.0 }, "function": "minecraft:set_count" diff --git a/src/generated/resources/data/eternalitems/loot_table/blocks/sapphire_ore_block.json b/src/generated/resources/data/eternalitems/loot_table/blocks/sapphire_ore_block.json index 421cd49..c782a1d 100644 --- a/src/generated/resources/data/eternalitems/loot_table/blocks/sapphire_ore_block.json +++ b/src/generated/resources/data/eternalitems/loot_table/blocks/sapphire_ore_block.json @@ -35,7 +35,7 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 5.0, + "max": 3.0, "min": 1.0 }, "function": "minecraft:set_count" diff --git a/src/generated/resources/data/eternalitems/neoforge/biome_modifier/add_apatite_ore.json b/src/generated/resources/data/eternalitems/neoforge/biome_modifier/add_apatite_ore.json new file mode 100644 index 0000000..ae82cfe --- /dev/null +++ b/src/generated/resources/data/eternalitems/neoforge/biome_modifier/add_apatite_ore.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#minecraft:is_overworld", + "features": "eternalitems:apatite_ore_placed", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/neoforge/biome_modifier/add_cinnabar_ore.json b/src/generated/resources/data/eternalitems/neoforge/biome_modifier/add_cinnabar_ore.json new file mode 100644 index 0000000..de93fb2 --- /dev/null +++ b/src/generated/resources/data/eternalitems/neoforge/biome_modifier/add_cinnabar_ore.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#minecraft:is_overworld", + "features": "eternalitems:cinnabar_ore_placed", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/worldgen/configured_feature/apatite_ore.json b/src/generated/resources/data/eternalitems/worldgen/configured_feature/apatite_ore.json new file mode 100644 index 0000000..62d20de --- /dev/null +++ b/src/generated/resources/data/eternalitems/worldgen/configured_feature/apatite_ore.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "eternalitems:apatite_ore_block" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "eternalitems:deepslate_apatite_ore_block" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/worldgen/configured_feature/cinnabar_ore.json b/src/generated/resources/data/eternalitems/worldgen/configured_feature/cinnabar_ore.json new file mode 100644 index 0000000..7cec3ab --- /dev/null +++ b/src/generated/resources/data/eternalitems/worldgen/configured_feature/cinnabar_ore.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "eternalitems:cinnabar_ore_block" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "eternalitems:deepslate_cinnabar_ore_block" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/aluminum_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/aluminum_ore_placed.json index aaeca3a..bda4524 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/aluminum_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/aluminum_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/apatite_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/apatite_ore_placed.json new file mode 100644 index 0000000..85e8db6 --- /dev/null +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/apatite_ore_placed.json @@ -0,0 +1,27 @@ +{ + "feature": "eternalitems:apatite_ore", + "placement": [ + { + "type": "minecraft:count", + "count": 16 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 80 + }, + "min_inclusive": { + "absolute": -64 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/cinnabar_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/cinnabar_ore_placed.json new file mode 100644 index 0000000..91ca60f --- /dev/null +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/cinnabar_ore_placed.json @@ -0,0 +1,27 @@ +{ + "feature": "eternalitems:cinnabar_ore", + "placement": [ + { + "type": "minecraft:count", + "count": 16 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 80 + }, + "min_inclusive": { + "absolute": -64 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/cobalt_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/cobalt_ore_placed.json index 3e8056f..af9c57e 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/cobalt_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/cobalt_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" @@ -13,7 +13,7 @@ "height": { "type": "minecraft:uniform", "max_inclusive": { - "absolute": 80 + "absolute": 40 }, "min_inclusive": { "absolute": -64 diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/fluorite_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/fluorite_ore_placed.json index bdf7f83..940c155 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/fluorite_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/fluorite_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/lead_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/lead_ore_placed.json index 81f86bc..86b1846 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/lead_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/lead_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/nickel_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/nickel_ore_placed.json index 4b664f3..a47dbd9 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/nickel_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/nickel_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/osmium_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/osmium_ore_placed.json index cd12135..4290ded 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/osmium_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/osmium_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/platinum_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/platinum_ore_placed.json index 89893ef..f4d8128 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/platinum_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/platinum_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" @@ -13,7 +13,7 @@ "height": { "type": "minecraft:uniform", "max_inclusive": { - "absolute": 80 + "absolute": 40 }, "min_inclusive": { "absolute": -64 diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/plutonium_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/plutonium_ore_placed.json index b28341a..189f3b1 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/plutonium_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/plutonium_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" @@ -13,7 +13,7 @@ "height": { "type": "minecraft:uniform", "max_inclusive": { - "absolute": 80 + "absolute": 40 }, "min_inclusive": { "absolute": -64 diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/sapphire_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/sapphire_ore_placed.json index 20c458e..f770e99 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/sapphire_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/sapphire_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/silver_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/silver_ore_placed.json index 612357b..fd89a2c 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/silver_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/silver_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/sulfur_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/sulfur_ore_placed.json index c43e877..b1fe8e7 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/sulfur_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/sulfur_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/tin_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/tin_ore_placed.json index 1a64d6b..3e424c7 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/tin_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/tin_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/uranium_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/uranium_ore_placed.json index 001f5d6..624cb29 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/uranium_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/uranium_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" @@ -13,7 +13,7 @@ "height": { "type": "minecraft:uniform", "max_inclusive": { - "absolute": 80 + "absolute": 40 }, "min_inclusive": { "absolute": -64 diff --git a/src/generated/resources/data/eternalitems/worldgen/placed_feature/zinc_ore_placed.json b/src/generated/resources/data/eternalitems/worldgen/placed_feature/zinc_ore_placed.json index ab01536..a72d50b 100644 --- a/src/generated/resources/data/eternalitems/worldgen/placed_feature/zinc_ore_placed.json +++ b/src/generated/resources/data/eternalitems/worldgen/placed_feature/zinc_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 18 + "count": 16 }, { "type": "minecraft:in_square" diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 94ece67..b0bb6d2 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -2,6 +2,10 @@ "values": [ "eternalitems:aluminum_ore_block", "eternalitems:deepslate_aluminum_ore_block", + "eternalitems:apatite_ore_block", + "eternalitems:deepslate_apatite_ore_block", + "eternalitems:cinnabar_ore_block", + "eternalitems:deepslate_cinnabar_ore_block", "eternalitems:cobalt_ore_block", "eternalitems:deepslate_cobalt_ore_block", "eternalitems:fluorite_ore_block", @@ -52,6 +56,8 @@ "eternalitems:steel_block", "eternalitems:sapphire_block", "eternalitems:fluorite_block", + "eternalitems:apatite_block", + "eternalitems:cinnabar_block", "eternalitems:raw_aluminum_block", "eternalitems:raw_cobalt_block", "eternalitems:raw_lead_block", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index d7d6687..f887072 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -2,6 +2,10 @@ "values": [ "eternalitems:aluminum_ore_block", "eternalitems:deepslate_aluminum_ore_block", + "eternalitems:apatite_ore_block", + "eternalitems:deepslate_apatite_ore_block", + "eternalitems:cinnabar_ore_block", + "eternalitems:deepslate_cinnabar_ore_block", "eternalitems:fluorite_ore_block", "eternalitems:deepslate_fluorite_ore_block", "eternalitems:nickel_ore_block", @@ -42,6 +46,8 @@ "eternalitems:steel_block", "eternalitems:sapphire_block", "eternalitems:fluorite_block", + "eternalitems:apatite_block", + "eternalitems:cinnabar_block", "eternalitems:raw_aluminum_block", "eternalitems:raw_cobalt_block", "eternalitems:raw_lead_block", diff --git a/src/main/java/net/radzratz/eternalitems/block/ModBlocks.java b/src/main/java/net/radzratz/eternalitems/block/ModBlocks.java index 13c4fb5..06bdf0e 100644 --- a/src/main/java/net/radzratz/eternalitems/block/ModBlocks.java +++ b/src/main/java/net/radzratz/eternalitems/block/ModBlocks.java @@ -172,6 +172,29 @@ public class ModBlocks { .strength(4f) .requiresCorrectToolForDrops() .sound(SoundType.STONE))); + //Apatite + public static final DeferredBlock DEEPSLATE_APATITE_ORE_BLOCK = registerBlock("deepslate_apatite_ore_block", + () -> new Block(BlockBehaviour.Properties.of() + .strength(3f) + .requiresCorrectToolForDrops() + .sound(SoundType.DEEPSLATE))); + public static final DeferredBlock APATITE_ORE_BLOCK = registerBlock("apatite_ore_block", + () -> new Block(BlockBehaviour.Properties.of() + .strength(3f) + .requiresCorrectToolForDrops() + .sound(SoundType.STONE))); + + //Cinnabar + public static final DeferredBlock DEEPSLATE_CINNABAR_ORE_BLOCK = registerBlock("deepslate_cinnabar_ore_block", + () -> new Block(BlockBehaviour.Properties.of() + .strength(3f) + .requiresCorrectToolForDrops() + .sound(SoundType.DEEPSLATE))); + public static final DeferredBlock CINNABAR_ORE_BLOCK = registerBlock("cinnabar_ore_block", + () -> new Block(BlockBehaviour.Properties.of() + .strength(3f) + .requiresCorrectToolForDrops() + .sound(SoundType.STONE))); //RAW ORE BLOCKS public static final DeferredBlock RAW_ALUMINUM_BLOCK = registerBlock("raw_aluminum_block", @@ -358,6 +381,16 @@ public class ModBlocks { .strength(3f) .requiresCorrectToolForDrops() .sound(SoundType.METAL))); + public static final DeferredBlock APATITE_BLOCK = registerBlock("apatite_block", + () -> new Block(BlockBehaviour.Properties.of() + .strength(3f) + .requiresCorrectToolForDrops() + .sound(SoundType.METAL))); + public static final DeferredBlock CINNABAR_BLOCK = registerBlock("cinnabar_block", + () -> new Block(BlockBehaviour.Properties.of() + .strength(3f) + .requiresCorrectToolForDrops() + .sound(SoundType.METAL))); diff --git a/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockLootTableProvider.java b/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockLootTableProvider.java index eb11172..08c02ec 100644 --- a/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockLootTableProvider.java +++ b/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockLootTableProvider.java @@ -54,6 +54,8 @@ protected void generate() { //GEM BLOCKS dropSelf(ModBlocks.SAPPHIRE_BLOCK.get()); dropSelf(ModBlocks.FLUORITE_BLOCK.get()); + dropSelf(ModBlocks.APATITE_BLOCK.get()); + dropSelf(ModBlocks.CINNABAR_BLOCK.get()); //RAW ORE BLOCKS dropSelf(ModBlocks.RAW_ALUMINUM_BLOCK.get()); @@ -120,12 +122,20 @@ protected void generate() { //GEMS //FLUORITE TO GEM - add(ModBlocks.FLUORITE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.FLUORITE_ORE_BLOCK.get(), Moditems.FLUORITE.get(), 1,5)); - add(ModBlocks.DEEPSLATE_FLUORITE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_FLUORITE_ORE_BLOCK.get(), Moditems.FLUORITE.get(),1,5)); + add(ModBlocks.FLUORITE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.FLUORITE_ORE_BLOCK.get(), Moditems.FLUORITE.get(), 1,3)); + add(ModBlocks.DEEPSLATE_FLUORITE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_FLUORITE_ORE_BLOCK.get(), Moditems.FLUORITE.get(),1,3)); //SAPPHIRE TO GEM - add(ModBlocks.SAPPHIRE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.SAPPHIRE_ORE_BLOCK.get(), Moditems.GEM_SAPPHIRE.get(), 1,5)); - add(ModBlocks.DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), Moditems.GEM_SAPPHIRE.get(),1,5)); + add(ModBlocks.SAPPHIRE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.SAPPHIRE_ORE_BLOCK.get(), Moditems.GEM_SAPPHIRE.get(), 1,3)); + add(ModBlocks.DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), Moditems.GEM_SAPPHIRE.get(),1,3)); + + //APATITE TO GEM + add(ModBlocks.APATITE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.APATITE_ORE_BLOCK.get(), Moditems.GEM_APATITE.get(), 1,3)); + add(ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK.get(), Moditems.GEM_APATITE.get(),1,3)); + + //CINNABAR TO GEM + add(ModBlocks.CINNABAR_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.CINNABAR_ORE_BLOCK.get(), Moditems.GEM_CINNABAR.get(), 1,3)); + add(ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK.get(), block -> createMultipleOreDrops(ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK.get(), Moditems.GEM_CINNABAR.get(),1,3)); } protected LootTable.Builder createMultipleOreDrops(Block pBlock, Item item, float minDrops, float maxDrops) { diff --git a/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockStateProvider.java b/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockStateProvider.java index d93952e..9917193 100644 --- a/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockStateProvider.java +++ b/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockStateProvider.java @@ -41,6 +41,8 @@ protected void registerStatesAndModels() { //GEM BLOCKS blockWithItem(ModBlocks.SAPPHIRE_BLOCK); blockWithItem(ModBlocks.FLUORITE_BLOCK); + blockWithItem(ModBlocks.APATITE_BLOCK); + blockWithItem(ModBlocks.CINNABAR_BLOCK); //RAW BLOCKS blockWithItem(ModBlocks.RAW_ALUMINUM_BLOCK); @@ -101,6 +103,12 @@ protected void registerStatesAndModels() { //SAPPHIRE blockWithItem(ModBlocks.SAPPHIRE_ORE_BLOCK); blockWithItem(ModBlocks.DEEPSLATE_SAPPHIRE_ORE_BLOCK); + //APATITE + blockWithItem(ModBlocks.APATITE_ORE_BLOCK); + blockWithItem(ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK); + //CINNABAR + blockWithItem(ModBlocks.CINNABAR_ORE_BLOCK); + blockWithItem(ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK); } private void blockWithItem(DeferredBlock deferredBlock) { diff --git a/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockTagProvider.java b/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockTagProvider.java index 50fb258..cef363d 100644 --- a/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockTagProvider.java +++ b/src/main/java/net/radzratz/eternalitems/datagen/EternalBlockTagProvider.java @@ -24,6 +24,10 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { //ORE BLOCKS .add(ModBlocks.ALUMINUM_ORE_BLOCK.get()) .add(ModBlocks.DEEPSLATE_ALUMINUM_ORE_BLOCK.get()) + .add(ModBlocks.APATITE_ORE_BLOCK.get()) + .add(ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK.get()) + .add(ModBlocks.CINNABAR_ORE_BLOCK.get()) + .add(ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK.get()) .add(ModBlocks.COBALT_ORE_BLOCK.get()) .add(ModBlocks.DEEPSLATE_COBALT_ORE_BLOCK.get()) .add(ModBlocks.FLUORITE_ORE_BLOCK.get()) @@ -78,6 +82,8 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { //GEM BLOCKS .add(ModBlocks.SAPPHIRE_BLOCK.get()) .add(ModBlocks.FLUORITE_BLOCK.get()) + .add(ModBlocks.APATITE_BLOCK.get()) + .add(ModBlocks.CINNABAR_BLOCK.get()) //RAW ORE BLOCKS .add(ModBlocks.RAW_ALUMINUM_BLOCK.get()) @@ -97,6 +103,10 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { //ORE BLOCKS .add(ModBlocks.ALUMINUM_ORE_BLOCK.get()) .add(ModBlocks.DEEPSLATE_ALUMINUM_ORE_BLOCK.get()) + .add(ModBlocks.APATITE_ORE_BLOCK.get()) + .add(ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK.get()) + .add(ModBlocks.CINNABAR_ORE_BLOCK.get()) + .add(ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK.get()) .add(ModBlocks.FLUORITE_ORE_BLOCK.get()) .add(ModBlocks.DEEPSLATE_FLUORITE_ORE_BLOCK.get()) .add(ModBlocks.NICKEL_ORE_BLOCK.get()) @@ -141,6 +151,8 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { //GEM BLOCKS .add(ModBlocks.SAPPHIRE_BLOCK.get()) .add(ModBlocks.FLUORITE_BLOCK.get()) + .add(ModBlocks.APATITE_BLOCK.get()) + .add(ModBlocks.CINNABAR_BLOCK.get()) //RAW ORE BLOCKS .add(ModBlocks.RAW_ALUMINUM_BLOCK.get()) diff --git a/src/main/java/net/radzratz/eternalitems/datagen/EternalItemModelProvider.java b/src/main/java/net/radzratz/eternalitems/datagen/EternalItemModelProvider.java index 9367e58..74d2047 100644 --- a/src/main/java/net/radzratz/eternalitems/datagen/EternalItemModelProvider.java +++ b/src/main/java/net/radzratz/eternalitems/datagen/EternalItemModelProvider.java @@ -126,6 +126,8 @@ protected void registerModels() { basicItem(Moditems.STEEL_DUST.get()); basicItem(Moditems.SAPPHIRE_DUST.get()); basicItem(Moditems.COAL_DUST.get()); + basicItem(Moditems.APATITE_DUST.get()); + basicItem(Moditems.CINNABAR_DUST.get()); //RODS handheldItem(Moditems.ROD_ALUMINUM); @@ -195,6 +197,8 @@ protected void registerModels() { basicItem(Moditems.GEM_OBSIDIAN_SHARD.get()); basicItem(Moditems.GEM_PERIDOT.get()); basicItem(Moditems.GEM_RUBY.get()); + basicItem(Moditems.GEM_APATITE.get()); + basicItem(Moditems.GEM_CINNABAR.get()); //GEM SHARDS basicItem(Moditems.GEM_SAPPHIRE_SHARD.get()); diff --git a/src/main/java/net/radzratz/eternalitems/item/ModCreativeModeTabs.java b/src/main/java/net/radzratz/eternalitems/item/ModCreativeModeTabs.java index 6a4448c..0e80534 100644 --- a/src/main/java/net/radzratz/eternalitems/item/ModCreativeModeTabs.java +++ b/src/main/java/net/radzratz/eternalitems/item/ModCreativeModeTabs.java @@ -182,6 +182,7 @@ public class ModCreativeModeTabs { .title(Component.translatable("creativetab.eternalitems.eternal_ore_dust")) .displayItems((itemDisplayParameters, output) -> { output.accept(Moditems.ALUMINUM_DUST); + output.accept(Moditems.APATITE_DUST); output.accept(Moditems.BRASS_DUST); output.accept(Moditems.BRONZE_DUST); output.accept(Moditems.COAL_DUST); @@ -219,6 +220,8 @@ public class ModCreativeModeTabs { .withTabsBefore(ResourceLocation.fromNamespaceAndPath(EternalItems.MOD_ID, "eternal_items_tabs")) .title(Component.translatable("creativetab.eternalitems.eternal_gems")) .displayItems((itemDisplayParameters, output) -> { + output.accept(Moditems.GEM_APATITE); + output.accept(Moditems.GEM_CINNABAR); output.accept(Moditems.FLUORITE); output.accept(Moditems.GEM_OBSIDIAN_SHARD); output.accept(Moditems.GEM_ONYX); @@ -235,6 +238,8 @@ public class ModCreativeModeTabs { .title(Component.translatable("creativetab.eternalitems.eternal_ore_blocks")) .displayItems((itemDisplayParameters, output) -> { output.accept(ModBlocks.ALUMINUM_ORE_BLOCK); + output.accept(ModBlocks.APATITE_ORE_BLOCK); + output.accept(ModBlocks.CINNABAR_ORE_BLOCK); output.accept(ModBlocks.COBALT_ORE_BLOCK); output.accept(ModBlocks.FLUORITE_ORE_BLOCK); output.accept(ModBlocks.LEAD_ORE_BLOCK); @@ -249,6 +254,8 @@ public class ModCreativeModeTabs { output.accept(ModBlocks.TIN_ORE_BLOCK); output.accept(ModBlocks.ZINC_ORE_BLOCK); output.accept(ModBlocks.DEEPSLATE_ALUMINUM_ORE_BLOCK); + output.accept(ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK); + output.accept(ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK); output.accept(ModBlocks.DEEPSLATE_COBALT_ORE_BLOCK); output.accept(ModBlocks.DEEPSLATE_FLUORITE_ORE_BLOCK); output.accept(ModBlocks.DEEPSLATE_LEAD_ORE_BLOCK); @@ -270,8 +277,10 @@ public class ModCreativeModeTabs { .title(Component.translatable("creativetab.eternalitems.eternal_blocks")) .displayItems((itemDisplayParameters, output) -> { output.accept(ModBlocks.ALUMINUM_BLOCK); + output.accept(ModBlocks.APATITE_BLOCK); output.accept(ModBlocks.BRASS_BLOCK); output.accept(ModBlocks.BRONZE_BLOCK); + output.accept(ModBlocks.CINNABAR_BLOCK); output.accept(ModBlocks.COBALT_BLOCK); output.accept(ModBlocks.CONSTANTAN_BLOCK); output.accept(ModBlocks.ELECTRUM_BLOCK); diff --git a/src/main/java/net/radzratz/eternalitems/item/Moditems.java b/src/main/java/net/radzratz/eternalitems/item/Moditems.java index 0242b75..64517a2 100644 --- a/src/main/java/net/radzratz/eternalitems/item/Moditems.java +++ b/src/main/java/net/radzratz/eternalitems/item/Moditems.java @@ -338,6 +338,10 @@ public class Moditems { ()-> new Item(new Item.Properties())); public static final DeferredItem COAL_DUST = ITEMS.register("coal_dust", ()-> new Item(new Item.Properties())); + public static final DeferredItem APATITE_DUST = ITEMS.register("apatite_dust", + ()-> new Item(new Item.Properties())); + public static final DeferredItem CINNABAR_DUST = ITEMS.register("cinnabar_dust", + ()-> new Item(new Item.Properties())); //Gems public static final DeferredItem GEM_ONYX = ITEMS.register("gem_onyx", @@ -350,6 +354,10 @@ public class Moditems { ()-> new Item(new Item.Properties())); public static final DeferredItem FLUORITE = ITEMS.register("fluorite", ()-> new Item(new Item.Properties())); + public static final DeferredItem GEM_APATITE = ITEMS.register("gem_apatite", + ()-> new Item(new Item.Properties())); + public static final DeferredItem GEM_CINNABAR = ITEMS.register("gem_cinnabar", + ()-> new Item(new Item.Properties())); //Gem Shard public static final DeferredItem GEM_SAPPHIRE_SHARD = ITEMS.register("gem_sapphire_shard", diff --git a/src/main/java/net/radzratz/eternalitems/worldgen/EternalBiomeModifier.java b/src/main/java/net/radzratz/eternalitems/worldgen/EternalBiomeModifier.java index f8d5a87..c0fedde 100644 --- a/src/main/java/net/radzratz/eternalitems/worldgen/EternalBiomeModifier.java +++ b/src/main/java/net/radzratz/eternalitems/worldgen/EternalBiomeModifier.java @@ -17,6 +17,14 @@ public class EternalBiomeModifier { public static final ResourceKey ADD_ALUMINUM_ORE = registerKey("add_aluminum_ore"); public static final ResourceKey ADD_NETHER_ALUMINUM_ORE = registerKey("add_nether_aluminum_ore"); public static final ResourceKey ADD_END_ALUMINUM_ORE = registerKey("add_end_aluminum_ore"); + //Apatite + public static final ResourceKey ADD_APATITE_ORE = registerKey("add_apatite_ore"); + public static final ResourceKey ADD_NETHER_APATITE_ORE = registerKey("add_nether_apatite_ore"); + public static final ResourceKey ADD_END_APATITE_ORE = registerKey("add_end_apatite_ore"); + //Cinnabar + public static final ResourceKey ADD_CINNABAR_ORE = registerKey("add_cinnabar_ore"); + public static final ResourceKey ADD_NETHER_CINNABAR_ORE = registerKey("add_nether_cinnabar_ore"); + public static final ResourceKey ADD_END_CINNABAR_ORE = registerKey("add_end_cinnabar_ore"); //Cobalt public static final ResourceKey ADD_COBALT_ORE = registerKey("add_cobalt_ore"); public static final ResourceKey ADD_NETHER_COBALT_ORE = registerKey("add_nether_cobalt_ore"); @@ -80,6 +88,18 @@ public static void bootstrap(BootstrapContext context) { HolderSet.direct(placedFeatures.getOrThrow(EternalPlacedFeatures.ALUMINUM_ORE_PLACED_KEY)), GenerationStep.Decoration.UNDERGROUND_ORES)); + //Apatite + context.register(ADD_APATITE_ORE, new BiomeModifiers.AddFeaturesBiomeModifier( + biomes.getOrThrow(BiomeTags.IS_OVERWORLD), + HolderSet.direct(placedFeatures.getOrThrow(EternalPlacedFeatures.APATITE_ORE_PLACED_KEY)), + GenerationStep.Decoration.UNDERGROUND_ORES)); + + //Cinnabar + context.register(ADD_CINNABAR_ORE, new BiomeModifiers.AddFeaturesBiomeModifier( + biomes.getOrThrow(BiomeTags.IS_OVERWORLD), + HolderSet.direct(placedFeatures.getOrThrow(EternalPlacedFeatures.CINNABAR_ORE_PLACED_KEY)), + GenerationStep.Decoration.UNDERGROUND_ORES)); + //Cobalt context.register(ADD_COBALT_ORE, new BiomeModifiers.AddFeaturesBiomeModifier( biomes.getOrThrow(BiomeTags.IS_OVERWORLD), diff --git a/src/main/java/net/radzratz/eternalitems/worldgen/EternalConfiguredFeatures.java b/src/main/java/net/radzratz/eternalitems/worldgen/EternalConfiguredFeatures.java index 0461aa7..d8c37c4 100644 --- a/src/main/java/net/radzratz/eternalitems/worldgen/EternalConfiguredFeatures.java +++ b/src/main/java/net/radzratz/eternalitems/worldgen/EternalConfiguredFeatures.java @@ -21,6 +21,14 @@ public class EternalConfiguredFeatures { public static final ResourceKey> OVERWORLD_ALUMINUM_ORE_KEY = registerKey("aluminum_ore"); public static final ResourceKey> NETHER_ALUMINUM_ORE_KEY = registerKey("nether_aluminum_ore"); public static final ResourceKey> END_ALUMINUM_ORE_KEY = registerKey("end_aluminum_ore"); + //Apatite + public static final ResourceKey> OVERWORLD_APATITE_ORE_KEY = registerKey("apatite_ore"); + public static final ResourceKey> NETHER_APATITE_ORE_KEY = registerKey("nether_apatite_ore"); + public static final ResourceKey> END_APATITE_ORE_KEY = registerKey("end_apatite_ore"); + //Cinnabar + public static final ResourceKey> OVERWORLD_CINNABAR_ORE_KEY = registerKey("cinnabar_ore"); + public static final ResourceKey> NETHER_CINNABAR_ORE_KEY = registerKey("nether_cinnabar_ore"); + public static final ResourceKey> END_CINNABAR_ORE_KEY = registerKey("end_cinnabar_ore"); //Cobalt public static final ResourceKey> OVERWORLD_COBALT_ORE_KEY = registerKey("cobalt_ore"); public static final ResourceKey> NETHER_COBALT_ORE_KEY = registerKey("nether_cobalt_ore"); @@ -91,6 +99,28 @@ public static void bootstrap(BootstrapContext> context) //register(context, END_ALUMINUM_ORE_KEY, Feature.ORE, new OreConfiguration(endReplaceables, // ModBlocks.END_ALUMINUM_ORE_BLOCK.get().defaultBlockState(9))); + //APATITE ORES + List overworldApatiteOres = List.of(OreConfiguration.target(stoneReplaceable, + ModBlocks.APATITE_ORE_BLOCK.get().defaultBlockState()), + OreConfiguration.target(deepslateReplaceables, + ModBlocks.DEEPSLATE_APATITE_ORE_BLOCK.get().defaultBlockState())); + register(context, OVERWORLD_APATITE_ORE_KEY, Feature.ORE, new OreConfiguration(overworldApatiteOres,20)); + //register(context, NETHER_APATITE_ORE_KEY, Feature.ORE, new OreConfiguration(netherReplaceables, + // ModBlocks.NETHER_APATITE_ORE_BLOCK.get().defaultBlockState(9))); + //register(context, END_APATITE_ORE_KEY, Feature.ORE, new OreConfiguration(endReplaceables, + // ModBlocks.END_APATITE_ORE_BLOCK.get().defaultBlockState(9))); + + //CINNABAR ORES + List overworldCinnabarOres = List.of(OreConfiguration.target(stoneReplaceable, + ModBlocks.CINNABAR_ORE_BLOCK.get().defaultBlockState()), + OreConfiguration.target(deepslateReplaceables, + ModBlocks.DEEPSLATE_CINNABAR_ORE_BLOCK.get().defaultBlockState())); + register(context, OVERWORLD_CINNABAR_ORE_KEY, Feature.ORE, new OreConfiguration(overworldCinnabarOres,20)); + //register(context, NETHER_CINNABAR_ORE_KEY, Feature.ORE, new OreConfiguration(netherReplaceables, + // ModBlocks.NETHER_CINNABAR_ORE_BLOCK.get().defaultBlockState(9))); + //register(context, END_CINNABAR_ORE_KEY, Feature.ORE, new OreConfiguration(endReplaceables, + // ModBlocks.END_CINNABAR_ORE_BLOCK.get().defaultBlockState(9))); + //COBALT ORES List overworldCobaltOres = List.of(OreConfiguration.target(stoneReplaceable, ModBlocks.COBALT_ORE_BLOCK.get().defaultBlockState()), diff --git a/src/main/java/net/radzratz/eternalitems/worldgen/EternalPlacedFeatures.java b/src/main/java/net/radzratz/eternalitems/worldgen/EternalPlacedFeatures.java index 8a5b127..9b42a1e 100644 --- a/src/main/java/net/radzratz/eternalitems/worldgen/EternalPlacedFeatures.java +++ b/src/main/java/net/radzratz/eternalitems/worldgen/EternalPlacedFeatures.java @@ -20,6 +20,14 @@ public class EternalPlacedFeatures { public static final ResourceKey ALUMINUM_ORE_PLACED_KEY = registerKey("aluminum_ore_placed"); public static final ResourceKey NETHER_ALUMINUM_ORE_PLACED_KEY = registerKey("nether_aluminum_ore_placed"); public static final ResourceKey END_ALUMINUM_ORE_PLACED_KEY = registerKey("end_aluminum_ore_placed"); + //Apatite + public static final ResourceKey APATITE_ORE_PLACED_KEY = registerKey("apatite_ore_placed"); + public static final ResourceKey NETHER_APATITE_ORE_PLACED_KEY = registerKey("nether_apatite_ore_placed"); + public static final ResourceKey END_APATITE_ORE_PLACED_KEY = registerKey("end_apatite_ore_placed"); + //Cinnabar + public static final ResourceKey CINNABAR_ORE_PLACED_KEY = registerKey("cinnabar_ore_placed"); + public static final ResourceKey NETHER_CINNABAR_ORE_PLACED_KEY = registerKey("nether_cinnabar_ore_placed"); + public static final ResourceKey END_CINNABAR_ORE_PLACED_KEY = registerKey("end_cinnabar_ore_placed"); //Cobalt public static final ResourceKey COBALT_ORE_PLACED_KEY = registerKey("cobalt_ore_placed"); public static final ResourceKey NETHER_COBALT_ORE_PLACED_KEY = registerKey("nether_cobalt_ore_placed"); @@ -78,7 +86,7 @@ public static void bootstrap(BootstrapContext context) { //ALUMINUM register(context, ALUMINUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_ALUMINUM_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_ALUMINUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_ALUMINUM_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -87,10 +95,32 @@ public static void bootstrap(BootstrapContext context) { // EternalOrePlacement.commonOrePlacement(12, // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + //APATITE + register(context, APATITE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_APATITE_ORE_KEY), + EternalOrePlacement.commonOrePlacement(16, + HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + //register(context, NETHER_APATITE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_APATITE_ORE_KEY), + // EternalOrePlacement.commonOrePlacement(12, + // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + //register(context, END_APATITE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.END_APATITE_ORE_KEY), + // EternalOrePlacement.commonOrePlacement(12, + // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + + //CINNABAR + register(context, CINNABAR_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_CINNABAR_ORE_KEY), + EternalOrePlacement.commonOrePlacement(16, + HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + //register(context, NETHER_CINNABAR_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_CINNABAR_ORE_KEY), + // EternalOrePlacement.commonOrePlacement(12, + // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + //register(context, END_CINNABAR_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.END_CINNABAR_ORE_KEY), + // EternalOrePlacement.commonOrePlacement(12, + // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + //COBALT register(context, COBALT_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_COBALT_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, - HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + EternalOrePlacement.commonOrePlacement(16, + HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(34)))); //register(context, NETHER_COBALT_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_ALUMINUM_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); @@ -100,7 +130,7 @@ public static void bootstrap(BootstrapContext context) { //FLUORITE register(context, FLUORITE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_FLUORITE_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_FLUORITE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_FLUORITE_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -111,7 +141,7 @@ public static void bootstrap(BootstrapContext context) { //LEAD register(context, LEAD_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_LEAD_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_LEAD_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_LEAD_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -122,7 +152,7 @@ public static void bootstrap(BootstrapContext context) { //NICKEL register(context, NICKEL_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_NICKEL_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_NICKEL_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_NICKEL_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -133,7 +163,7 @@ public static void bootstrap(BootstrapContext context) { //OSMIUM register(context, OSMIUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_OSMIUM_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_OSMIUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_OSMIUM_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -144,8 +174,8 @@ public static void bootstrap(BootstrapContext context) { //PLATINUM register(context, PLATINUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_PLATINUM_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, - HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + EternalOrePlacement.commonOrePlacement(16, + HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(34)))); //register(context, NETHER_PLATINUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_PLATINUM_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); @@ -155,8 +185,8 @@ public static void bootstrap(BootstrapContext context) { //PLUTONIUM register(context, PLUTONIUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_PLUTONIUM_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, - HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + EternalOrePlacement.commonOrePlacement(16, + HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(34)))); //register(context, NETHER_PLUTONIUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_PLATINUM_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); @@ -166,7 +196,7 @@ public static void bootstrap(BootstrapContext context) { //SILVER register(context, SILVER_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_SILVER_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_SILVER_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_SILVER_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -177,7 +207,7 @@ public static void bootstrap(BootstrapContext context) { //SAPPHIRE register(context, SAPPHIRE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_SAPPHIRE_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_SAPPHIRE_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_SAPPHIRE_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -188,7 +218,7 @@ public static void bootstrap(BootstrapContext context) { //SULFUR register(context, SULFUR_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_SULFUR_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_SULFUR_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_SULFUR_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -199,7 +229,7 @@ public static void bootstrap(BootstrapContext context) { //TIN register(context, TIN_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_TIN_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_TIN_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_TIN_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, @@ -210,8 +240,8 @@ public static void bootstrap(BootstrapContext context) { //URANIUM register(context, URANIUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_URANIUM_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, - HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); + EternalOrePlacement.commonOrePlacement(16, + HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(34)))); //register(context, NETHER_URANIUM_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_URANIUM_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, // HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); @@ -221,7 +251,7 @@ public static void bootstrap(BootstrapContext context) { //ZINC register(context, ZINC_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.OVERWORLD_ZINC_ORE_KEY), - EternalOrePlacement.commonOrePlacement(18, + EternalOrePlacement.commonOrePlacement(16, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64), VerticalAnchor.absolute(80)))); //register(context, NETHER_ZINC_ORE_PLACED_KEY, ConfiguredFeatures.getOrThrow(EternalConfiguredFeatures.NETHER_ZINC_ORE_KEY), // EternalOrePlacement.commonOrePlacement(12, diff --git a/src/main/resources/assets/eternalitems/lang/en_us.json b/src/main/resources/assets/eternalitems/lang/en_us.json index 62814a0..5e03a9f 100644 --- a/src/main/resources/assets/eternalitems/lang/en_us.json +++ b/src/main/resources/assets/eternalitems/lang/en_us.json @@ -161,6 +161,8 @@ "item.eternalitems.steel_dust": "Steel Dust", "item.eternalitems.sapphire_dust": "Sapphire Dust", "item.eternalitems.coal_dust": "Coal Dust", + "item.eternalitems.apatite_dust": "Apatite Dust", + "item.eternalitems.cinnabar_dust": "Cinnabar Dust", "item.eternalitems.gem_obsidian_shard": "Obsidian Shard", "item.eternalitems.gem_onyx": "Onyx", @@ -169,6 +171,8 @@ "item.eternalitems.gem_sapphire": "Sapphire", "item.eternalitems.sulfur": "Sulfur", "item.eternalitems.fluorite": "Fluorite", + "item.eternalitems.gem_apatite": "Apatite", + "item.eternalitems.gem_cinnabar": "Cinnabar", "item.eternalitems.gem_sapphire_shard": "Sapphire Shard", @@ -186,6 +190,8 @@ "block.eternalitems.silver_ore_block": "Silver Ore", "block.eternalitems.zinc_ore_block": "Zinc Ore", "block.eternalitems.sapphire_ore_block": "Sapphire Ore", + "block.eternalitems.apatite_ore_block": "Apatite Ore", + "block.eternalitems.cinnabar_ore_block": "Cinnabar Ore", "block.eternalitems.deepslate_cobalt_ore_block": "Deepslate Cobalt Ore", "block.eternalitems.deepslate_fluorite_ore_block": "Deepslate Fluorite Ore", @@ -201,6 +207,8 @@ "block.eternalitems.deepslate_aluminum_ore_block": "Deepslate Aluminum Ore", "block.eternalitems.deepslate_zinc_ore_block": "Deepslate Zinc Ore", "block.eternalitems.deepslate_sapphire_ore_block": "Deepslate Sapphire Ore", + "block.eternalitems.deepslate_apatite_ore_block": "Deepslate Apatite Ore", + "block.eternalitems.deepslate_cinnabar_ore_block": "Deepslate Cinnabar Ore", "block.eternalitems.raw_aluminum_block": "Block of Raw Aluminum", "block.eternalitems.raw_cobalt_block": "Block of Raw Cobalt", @@ -239,6 +247,8 @@ "block.eternalitems.steel_block": "Steel Block", "block.eternalitems.sapphire_block": "Sapphire Block", "block.eternalitems.fluorite_block": "Fluorite Block", + "block.eternalitems.apatite_block": "Apatite Block", + "block.eternalitems.cinnabar_block": "Cinnabar Block", "creativetab.eternalitems.eternal_ingots": "Eternal Ingots", "creativetab.eternalitems.eternal_ore_blocks": "Eternal Ore Blocks", diff --git a/src/main/resources/assets/eternalitems/textures/block/apatite_block.png b/src/main/resources/assets/eternalitems/textures/block/apatite_block.png new file mode 100644 index 0000000..dc0a3bf Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/block/apatite_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/apatite_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/apatite_ore_block.png new file mode 100644 index 0000000..c4218d0 Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/block/apatite_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/cinnabar_block.png b/src/main/resources/assets/eternalitems/textures/block/cinnabar_block.png new file mode 100644 index 0000000..418bd2c Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/block/cinnabar_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/cinnabar_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/cinnabar_ore_block.png new file mode 100644 index 0000000..b49ac97 Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/block/cinnabar_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/cobalt_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/cobalt_ore_block.png index 2782ef5..d3665cb 100644 Binary files a/src/main/resources/assets/eternalitems/textures/block/cobalt_ore_block.png and b/src/main/resources/assets/eternalitems/textures/block/cobalt_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/deepslate_apatite_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/deepslate_apatite_ore_block.png new file mode 100644 index 0000000..51fac22 Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/block/deepslate_apatite_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/deepslate_cinnabar_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/deepslate_cinnabar_ore_block.png new file mode 100644 index 0000000..de1375d Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/block/deepslate_cinnabar_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/deepslate_cobalt_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/deepslate_cobalt_ore_block.png index 4c26090..f256dd1 100644 Binary files a/src/main/resources/assets/eternalitems/textures/block/deepslate_cobalt_ore_block.png and b/src/main/resources/assets/eternalitems/textures/block/deepslate_cobalt_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/deepslate_osmium_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/deepslate_osmium_ore_block.png index eed26b4..1cc0683 100644 Binary files a/src/main/resources/assets/eternalitems/textures/block/deepslate_osmium_ore_block.png and b/src/main/resources/assets/eternalitems/textures/block/deepslate_osmium_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/osmium_ore_block.png b/src/main/resources/assets/eternalitems/textures/block/osmium_ore_block.png index 4c133a8..e17ce07 100644 Binary files a/src/main/resources/assets/eternalitems/textures/block/osmium_ore_block.png and b/src/main/resources/assets/eternalitems/textures/block/osmium_ore_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/block/raw_osmium_block.png b/src/main/resources/assets/eternalitems/textures/block/raw_osmium_block.png index c2bc1f2..43d08a9 100644 Binary files a/src/main/resources/assets/eternalitems/textures/block/raw_osmium_block.png and b/src/main/resources/assets/eternalitems/textures/block/raw_osmium_block.png differ diff --git a/src/main/resources/assets/eternalitems/textures/item/apatite_dust.png b/src/main/resources/assets/eternalitems/textures/item/apatite_dust.png new file mode 100644 index 0000000..6ce8c04 Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/item/apatite_dust.png differ diff --git a/src/main/resources/assets/eternalitems/textures/item/cinnabar_dust.png b/src/main/resources/assets/eternalitems/textures/item/cinnabar_dust.png new file mode 100644 index 0000000..828ebe5 Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/item/cinnabar_dust.png differ diff --git a/src/main/resources/assets/eternalitems/textures/item/gem_apatite.png b/src/main/resources/assets/eternalitems/textures/item/gem_apatite.png new file mode 100644 index 0000000..0e338c0 Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/item/gem_apatite.png differ diff --git a/src/main/resources/assets/eternalitems/textures/item/gem_cinnabar.png b/src/main/resources/assets/eternalitems/textures/item/gem_cinnabar.png new file mode 100644 index 0000000..d328b6e Binary files /dev/null and b/src/main/resources/assets/eternalitems/textures/item/gem_cinnabar.png differ diff --git a/src/main/resources/assets/eternalitems/textures/item/raw_cobalt.png b/src/main/resources/assets/eternalitems/textures/item/raw_cobalt.png index 1567b21..1ec1990 100644 Binary files a/src/main/resources/assets/eternalitems/textures/item/raw_cobalt.png and b/src/main/resources/assets/eternalitems/textures/item/raw_cobalt.png differ diff --git a/src/main/resources/assets/eternalitems/textures/item/raw_osmium.png b/src/main/resources/assets/eternalitems/textures/item/raw_osmium.png index fb54561..3c8d8dd 100644 Binary files a/src/main/resources/assets/eternalitems/textures/item/raw_osmium.png and b/src/main/resources/assets/eternalitems/textures/item/raw_osmium.png differ diff --git a/src/main/resources/data/c/tags/block/ores.json b/src/main/resources/data/c/tags/block/ores.json index b3f2232..b5cf07e 100644 --- a/src/main/resources/data/c/tags/block/ores.json +++ b/src/main/resources/data/c/tags/block/ores.json @@ -3,30 +3,46 @@ "values": [ "eternalitems:aluminum_ore_block", "eternalitems:deepslate_aluminum_ore_block", + + "eternalitems:cinnabar_ore_block", + "eternalitems:deepslate_cinnabar_ore_block", + "eternalitems:cobalt_ore_block", "eternalitems:deepslate_cobalt_ore_block", + "eternalitems:fluorite_ore_block", "eternalitems:deepslate_fluorite_ore_block", + "eternalitems:lead_ore_block", "eternalitems:deepslate_lead_ore_block", + "eternalitems:nickel_ore_block", "eternalitems:deepslate_nickel_ore_block", + "eternalitems:osmium_ore_block", "eternalitems:deepslate_osmium_ore_block", + "eternalitems:platinum_ore_block", "eternalitems:deepslate_platinum_ore_block", + "eternalitems:plutonium_ore_block", "eternalitems:deepslate_plutonium_ore_block", + "eternalitems:sapphire_ore_block", "eternalitems:deepslate_sapphire_ore_block", + "eternalitems:silver_ore_block", "eternalitems:deepslate_silver_ore_block", + "eternalitems:sulfur_ore_block", "eternalitems:deepslate_sulfur_ore_block", + "eternalitems:tin_ore_block", "eternalitems:deepslate_tin_ore_block", + "eternalitems:uranium_ore_block", "eternalitems:deepslate_uranium_ore_block", + "eternalitems:zinc_ore_block", "eternalitems:deepslate_zinc_ore_block" ] diff --git a/src/main/resources/data/c/tags/block/ores/apatite.json b/src/main/resources/data/c/tags/block/ores/apatite.json new file mode 100644 index 0000000..a5189f7 --- /dev/null +++ b/src/main/resources/data/c/tags/block/ores/apatite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "eternalitems:apatite_ore_block", + "eternalitems:deepslate_apatite_ore_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/block/ores/cinnabar.json b/src/main/resources/data/c/tags/block/ores/cinnabar.json new file mode 100644 index 0000000..3dd1e9f --- /dev/null +++ b/src/main/resources/data/c/tags/block/ores/cinnabar.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "eternalitems:cinnabar_ore_block", + "eternalitems:deepslate_cinnabar_ore_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/block/ores_in_ground/deepslate.json b/src/main/resources/data/c/tags/block/ores_in_ground/deepslate.json index 89a62ba..40a7d0a 100644 --- a/src/main/resources/data/c/tags/block/ores_in_ground/deepslate.json +++ b/src/main/resources/data/c/tags/block/ores_in_ground/deepslate.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "eternalitems:deepslate_aluminum_ore_block", + "eternalitems:deepslate_apatite_ore_block", + "eternalitems:deepslate_cinnabar_ore_block", "eternalitems:deepslate_cobalt_ore_block", "eternalitems:deepslate_fluorite_ore_block", "eternalitems:deepslate_lead_ore_block", diff --git a/src/main/resources/data/c/tags/block/ores_in_ground/stone.json b/src/main/resources/data/c/tags/block/ores_in_ground/stone.json index 413d6b7..d52df77 100644 --- a/src/main/resources/data/c/tags/block/ores_in_ground/stone.json +++ b/src/main/resources/data/c/tags/block/ores_in_ground/stone.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "eternalitems:aluminum_ore_block", + "eternalitems:apatite_ore_block", + "eternalitems:cinnabar_ore_block", "eternalitems:cobalt_ore_block", "eternalitems:fluorite_ore_block", "eternalitems:lead_ore_block", diff --git a/src/main/resources/data/c/tags/block/storage_blocks/apatite.json b/src/main/resources/data/c/tags/block/storage_blocks/apatite.json new file mode 100644 index 0000000..9d87256 --- /dev/null +++ b/src/main/resources/data/c/tags/block/storage_blocks/apatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:apatite_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/block/storage_blocks/cinnabar.json b/src/main/resources/data/c/tags/block/storage_blocks/cinnabar.json new file mode 100644 index 0000000..fc1bbdb --- /dev/null +++ b/src/main/resources/data/c/tags/block/storage_blocks/cinnabar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:cinnabar_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/dusts.json b/src/main/resources/data/c/tags/item/dusts.json index f5f40b6..c55f51d 100644 --- a/src/main/resources/data/c/tags/item/dusts.json +++ b/src/main/resources/data/c/tags/item/dusts.json @@ -2,8 +2,10 @@ "replace": false, "values": [ "eternalitems:aluminum_dust", + "eternalitems:apatite_dust", "eternalitems:brass_dust", "eternalitems:bronze_dust", + "eternalitems:cinnabar_dust", "eternalitems:coal_dust", "eternalitems:cobalt_dust", "eternalitems:constantan_dust", diff --git a/src/main/resources/data/c/tags/item/dusts/apatite.json b/src/main/resources/data/c/tags/item/dusts/apatite.json new file mode 100644 index 0000000..36aaac2 --- /dev/null +++ b/src/main/resources/data/c/tags/item/dusts/apatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:apatite_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/dusts/cinnabar.json b/src/main/resources/data/c/tags/item/dusts/cinnabar.json new file mode 100644 index 0000000..9f654c7 --- /dev/null +++ b/src/main/resources/data/c/tags/item/dusts/cinnabar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:cinnabar_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/gems.json b/src/main/resources/data/c/tags/item/gems.json index 3f24f9a..b9124d1 100644 --- a/src/main/resources/data/c/tags/item/gems.json +++ b/src/main/resources/data/c/tags/item/gems.json @@ -1,6 +1,8 @@ { "replace": false, "values": [ + "eternalitems:gem_apatite", + "eternalitems:gem_cinnabar", "eternalitems:fluorite", "eternalitems:gem_obsidian_shard", "eternalitems:gem_onyx", diff --git a/src/main/resources/data/c/tags/item/gems/apatite.json b/src/main/resources/data/c/tags/item/gems/apatite.json new file mode 100644 index 0000000..b0d834f --- /dev/null +++ b/src/main/resources/data/c/tags/item/gems/apatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:gem_apatite" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/gems/cinnabar.json b/src/main/resources/data/c/tags/item/gems/cinnabar.json new file mode 100644 index 0000000..02b05db --- /dev/null +++ b/src/main/resources/data/c/tags/item/gems/cinnabar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:gem_cinnabar" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/ores.json b/src/main/resources/data/c/tags/item/ores.json index b3f2232..24b7554 100644 --- a/src/main/resources/data/c/tags/item/ores.json +++ b/src/main/resources/data/c/tags/item/ores.json @@ -3,30 +3,49 @@ "values": [ "eternalitems:aluminum_ore_block", "eternalitems:deepslate_aluminum_ore_block", + + "eternalitems:apatite_ore_block", + "eternalitems:deepslate_apatite_ore_block", + + "eternalitems:cinabbar_ore_block", + "eternalitems:deepslate_cinnabar_ore_block", + "eternalitems:cobalt_ore_block", "eternalitems:deepslate_cobalt_ore_block", + "eternalitems:fluorite_ore_block", "eternalitems:deepslate_fluorite_ore_block", + "eternalitems:lead_ore_block", "eternalitems:deepslate_lead_ore_block", + "eternalitems:nickel_ore_block", "eternalitems:deepslate_nickel_ore_block", + "eternalitems:osmium_ore_block", "eternalitems:deepslate_osmium_ore_block", + "eternalitems:platinum_ore_block", "eternalitems:deepslate_platinum_ore_block", + "eternalitems:plutonium_ore_block", "eternalitems:deepslate_plutonium_ore_block", + "eternalitems:sapphire_ore_block", "eternalitems:deepslate_sapphire_ore_block", + "eternalitems:silver_ore_block", "eternalitems:deepslate_silver_ore_block", + "eternalitems:sulfur_ore_block", "eternalitems:deepslate_sulfur_ore_block", + "eternalitems:tin_ore_block", "eternalitems:deepslate_tin_ore_block", + "eternalitems:uranium_ore_block", "eternalitems:deepslate_uranium_ore_block", + "eternalitems:zinc_ore_block", "eternalitems:deepslate_zinc_ore_block" ] diff --git a/src/main/resources/data/c/tags/item/ores/apatite.json b/src/main/resources/data/c/tags/item/ores/apatite.json new file mode 100644 index 0000000..a5189f7 --- /dev/null +++ b/src/main/resources/data/c/tags/item/ores/apatite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "eternalitems:apatite_ore_block", + "eternalitems:deepslate_apatite_ore_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/ores/cinnabar.json b/src/main/resources/data/c/tags/item/ores/cinnabar.json new file mode 100644 index 0000000..3dd1e9f --- /dev/null +++ b/src/main/resources/data/c/tags/item/ores/cinnabar.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "eternalitems:cinnabar_ore_block", + "eternalitems:deepslate_cinnabar_ore_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/ores_in_ground/deepslate.json b/src/main/resources/data/c/tags/item/ores_in_ground/deepslate.json index 89a62ba..40a7d0a 100644 --- a/src/main/resources/data/c/tags/item/ores_in_ground/deepslate.json +++ b/src/main/resources/data/c/tags/item/ores_in_ground/deepslate.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "eternalitems:deepslate_aluminum_ore_block", + "eternalitems:deepslate_apatite_ore_block", + "eternalitems:deepslate_cinnabar_ore_block", "eternalitems:deepslate_cobalt_ore_block", "eternalitems:deepslate_fluorite_ore_block", "eternalitems:deepslate_lead_ore_block", diff --git a/src/main/resources/data/c/tags/item/ores_in_ground/stone.json b/src/main/resources/data/c/tags/item/ores_in_ground/stone.json index 413d6b7..d52df77 100644 --- a/src/main/resources/data/c/tags/item/ores_in_ground/stone.json +++ b/src/main/resources/data/c/tags/item/ores_in_ground/stone.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "eternalitems:aluminum_ore_block", + "eternalitems:apatite_ore_block", + "eternalitems:cinnabar_ore_block", "eternalitems:cobalt_ore_block", "eternalitems:fluorite_ore_block", "eternalitems:lead_ore_block", diff --git a/src/main/resources/data/c/tags/item/storage_blocks.json b/src/main/resources/data/c/tags/item/storage_blocks.json index d2ad4f8..41913c3 100644 --- a/src/main/resources/data/c/tags/item/storage_blocks.json +++ b/src/main/resources/data/c/tags/item/storage_blocks.json @@ -2,8 +2,10 @@ "replace": false, "values": [ "eternalitems:aluminum_block", + "eternalitems:apatite_block", "eternalitems:bronze_block", "eternalitems:brass_block", + "eternalitems:cinnabar_block", "eternalitems:cobalt_block", "eternalitems:constantan_block", "eternalitems:electrum_block", diff --git a/src/main/resources/data/c/tags/item/storage_blocks/apatite.json b/src/main/resources/data/c/tags/item/storage_blocks/apatite.json new file mode 100644 index 0000000..9d87256 --- /dev/null +++ b/src/main/resources/data/c/tags/item/storage_blocks/apatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:apatite_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/storage_blocks/cinnabar.json b/src/main/resources/data/c/tags/item/storage_blocks/cinnabar.json new file mode 100644 index 0000000..fc1bbdb --- /dev/null +++ b/src/main/resources/data/c/tags/item/storage_blocks/cinnabar.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "eternalitems:cinnabar_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/apatite/sapphire_block.json b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_block.json new file mode 100644 index 0000000..5016924 --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "c:gems/apatite" + } + }, + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "result": { + "count": 1, + "id": "eternalitems:apatite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/apatite/sapphire_block_to_gem.json b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_block_to_gem.json new file mode 100644 index 0000000..bfd902a --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_block_to_gem.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "eternalitems:apatite_block" + } + ], + "result": { + "count": 9, + "id": "eternalitems:gem_apatite" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/apatite/sapphire_dust_to_gem_blasting.json b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_dust_to_gem_blasting.json new file mode 100644 index 0000000..eded86e --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_dust_to_gem_blasting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "apatite_gem", + "ingredient": { + "tag": "c:dusts/apatite" + }, + "result": { + "id": "eternalitems:gem_apatite" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/apatite/sapphire_dust_to_gem_furnace.json b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_dust_to_gem_furnace.json new file mode 100644 index 0000000..5f8502a --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_dust_to_gem_furnace.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "apatite_gem", + "ingredient": { + "tag": "c:dusts/apatite" + }, + "result": { + "id": "eternalitems:gem_apatite" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/apatite/sapphire_gem_to_dust.json b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_gem_to_dust.json new file mode 100644 index 0000000..0e13f95 --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/apatite/sapphire_gem_to_dust.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "c:gems/apatite" + }, + { + "tag": "hammers:hammers" + } + ], + "result": { + "count": 1, + "id": "eternalitems:apatite_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_block.json b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_block.json new file mode 100644 index 0000000..f4fb22a --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "c:gems/cinnabar" + } + }, + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "result": { + "count": 1, + "id": "eternalitems:cinnabar_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_block_to_gem.json b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_block_to_gem.json new file mode 100644 index 0000000..b363429 --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_block_to_gem.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "eternalitems:cinnabar_block" + } + ], + "result": { + "count": 9, + "id": "eternalitems:gem_cinnabar" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_dust_to_gem_blasting.json b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_dust_to_gem_blasting.json new file mode 100644 index 0000000..afc80c2 --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_dust_to_gem_blasting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "cinnabar_gem", + "ingredient": { + "tag": "c:dusts/cinnabar" + }, + "result": { + "id": "eternalitems:gem_cinnabar" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_dust_to_gem_furnace.json b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_dust_to_gem_furnace.json new file mode 100644 index 0000000..9851ef8 --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_dust_to_gem_furnace.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.7, + "group": "cinnabar_gem", + "ingredient": { + "tag": "c:dusts/cinnabar" + }, + "result": { + "id": "eternalitems:gem_cinnabar" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_gem_to_dust.json b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_gem_to_dust.json new file mode 100644 index 0000000..9292ee4 --- /dev/null +++ b/src/main/resources/data/eternalitems/recipe/cinnabar/cinnabar_gem_to_dust.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "c:gems/cinnabar" + }, + { + "tag": "hammers:hammers" + } + ], + "result": { + "count": 1, + "id": "eternalitems:cinnabar_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/data/eternalitems/recipe/sapphire/sapphire_block_to_gem.json b/src/main/resources/data/eternalitems/recipe/sapphire/sapphire_block_to_gem.json index bd55027..8edf710 100644 --- a/src/main/resources/data/eternalitems/recipe/sapphire/sapphire_block_to_gem.json +++ b/src/main/resources/data/eternalitems/recipe/sapphire/sapphire_block_to_gem.json @@ -7,7 +7,7 @@ } ], "result": { - "count": 4, + "count": 9, "id": "eternalitems:gem_sapphire" } } \ No newline at end of file