diff --git a/build.gradle b/build.gradle index 56b043b..d445d4b 100644 --- a/build.gradle +++ b/build.gradle @@ -64,9 +64,17 @@ minecraft { sourceSets.main.resources { srcDir 'src/generated/resources' } +repositories { + maven { url = 'https://www.cursemaven.com/' } +} + dependencies { minecraft 'net.minecraftforge:forge:1.16.4-35.1.4' compile fileTree(dir:'lib', include:'*.jar') + // Mod with compatibility patch + implementation fg.deobf("curse.maven:create-328085:3167531") + // JEI: use for quick testing on compatibility + implementation fg.deobf("curse.maven:jei-238222:3189632") } jar { diff --git a/changelog.md b/changelog.md index 0558b6a..68a8deb 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ + Diamond nether ore + Emerald nether ore + Bad registry name apply on some block + + Missing recipe + Add + Dust + Coal @@ -24,6 +25,8 @@ + Lapis + Emerald + Custom creative tab ++ Compatibility + + Create (partial) ### 4.5.0.63-experimental + Add support for DiaboloLib 1.0.4 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index a843dd6..b4f1e6a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,3 +1,25 @@ +fc5664cdbfaada586ce1c221500bb9f70a3fc64c data/create/recipes/crushing/aluminium_dust.json +d4482b7433c2b90f5f999060944849dc23d23273 data/create/recipes/crushing/coal.json +04d88afae967444e807ba769431858f78164bdca data/create/recipes/crushing/coal_basalt_ore.json +8a79d47bb0a052587cec6ccd7228108d2e299b3e data/create/recipes/crushing/coal_end_ore.json +ea752139e1ce6c8e63a8b6cc8a79911afd38dac5 data/create/recipes/crushing/coal_nether_ore.json +1593061387b156b64175b48eb153dc394987b93b data/create/recipes/crushing/copper_dust.json +c008c990239f3dcbf6ee1913b50f9ce4611f7079 data/create/recipes/crushing/diamond.json +ee1dfb8875896bd83cf412897151ff5d5ec1c953 data/create/recipes/crushing/emerald.json +d274d18a69fd7413c119e77986ae0fb51da4eee8 data/create/recipes/crushing/gold_ingot.json +0b33acd6a4e7bf9fc6c4962f080041223bdd15b7 data/create/recipes/crushing/iron_ingot.json +3beaff37f6be1b628c01915674f9da977e7c78db data/create/recipes/crushing/lapis_lazuli.json +b0cb6b12b86a02a8e046d63e9152c06c3e8cd264 data/create/recipes/crushing/lead_dust.json +ce5e4905a7d001d5f3ef0459c8a432a1f9b045f1 data/create/recipes/crushing/nickel_dust.json +155a5cb6985b792de20a08b47f5acdb8563d652b data/create/recipes/crushing/platinum_dust.json +5125337eb5ef2fe2b5fc7e64e80ecc8c41fcf2d5 data/create/recipes/crushing/redstone_basalt_ore.json +a16652d705e6dd700b4efe5cd939354b8a00d937 data/create/recipes/crushing/redstone_end_ore.json +e03c3f1dd7f6ad8ab1d038aca86b4cdbb0ce1e75 data/create/recipes/crushing/redstone_nether_ore.json +3609c690ff151ddb5d1d7e95a4197a9304724e97 data/create/recipes/crushing/ruby_dust.json +910a0bb6ab4f43346af6b965671aca8d3fb3dcf3 data/create/recipes/crushing/sapphire_dust.json +bddd179cc6a93a8842fc20218aaf4175e3761cef data/create/recipes/crushing/silver_dust.json +1111cd9768001e5d4574ccbda70cb46b3be15c91 data/create/recipes/crushing/tin_dust.json +4ba7ea279fcc82d785e8c02593e97859029e589e data/create/recipes/crushing/uranium_dust.json 0f72d861c40a11e78298823e74e0cbd036dc057f data/janoeo/advancements/recipes/janoeo.ore.item/blasting_aluminium_nether_ore_to_aluminium_ingot.json 897a0b122583846ee3175aa2b64bf4b88e5f355a data/janoeo/advancements/recipes/janoeo.ore.item/blasting_aluminium_ore_to_aluminium_ingot.json a9318042407a1f7665e8d15683b23bccded275b5 data/janoeo/advancements/recipes/janoeo.ore.item/blasting_amethyst_ore_to_amethyst.json @@ -18,10 +40,10 @@ ba7da2a99ed387c37355097e8a52c14311d741d9 data/janoeo/advancements/recipes/janoeo 943a1e75efa2bcf20842e807e43c25968a6ceece data/janoeo/advancements/recipes/janoeo.ore.item/blasting_uranium_nether_ore_to_uranium_ingot.json 54567d03887f9d3c99efd826cf20b9e3601c0ed6 data/janoeo/advancements/recipes/janoeo.ore.item/blasting_uranium_ore_to_uranium_ingot.json 728ccd2e64200bf5eb5faefea5cb5237822497a0 data/janoeo/advancements/recipes/janoeo.ore.item/blasting_zinc_ore_to_zinc_ingot.json -93a79095c0df5b2dc499790d013152c199b29fbf data/janoeo/advancements/recipes/janoeo.ore.item/ruby_block.json -69cfa28f9dff8a73acbf985bdd100fda411ec77e data/janoeo/advancements/recipes/janoeo.ore.item/ruby_from_block.json -d3406e1b58646e9f19d8f49c9d9436dde5f47680 data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_block.json -a95eeeebe67816ffeaf3476c56e07d88c29b41e5 data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_from_block.json +3aea5feddb914c98422b6eb44500223c5b5a155c data/janoeo/advancements/recipes/janoeo.ore.item/ruby_block.json +55880af79d3f96d38c01dd581c89897599f61da3 data/janoeo/advancements/recipes/janoeo.ore.item/ruby_from_block.json +479e86996c8f514784f7406028ee12f5f3262402 data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_block.json +6a7e262c5e16f59778facd704a4a25954202eda5 data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_from_block.json b436a79c9d2eadfcdec4b4e05f3896da9e5c4384 data/janoeo/advancements/recipes/janoeo.ore.item/smelting_aluminium_nether_ore_to_aluminium_ingot.json 049e1143dd539c38c292097ca7fe748853808cd8 data/janoeo/advancements/recipes/janoeo.ore.item/smelting_aluminium_ore_to_aluminium_ingot.json 798b8224c3d564e4fc547370dca3c9ce50629af6 data/janoeo/advancements/recipes/janoeo.ore.item/smelting_amethyst_ore_to_amethyst.json @@ -42,56 +64,70 @@ aa4272f13bea9a585cd52d1a87636269715f98c8 data/janoeo/advancements/recipes/janoeo 913391fd5d102a0bf02ae45b726d6a4726821d6d data/janoeo/advancements/recipes/janoeo.ore.item/smelting_uranium_nether_ore_to_uranium_ingot.json 83559f475bf2b68759f6cb1141a7ca5e676dffe0 data/janoeo/advancements/recipes/janoeo.ore.item/smelting_uranium_ore_to_uranium_ingot.json 662b6fa1a433f12ab70d9468c7aed221afeb0617 data/janoeo/advancements/recipes/janoeo.ore.item/smelting_zinc_ore_to_zinc_ingot.json +1f16c9f70797bc5e535e5c2b95c92d6225710d9f data/janoeo/advancements/recipes/misc/blasting_coal_basalt_ore_to_coal.json b36b1359b70154ae8c0807835f884a6f0ad8a775 data/janoeo/advancements/recipes/misc/blasting_coal_dust_to_coal.json f239dc825938b8547ee24f5666e3708cd60f569f data/janoeo/advancements/recipes/misc/blasting_coal_end_ore_to_coal.json 93c0c2b1d5ee2147b790ad86b07e8d3ac571c869 data/janoeo/advancements/recipes/misc/blasting_coal_gravel_ore_to_coal.json 3890f0e83faa0af079013e3732bc19339b9e2bb8 data/janoeo/advancements/recipes/misc/blasting_coal_nether_ore_to_coal.json +09f2e00d419502b579499cc597723f1177f8bd09 data/janoeo/advancements/recipes/misc/blasting_diamond_basalt_ore_to_diamond.json fe6cc811bfa3e8fdb4cabdf2caa8634f0c350ce7 data/janoeo/advancements/recipes/misc/blasting_diamond_dust_to_diamond.json a7aebcba5187f33462da5c4d9ee845c0639d0cc2 data/janoeo/advancements/recipes/misc/blasting_diamond_end_ore_to_diamond.json 63752ea69946d8a9945673871038f9d651da97d3 data/janoeo/advancements/recipes/misc/blasting_diamond_gravel_ore_to_diamond.json 1fad93e7a9a2e1aaf09ac88cc44547d75cfe2d03 data/janoeo/advancements/recipes/misc/blasting_diamond_nether_ore_to_diamond.json +4457c839433fb81ce708125a07f37e57fdc54eb2 data/janoeo/advancements/recipes/misc/blasting_emerald_basalt_ore_to_emerald.json 8f288ca1b42124cb99e267a413f87efb5849a3f0 data/janoeo/advancements/recipes/misc/blasting_emerald_dust_to_emerald.json cb6c4b132975a87719be70189acf1ae4faff6477 data/janoeo/advancements/recipes/misc/blasting_emerald_end_ore_to_emerald.json 8b11efc5d1ad2aacf1d708b9bc98b54f52e03667 data/janoeo/advancements/recipes/misc/blasting_emerald_gravel_ore_to_emerald.json 57dc2ccebbcc0d6809823db746d7e1323b03650f data/janoeo/advancements/recipes/misc/blasting_emerald_nether_ore_to_emerald.json +3d2eb2425582828d27f7076e68390ed097c05918 data/janoeo/advancements/recipes/misc/blasting_gold_basalt_ore_to_gold_ingot.json 74729f7c06d678d3d54e59777e4fff035d9e6994 data/janoeo/advancements/recipes/misc/blasting_gold_dust_to_gold_ingot.json acf6b1f885ad5cb8968e08f4acce3d5e0c025fa2 data/janoeo/advancements/recipes/misc/blasting_gold_end_ore_to_gold_ingot.json 9e27b0e5cc160e97d043fd5c28cd8ea243d68014 data/janoeo/advancements/recipes/misc/blasting_gold_gravel_ore_to_gold_ingot.json 96c7cd51ecb7d04d000aa2b31b020c1a61f01312 data/janoeo/advancements/recipes/misc/blasting_gold_nether_ore_to_gold_ingot.json +d96c229944c2c56734253b5f556f8f807c1ce2ee data/janoeo/advancements/recipes/misc/blasting_iron_basalt_ore_to_iron_ingot.json a6b1f2311cdb414876a70170051b8c47b58c3c3e data/janoeo/advancements/recipes/misc/blasting_iron_dust_to_iron_ingot.json 80e68fd36f74796c93cf3b2480f67e2b382889eb data/janoeo/advancements/recipes/misc/blasting_iron_end_ore_to_iron_ingot.json 7f586c5d03499e297a5bf9b24a943ad7078d87ab data/janoeo/advancements/recipes/misc/blasting_iron_gravel_ore_to_iron_ingot.json 36f259c341747c48db375791f493fcec7317389b data/janoeo/advancements/recipes/misc/blasting_iron_nether_ore_to_iron_ingot.json +b83bb879f553db9b5a3baa8036134921e86f0374 data/janoeo/advancements/recipes/misc/blasting_lapis_basalt_ore_to_lapis_lazuli.json e3a3f7e97129d92d9a60463ddceedd1ad047d8c7 data/janoeo/advancements/recipes/misc/blasting_lapis_dust_to_lapis_lazuli.json 3498c8678ca441a5e81c00cb3218af629e7859da data/janoeo/advancements/recipes/misc/blasting_lapis_end_ore_to_lapis_lazuli.json fa0bea796fc8331c5d01bc4a8d5177f2087de0de data/janoeo/advancements/recipes/misc/blasting_lapis_gravel_ore_to_lapis_lazuli.json 169b84c033c0cbd2ee151877beb5481ae4410814 data/janoeo/advancements/recipes/misc/blasting_lapis_nether_ore_to_lapis_lazuli.json +8875869dbf9d3de493c11ab454b913219e3022ff data/janoeo/advancements/recipes/misc/smelting_coal_basalt_ore_to_coal.json aad399065f5a9805c481340d9b82fc1de5d9b12e data/janoeo/advancements/recipes/misc/smelting_coal_dust_to_coal.json 7e6490dba313df0685b878d559186928dca1d2ff data/janoeo/advancements/recipes/misc/smelting_coal_end_ore_to_coal.json ac7b630139f67d2dab1023eeffa83895ec982bcb data/janoeo/advancements/recipes/misc/smelting_coal_gravel_ore_to_coal.json f863d740594326903c9a0aa76ad6050e1adf6320 data/janoeo/advancements/recipes/misc/smelting_coal_nether_ore_to_coal.json +d908af506d3f8959056d5ad063cb72de36537a1a data/janoeo/advancements/recipes/misc/smelting_diamond_basalt_ore_to_diamond.json a9dda91b89630c29ccfd6291d74d7907ca39ffb2 data/janoeo/advancements/recipes/misc/smelting_diamond_dust_to_diamond.json d1ccaf1df625c3d9ad7ea46ee9a349fc9132b5d8 data/janoeo/advancements/recipes/misc/smelting_diamond_end_ore_to_diamond.json 920946da5fcc01ad80349cba86efff53e68a7aee data/janoeo/advancements/recipes/misc/smelting_diamond_gravel_ore_to_diamond.json 75f365eb16c9b5ba3663348bb0be3d8335c18236 data/janoeo/advancements/recipes/misc/smelting_diamond_nether_ore_to_diamond.json +3fe90abbb167e6d2852f150443a3eaf3471b7380 data/janoeo/advancements/recipes/misc/smelting_emerald_basalt_ore_to_emerald.json 1619fb0e6364d35581a7cf8b6802cb5beadfee6b data/janoeo/advancements/recipes/misc/smelting_emerald_dust_to_emerald.json a39f4a291bae587d57248b43adca7fb9572aa160 data/janoeo/advancements/recipes/misc/smelting_emerald_end_ore_to_emerald.json 72bfd4ebb95352d2ba1bd7182b8f84e9f6e7b8c3 data/janoeo/advancements/recipes/misc/smelting_emerald_gravel_ore_to_emerald.json 9de49ef5ac6b97a6790c031f9cfa26cef6a3b415 data/janoeo/advancements/recipes/misc/smelting_emerald_nether_ore_to_emerald.json +4e2081107c1ce7145ca144f44bd75d97b3ace9a9 data/janoeo/advancements/recipes/misc/smelting_gold_basalt_ore_to_gold_ingot.json 361eb240d49ad9ddfa868718af9e7194b981813c data/janoeo/advancements/recipes/misc/smelting_gold_dust_to_gold_ingot.json 2decad5c0a8f3d09fb161d9c365f27f36cf775c0 data/janoeo/advancements/recipes/misc/smelting_gold_end_ore_to_gold_ingot.json b91212f54491de7876e45ef54b07e06722d042e3 data/janoeo/advancements/recipes/misc/smelting_gold_gravel_ore_to_gold_ingot.json 68b6d2ec957334374170fee485122c00214c0113 data/janoeo/advancements/recipes/misc/smelting_gold_nether_ore_to_gold_ingot.json +837a59541a3a56caec620a1073e778405feb3a61 data/janoeo/advancements/recipes/misc/smelting_iron_basalt_ore_to_iron_ingot.json 83fa806f225156c6dc7a23a4c2aef4ac2fbefd67 data/janoeo/advancements/recipes/misc/smelting_iron_dust_to_iron_ingot.json b9ed0d69a6fcd8a5520edb0f6f199dd5758b76bf data/janoeo/advancements/recipes/misc/smelting_iron_end_ore_to_iron_ingot.json aa4e524b3f31b8d9e3f644d219bf2770009e06eb data/janoeo/advancements/recipes/misc/smelting_iron_gravel_ore_to_iron_ingot.json 70972d952ed9b730d74a8d3dfe36ef3ff81cf7ca data/janoeo/advancements/recipes/misc/smelting_iron_nether_ore_to_iron_ingot.json +224f547aec75aba325edc5bcbda8be1ba090d121 data/janoeo/advancements/recipes/misc/smelting_lapis_basalt_ore_to_lapis_lazuli.json 7b16089482d5cc44bfd075f6d9585137942549ba data/janoeo/advancements/recipes/misc/smelting_lapis_dust_to_lapis_lazuli.json d672e36f3d6248f1e655a43f3c5f5b25ca133c4a data/janoeo/advancements/recipes/misc/smelting_lapis_end_ore_to_lapis_lazuli.json 7c9949b376ec9d10c6887edf1b67ceb0a77a7cc1 data/janoeo/advancements/recipes/misc/smelting_lapis_gravel_ore_to_lapis_lazuli.json 0199994eb1014261ceabf89f9bdbd4d0a7b278d9 data/janoeo/advancements/recipes/misc/smelting_lapis_nether_ore_to_lapis_lazuli.json +32620719e0752f46a8f0c099046f783238f4f073 data/janoeo/advancements/recipes/redstone/blasting_redstone_basalt_ore_to_redstone.json 9855e752b6ae5c572353d6b023cf0b7a0ac196b0 data/janoeo/advancements/recipes/redstone/blasting_redstone_end_ore_to_redstone.json ce34f30cac6aaed27339192b6bb69a73c8ccac91 data/janoeo/advancements/recipes/redstone/blasting_redstone_nether_ore_to_redstone.json +14f43bbe0a5b4b59e50915bc7283b386fbe45ff4 data/janoeo/advancements/recipes/redstone/smelting_redstone_basalt_ore_to_redstone.json ad126bfd547f840bb5add7a55ba4d7eda9332538 data/janoeo/advancements/recipes/redstone/smelting_redstone_end_ore_to_redstone.json 542f151096898c10f3fd25ac73bc259795170f18 data/janoeo/advancements/recipes/redstone/smelting_redstone_nether_ore_to_redstone.json 7d36e376e418cfb12c8194a59d047336e872b9c5 data/janoeo/loot_tables/blocks/aluminium_nether_ore.json @@ -163,28 +199,34 @@ a8b312dd1106d805632b0569c870d66a0b1faf80 data/janoeo/loot_tables/blocks/zinc_ore 4e57eb32319ccd22eeb441a38e23038985e4655a data/janoeo/recipes/blasting_aluminium_nether_ore_to_aluminium_ingot.json 9341a53020f4d6fcc14bd0623d05aa096ebf6dc3 data/janoeo/recipes/blasting_aluminium_ore_to_aluminium_ingot.json a1f690cbfbf94b59d4a22db70b706784c24c9d26 data/janoeo/recipes/blasting_amethyst_ore_to_amethyst.json +9c28e0609e167e9db2c94a4004c75630c4f6f9e2 data/janoeo/recipes/blasting_coal_basalt_ore_to_coal.json 8f44513ff627da28f2268673713448ad6983fcfe data/janoeo/recipes/blasting_coal_dust_to_coal.json 8cb218dcaf75ea41793fd50024b118de9daeea64 data/janoeo/recipes/blasting_coal_end_ore_to_coal.json b066e020105e626ee4ba5e0d7e706d7c23bfaafc data/janoeo/recipes/blasting_coal_gravel_ore_to_coal.json e98cbeb7ececd4b58c87f25a31c874a36221afb1 data/janoeo/recipes/blasting_coal_nether_ore_to_coal.json a38dfcde7bb781e1aeb7f159fa9f6c13027b71a3 data/janoeo/recipes/blasting_copper_nether_ore_to_copper_ingot.json ac1ab3eaff96b8221a4172568a2e1c00e986e80f data/janoeo/recipes/blasting_copper_ore_to_copper_ingot.json +1047ab86ac4427881a57454126de9013adcbb571 data/janoeo/recipes/blasting_diamond_basalt_ore_to_diamond.json 866edb8ad9aee6dee2a4f646475e667eb41edd47 data/janoeo/recipes/blasting_diamond_dust_to_diamond.json 7edb922f7ce7e320e9b5ea2ce6922d60c500ed71 data/janoeo/recipes/blasting_diamond_end_ore_to_diamond.json a0f73758e2878c5b1d03afa8d606f7c510e671cf data/janoeo/recipes/blasting_diamond_gravel_ore_to_diamond.json 043a23980dee5d1a03814dd6c0e1651b664c6e9c data/janoeo/recipes/blasting_diamond_nether_ore_to_diamond.json +ca17af3c37907bb41a7d73f1cf3dab07b9c28ae5 data/janoeo/recipes/blasting_emerald_basalt_ore_to_emerald.json 773b0bbcc07b050d848a22acac794c126a91f58a data/janoeo/recipes/blasting_emerald_dust_to_emerald.json 6dc107f716686a52f8dc1e9683975b803f3eb87c data/janoeo/recipes/blasting_emerald_end_ore_to_emerald.json 78537e0914d6caafbf08d4360e126f30e7f3e4bb data/janoeo/recipes/blasting_emerald_gravel_ore_to_emerald.json 34706f984d4a5936c7c0ace814cf913417f68058 data/janoeo/recipes/blasting_emerald_nether_ore_to_emerald.json +d12ec498ca7366bc55f82cae2c9530b42f4b2b08 data/janoeo/recipes/blasting_gold_basalt_ore_to_gold_ingot.json f2c530dffc6a7ed4ff42f0ddebdef7801c1fd5b9 data/janoeo/recipes/blasting_gold_dust_to_gold_ingot.json fbefe05291148cbe5f83ef0bf518aee760141157 data/janoeo/recipes/blasting_gold_end_ore_to_gold_ingot.json 4cacb14c9ac3dfa3dd7cc2d118bd7779bfc297e4 data/janoeo/recipes/blasting_gold_gravel_ore_to_gold_ingot.json 78455d62c848a6f70236064288881b489f5087f3 data/janoeo/recipes/blasting_gold_nether_ore_to_gold_ingot.json +13ce99abeb9151a0de89f194c7c8e4915dee6cb6 data/janoeo/recipes/blasting_iron_basalt_ore_to_iron_ingot.json 17858fbc93ea8901b5385a48b935c2437a46329a data/janoeo/recipes/blasting_iron_dust_to_iron_ingot.json 100ec162453b6593aeb1990250c30780e79716ba data/janoeo/recipes/blasting_iron_end_ore_to_iron_ingot.json e489d60970c4e05b8c4ff55d677f5defecc94142 data/janoeo/recipes/blasting_iron_gravel_ore_to_iron_ingot.json d4566cbd70cefb81bf3c49e1e437f63e1cb592c4 data/janoeo/recipes/blasting_iron_nether_ore_to_iron_ingot.json +39cc0148b5e4849d2114d7235c9cd6ca3a24fc8a data/janoeo/recipes/blasting_lapis_basalt_ore_to_lapis_lazuli.json 8bb69ea03a8afc01aabdbb11d8b6c289028eac0f data/janoeo/recipes/blasting_lapis_dust_to_lapis_lazuli.json 0b7f564e94f647a2fd56a5b3c0ef288b224875cf data/janoeo/recipes/blasting_lapis_end_ore_to_lapis_lazuli.json b1c273fc83aec97c787ed82dc1da6af371bcb0d0 data/janoeo/recipes/blasting_lapis_gravel_ore_to_lapis_lazuli.json @@ -193,6 +235,7 @@ c1a6a89b44f67e467f36e91603642cafef2fccce data/janoeo/recipes/blasting_lead_nethe 4a4049fe0334a126dbe5072249c567e1af85dad7 data/janoeo/recipes/blasting_lead_ore_to_lead_ingot.json bb6af45abf89912f16571a5b40f782fe2895ae85 data/janoeo/recipes/blasting_osmium_nether_ore_to_osmium_ingot.json df52716941208e0efe3f4c8d4812b72f4cff1728 data/janoeo/recipes/blasting_osmium_ore_to_osmium_ingot.json +d931984a25e81fd5513b33e1df70f181c7fd6c87 data/janoeo/recipes/blasting_redstone_basalt_ore_to_redstone.json d49299996981e6bab3eb0b196adf46ae77fc1a07 data/janoeo/recipes/blasting_redstone_end_ore_to_redstone.json 004340ec5549fcaa6012724537b38a567fadcb6a data/janoeo/recipes/blasting_redstone_nether_ore_to_redstone.json bb3d92b623b7c4d60f52a13d5dedf480c8e93252 data/janoeo/recipes/blasting_ruby_nether_ore_to_ruby.json @@ -206,35 +249,41 @@ bb3d92b623b7c4d60f52a13d5dedf480c8e93252 data/janoeo/recipes/blasting_ruby_nethe 600803c7bae8ed132ebeb1139d3234f63f7845c6 data/janoeo/recipes/blasting_uranium_nether_ore_to_uranium_ingot.json ed60727d785528fac03e967b5269e18e9c20b83e data/janoeo/recipes/blasting_uranium_ore_to_uranium_ingot.json 8f934d205054a4feb8dc7e5fb7e3ad35d85c9904 data/janoeo/recipes/blasting_zinc_ore_to_zinc_ingot.json -c624b0c26ae65c152c2683441b6c527f654598bb data/janoeo/recipes/ruby_block.json -69636a9652f7ba585d85e03f4b393309fbe41dae data/janoeo/recipes/ruby_from_block.json -ef534ad4fd95031b5da26a041408232f538410b6 data/janoeo/recipes/sapphire_block.json -e614a24bc7f96ea76abbbcffcf372e87fdd53da7 data/janoeo/recipes/sapphire_from_block.json +b905894b3fe253bcee8dd861eb13206d670b567a data/janoeo/recipes/ruby_block.json +3b0fc4b93bec5eb0752af1728b75f2f64bb5a03a data/janoeo/recipes/ruby_from_block.json +99c179e8180da784dba15da62e79473f67e61592 data/janoeo/recipes/sapphire_block.json +a53689c1494d44ffae7f14a7f2c002b43ff0a37a data/janoeo/recipes/sapphire_from_block.json a63de7256da04b176b79419b352ef1eda1ddbca3 data/janoeo/recipes/smelting_aluminium_nether_ore_to_aluminium_ingot.json 33ee9b7465118ce16447d2d8e54b08fcf81cfee3 data/janoeo/recipes/smelting_aluminium_ore_to_aluminium_ingot.json f191a96ee02ed5decc4f6065d575bb04a9cd39a0 data/janoeo/recipes/smelting_amethyst_ore_to_amethyst.json +53c4f42918e168de3d8d3b417ea1eda8a7d44427 data/janoeo/recipes/smelting_coal_basalt_ore_to_coal.json 13013175c2b4bc31fecc175e94e7d6b456a9ddd6 data/janoeo/recipes/smelting_coal_dust_to_coal.json b780cb915a265aecdcac08b05a5d7916c287cf7f data/janoeo/recipes/smelting_coal_end_ore_to_coal.json 485de2f8e7a8c374f19bd919d26aee47881e50b6 data/janoeo/recipes/smelting_coal_gravel_ore_to_coal.json 9f4e7088237ec64867cf53ca23ad1df97cac072b data/janoeo/recipes/smelting_coal_nether_ore_to_coal.json 4cf75d1ad991d222bff4b3b1a3614a37a084c868 data/janoeo/recipes/smelting_copper_nether_ore_to_copper_ingot.json 0b5d641bf874880af6f1e2307368ef392cf1ec84 data/janoeo/recipes/smelting_copper_ore_to_copper_ingot.json +0c08876e707060717a22936d0c6a517cc899c17c data/janoeo/recipes/smelting_diamond_basalt_ore_to_diamond.json 57168e48a7dccc5e89e4983ac76e1ca4a11fc303 data/janoeo/recipes/smelting_diamond_dust_to_diamond.json d673a2f66e10d7f6ba72c5c359b4bac023f32172 data/janoeo/recipes/smelting_diamond_end_ore_to_diamond.json b3212db6b8adfd2194bbe1c24cb6b876b9811a08 data/janoeo/recipes/smelting_diamond_gravel_ore_to_diamond.json 4fce0abc806fd21883d0d242bbe305de5ebe355b data/janoeo/recipes/smelting_diamond_nether_ore_to_diamond.json +97dcb32033d7d7aa6d230e27d68c4f922408758b data/janoeo/recipes/smelting_emerald_basalt_ore_to_emerald.json d83b2ffa31fe7ac356eee1c31c6af43984a1a30b data/janoeo/recipes/smelting_emerald_dust_to_emerald.json 89bb3d813d78612c16cefab5dcfe167530d84811 data/janoeo/recipes/smelting_emerald_end_ore_to_emerald.json 74f9e008050b710427ce43616f0d7bc09f0ab5ea data/janoeo/recipes/smelting_emerald_gravel_ore_to_emerald.json 11fe70887e5dbd653f121221f840ee1a35d8690d data/janoeo/recipes/smelting_emerald_nether_ore_to_emerald.json +e96a4148def4586966ceaaed233b14a27d71b60e data/janoeo/recipes/smelting_gold_basalt_ore_to_gold_ingot.json fea8d6c4962017e59423715a211379a80f9c8d26 data/janoeo/recipes/smelting_gold_dust_to_gold_ingot.json c31f6599aa4d0286ca3cff1e1d2ef5b1947e519a data/janoeo/recipes/smelting_gold_end_ore_to_gold_ingot.json 575382f45218c731072c06441bb06483892b4e9d data/janoeo/recipes/smelting_gold_gravel_ore_to_gold_ingot.json e5a500546ec67c08146d07f10bd6953707c5e97c data/janoeo/recipes/smelting_gold_nether_ore_to_gold_ingot.json +89f1d4ec61c2bb6d0a5c816a96039713ea2bbca0 data/janoeo/recipes/smelting_iron_basalt_ore_to_iron_ingot.json d4ee56b9538bd24126d3ac27c711c8228173b2ab data/janoeo/recipes/smelting_iron_dust_to_iron_ingot.json 19ede4d573723b3a18f78adcb3f4b09bbff334cf data/janoeo/recipes/smelting_iron_end_ore_to_iron_ingot.json 801c0b6020ddb2c9a31643d6ee8dff61b5bc4966 data/janoeo/recipes/smelting_iron_gravel_ore_to_iron_ingot.json 94606f41db80c4f2482222a3e9307bc6ef396a88 data/janoeo/recipes/smelting_iron_nether_ore_to_iron_ingot.json +2f351334ecbe5cc7dcccd7d89a2f00c7d0c25ab8 data/janoeo/recipes/smelting_lapis_basalt_ore_to_lapis_lazuli.json 614fd4d3f18e9fc42d18ae24bdbba60e3317d410 data/janoeo/recipes/smelting_lapis_dust_to_lapis_lazuli.json e8ea5298f57742b048c1f7b4a7f8151c87ae0381 data/janoeo/recipes/smelting_lapis_end_ore_to_lapis_lazuli.json dc6d70307b96653620d327fe2018ae458e416677 data/janoeo/recipes/smelting_lapis_gravel_ore_to_lapis_lazuli.json @@ -243,6 +292,7 @@ e6cd4fe8b6eb6c7fa26db6c455c558a9907095d0 data/janoeo/recipes/smelting_lapis_neth 39dcdaa5b99f1f9ce7a5e4c83ef015176a00de0e data/janoeo/recipes/smelting_lead_ore_to_lead_ingot.json 718ac7594e4cc46e3b6aa76cd5217920c2aa3cd8 data/janoeo/recipes/smelting_osmium_nether_ore_to_osmium_ingot.json 9a3a95dd7718a14dfe6b26b442f53ba39bac1943 data/janoeo/recipes/smelting_osmium_ore_to_osmium_ingot.json +5abdbe8d069c6b3ba3d29e3c9e1e746e17a08b97 data/janoeo/recipes/smelting_redstone_basalt_ore_to_redstone.json c9ee0a7368dd8d7534d6a4ef1b7c8009a5dbf797 data/janoeo/recipes/smelting_redstone_end_ore_to_redstone.json 49f7d2035da1eed56d75533fdb1191065fe468ce data/janoeo/recipes/smelting_redstone_nether_ore_to_redstone.json 30994589b4f3f8b9f232bdb89f4600a74a8c81c9 data/janoeo/recipes/smelting_ruby_nether_ore_to_ruby.json diff --git a/src/generated/resources/data/create/recipes/crushing/aluminium_dust.json b/src/generated/resources/data/create/recipes/crushing/aluminium_dust.json new file mode 100644 index 0000000..c7748b4 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/aluminium_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/aluminium" + } + ], + "results": [ + { + "item": "janoeo:aluminium_dust" + } + ], + "processingTime": 300, + "conditions": [ + { + "value": { + "tag": "forge:ingots/aluminium", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/coal.json b/src/generated/resources/data/create/recipes/crushing/coal.json new file mode 100644 index 0000000..f25b189 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/coal.json @@ -0,0 +1,14 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:coal" + } + ], + "results": [ + { + "item": "janoeo:coal_dust" + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/coal_basalt_ore.json b/src/generated/resources/data/create/recipes/crushing/coal_basalt_ore.json new file mode 100644 index 0000000..f385c55 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/coal_basalt_ore.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "janoeo:coal_basalt_ore" + } + ], + "results": [ + { + "item": "minecraft:coal", + "count": 2 + }, + { + "item": "minecraft:coal", + "count": 2, + "chance": 0.5 + }, + { + "item": "minecraft:basalt", + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/coal_end_ore.json b/src/generated/resources/data/create/recipes/crushing/coal_end_ore.json new file mode 100644 index 0000000..f6849ce --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/coal_end_ore.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "janoeo:coal_end_ore" + } + ], + "results": [ + { + "item": "minecraft:coal", + "count": 2 + }, + { + "item": "minecraft:coal", + "count": 2, + "chance": 0.5 + }, + { + "item": "minecraft:end_stone", + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/coal_nether_ore.json b/src/generated/resources/data/create/recipes/crushing/coal_nether_ore.json new file mode 100644 index 0000000..a1271b7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/coal_nether_ore.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "janoeo:coal_nether_ore" + } + ], + "results": [ + { + "item": "minecraft:coal", + "count": 2 + }, + { + "item": "minecraft:coal", + "count": 2, + "chance": 0.5 + }, + { + "item": "minecraft:netherrack", + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/copper_dust.json b/src/generated/resources/data/create/recipes/crushing/copper_dust.json new file mode 100644 index 0000000..d559242 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/copper_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/copper" + } + ], + "results": [ + { + "item": "janoeo:copper_dust" + } + ], + "processingTime": 350, + "conditions": [ + { + "value": { + "tag": "forge:ingots/copper", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/diamond.json b/src/generated/resources/data/create/recipes/crushing/diamond.json new file mode 100644 index 0000000..452068c --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/diamond.json @@ -0,0 +1,14 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:diamond" + } + ], + "results": [ + { + "item": "janoeo:diamond_dust" + } + ], + "processingTime": 500 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/emerald.json b/src/generated/resources/data/create/recipes/crushing/emerald.json new file mode 100644 index 0000000..67c2102 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/emerald.json @@ -0,0 +1,14 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:emerald" + } + ], + "results": [ + { + "item": "janoeo:emerald_dust" + } + ], + "processingTime": 500 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/gold_ingot.json b/src/generated/resources/data/create/recipes/crushing/gold_ingot.json new file mode 100644 index 0000000..8a5cb03 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/gold_ingot.json @@ -0,0 +1,14 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:gold_ingot" + } + ], + "results": [ + { + "item": "janoeo:gold_dust" + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/iron_ingot.json b/src/generated/resources/data/create/recipes/crushing/iron_ingot.json new file mode 100644 index 0000000..9331c07 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/iron_ingot.json @@ -0,0 +1,14 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:iron_ingot" + } + ], + "results": [ + { + "item": "janoeo:iron_dust" + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/lapis_lazuli.json b/src/generated/resources/data/create/recipes/crushing/lapis_lazuli.json new file mode 100644 index 0000000..3772b18 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/lapis_lazuli.json @@ -0,0 +1,14 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:lapis_lazuli" + } + ], + "results": [ + { + "item": "janoeo:lapis_dust" + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/lead_dust.json b/src/generated/resources/data/create/recipes/crushing/lead_dust.json new file mode 100644 index 0000000..32d5dc8 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/lead_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/lead" + } + ], + "results": [ + { + "item": "janoeo:lead_dust" + } + ], + "processingTime": 250, + "conditions": [ + { + "value": { + "tag": "forge:ingots/lead", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/nickel_dust.json b/src/generated/resources/data/create/recipes/crushing/nickel_dust.json new file mode 100644 index 0000000..09c090a --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/nickel_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/nickel" + } + ], + "results": [ + { + "item": "janoeo:nickel_dust" + } + ], + "processingTime": 350, + "conditions": [ + { + "value": { + "tag": "forge:ingots/nickel", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/platinum_dust.json b/src/generated/resources/data/create/recipes/crushing/platinum_dust.json new file mode 100644 index 0000000..5ad1771 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/platinum_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/platinum" + } + ], + "results": [ + { + "item": "janoeo:platinum_dust" + } + ], + "processingTime": 350, + "conditions": [ + { + "value": { + "tag": "forge:ingots/platinum", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/redstone_basalt_ore.json b/src/generated/resources/data/create/recipes/crushing/redstone_basalt_ore.json new file mode 100644 index 0000000..6618713 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/redstone_basalt_ore.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "janoeo:redstone_basalt_ore" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 8 + }, + { + "item": "minecraft:redstone", + "count": 6, + "chance": 0.25 + }, + { + "item": "minecraft:basalt", + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/redstone_end_ore.json b/src/generated/resources/data/create/recipes/crushing/redstone_end_ore.json new file mode 100644 index 0000000..b84fb80 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/redstone_end_ore.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "janoeo:redstone_end_ore" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 8 + }, + { + "item": "minecraft:redstone", + "count": 6, + "chance": 0.25 + }, + { + "item": "minecraft:end_stone", + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/redstone_nether_ore.json b/src/generated/resources/data/create/recipes/crushing/redstone_nether_ore.json new file mode 100644 index 0000000..afeeec2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/redstone_nether_ore.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "janoeo:redstone_nether_ore" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 8 + }, + { + "item": "minecraft:redstone", + "count": 6, + "chance": 0.25 + }, + { + "item": "minecraft:netherrack", + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/ruby_dust.json b/src/generated/resources/data/create/recipes/crushing/ruby_dust.json new file mode 100644 index 0000000..dde88d9 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/ruby_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:gems/ruby" + } + ], + "results": [ + { + "item": "janoeo:ruby_dust" + } + ], + "processingTime": 500, + "conditions": [ + { + "value": { + "tag": "forge:gems/ruby", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/sapphire_dust.json b/src/generated/resources/data/create/recipes/crushing/sapphire_dust.json new file mode 100644 index 0000000..9b7bb7d --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/sapphire_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:gems/sapphire" + } + ], + "results": [ + { + "item": "janoeo:sapphire_dust" + } + ], + "processingTime": 500, + "conditions": [ + { + "value": { + "tag": "forge:gems/sapphire", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/silver_dust.json b/src/generated/resources/data/create/recipes/crushing/silver_dust.json new file mode 100644 index 0000000..711758d --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/silver_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/silver" + } + ], + "results": [ + { + "item": "janoeo:silver_dust" + } + ], + "processingTime": 400, + "conditions": [ + { + "value": { + "tag": "forge:ingots/silver", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/tin_dust.json b/src/generated/resources/data/create/recipes/crushing/tin_dust.json new file mode 100644 index 0000000..8cc5ada --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/tin_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/tin" + } + ], + "results": [ + { + "item": "janoeo:tin_dust" + } + ], + "processingTime": 300, + "conditions": [ + { + "value": { + "tag": "forge:ingots/tin", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/uranium_dust.json b/src/generated/resources/data/create/recipes/crushing/uranium_dust.json new file mode 100644 index 0000000..7a9e363 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/uranium_dust.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "forge:ingots/uranium" + } + ], + "results": [ + { + "item": "janoeo:uranium_dust" + } + ], + "processingTime": 400, + "conditions": [ + { + "value": { + "tag": "forge:ingots/uranium", + "type": "forge:tag_empty" + }, + "type": "forge:not" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_block.json b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_block.json index 0292eef..7332130 100644 --- a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_block.json +++ b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_block.json @@ -6,7 +6,7 @@ ] }, "criteria": { - "has_sapphire": { + "has_ruby": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_sapphire", + "has_ruby", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_from_block.json b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_from_block.json index aec8ba2..f0a31cd 100644 --- a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_from_block.json +++ b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/ruby_from_block.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "janoeo:sapphire_block" + "item": "janoeo:ruby_block" } ] } diff --git a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_block.json b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_block.json index 2d959b3..69cb418 100644 --- a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_block.json +++ b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_block.json @@ -6,7 +6,7 @@ ] }, "criteria": { - "has_ruby": { + "has_sapphire": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_ruby", + "has_sapphire", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_from_block.json b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_from_block.json index 30396cf..4f272f2 100644 --- a/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_from_block.json +++ b/src/generated/resources/data/janoeo/advancements/recipes/janoeo.ore.item/sapphire_from_block.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "janoeo:ruby_block" + "item": "janoeo:sapphire_block" } ] } diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_coal_basalt_ore_to_coal.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_coal_basalt_ore_to_coal.json new file mode 100644 index 0000000..3391ad1 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_coal_basalt_ore_to_coal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_coal_basalt_ore_to_coal" + ] + }, + "criteria": { + "has_basalt_coal_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:coal_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_coal_basalt_ore_to_coal" + } + } + }, + "requirements": [ + [ + "has_basalt_coal_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_diamond_basalt_ore_to_diamond.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_diamond_basalt_ore_to_diamond.json new file mode 100644 index 0000000..815fd62 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_diamond_basalt_ore_to_diamond.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_diamond_basalt_ore_to_diamond" + ] + }, + "criteria": { + "has_basalt_diamond_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:diamond_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_diamond_basalt_ore_to_diamond" + } + } + }, + "requirements": [ + [ + "has_basalt_diamond_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_emerald_basalt_ore_to_emerald.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_emerald_basalt_ore_to_emerald.json new file mode 100644 index 0000000..6604675 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_emerald_basalt_ore_to_emerald.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_emerald_basalt_ore_to_emerald" + ] + }, + "criteria": { + "has_basalt_emerald_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:emerald_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_emerald_basalt_ore_to_emerald" + } + } + }, + "requirements": [ + [ + "has_basalt_emerald_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_gold_basalt_ore_to_gold_ingot.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_gold_basalt_ore_to_gold_ingot.json new file mode 100644 index 0000000..5bfc017 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_gold_basalt_ore_to_gold_ingot.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_gold_basalt_ore_to_gold_ingot" + ] + }, + "criteria": { + "has_basalt_gold_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:gold_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_gold_basalt_ore_to_gold_ingot" + } + } + }, + "requirements": [ + [ + "has_basalt_gold_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_iron_basalt_ore_to_iron_ingot.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_iron_basalt_ore_to_iron_ingot.json new file mode 100644 index 0000000..c4f15d8 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_iron_basalt_ore_to_iron_ingot.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_iron_basalt_ore_to_iron_ingot" + ] + }, + "criteria": { + "has_basalt_iron_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:iron_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_iron_basalt_ore_to_iron_ingot" + } + } + }, + "requirements": [ + [ + "has_basalt_iron_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_lapis_basalt_ore_to_lapis_lazuli.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_lapis_basalt_ore_to_lapis_lazuli.json new file mode 100644 index 0000000..acdda78 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/blasting_lapis_basalt_ore_to_lapis_lazuli.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_lapis_basalt_ore_to_lapis_lazuli" + ] + }, + "criteria": { + "has_basalt_lapis_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:lapis_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_lapis_basalt_ore_to_lapis_lazuli" + } + } + }, + "requirements": [ + [ + "has_basalt_lapis_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_coal_basalt_ore_to_coal.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_coal_basalt_ore_to_coal.json new file mode 100644 index 0000000..2ff0d00 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_coal_basalt_ore_to_coal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_coal_basalt_ore_to_coal" + ] + }, + "criteria": { + "has_basalt_coal_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:coal_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_coal_basalt_ore_to_coal" + } + } + }, + "requirements": [ + [ + "has_basalt_coal_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_diamond_basalt_ore_to_diamond.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_diamond_basalt_ore_to_diamond.json new file mode 100644 index 0000000..45f3bea --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_diamond_basalt_ore_to_diamond.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_diamond_basalt_ore_to_diamond" + ] + }, + "criteria": { + "has_basalt_diamond_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:diamond_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_diamond_basalt_ore_to_diamond" + } + } + }, + "requirements": [ + [ + "has_basalt_diamond_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_emerald_basalt_ore_to_emerald.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_emerald_basalt_ore_to_emerald.json new file mode 100644 index 0000000..4e09d22 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_emerald_basalt_ore_to_emerald.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_emerald_basalt_ore_to_emerald" + ] + }, + "criteria": { + "has_basalt_emerald_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:emerald_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_emerald_basalt_ore_to_emerald" + } + } + }, + "requirements": [ + [ + "has_basalt_emerald_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_gold_basalt_ore_to_gold_ingot.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_gold_basalt_ore_to_gold_ingot.json new file mode 100644 index 0000000..89f1bf0 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_gold_basalt_ore_to_gold_ingot.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_gold_basalt_ore_to_gold_ingot" + ] + }, + "criteria": { + "has_basalt_gold_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:gold_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_gold_basalt_ore_to_gold_ingot" + } + } + }, + "requirements": [ + [ + "has_basalt_gold_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_iron_basalt_ore_to_iron_ingot.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_iron_basalt_ore_to_iron_ingot.json new file mode 100644 index 0000000..3530d8f --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_iron_basalt_ore_to_iron_ingot.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_iron_basalt_ore_to_iron_ingot" + ] + }, + "criteria": { + "has_basalt_iron_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:iron_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_iron_basalt_ore_to_iron_ingot" + } + } + }, + "requirements": [ + [ + "has_basalt_iron_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_lapis_basalt_ore_to_lapis_lazuli.json b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_lapis_basalt_ore_to_lapis_lazuli.json new file mode 100644 index 0000000..4b966e4 --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/misc/smelting_lapis_basalt_ore_to_lapis_lazuli.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_lapis_basalt_ore_to_lapis_lazuli" + ] + }, + "criteria": { + "has_basalt_lapis_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:lapis_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_lapis_basalt_ore_to_lapis_lazuli" + } + } + }, + "requirements": [ + [ + "has_basalt_lapis_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/redstone/blasting_redstone_basalt_ore_to_redstone.json b/src/generated/resources/data/janoeo/advancements/recipes/redstone/blasting_redstone_basalt_ore_to_redstone.json new file mode 100644 index 0000000..31a002c --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/redstone/blasting_redstone_basalt_ore_to_redstone.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:blasting_redstone_basalt_ore_to_redstone" + ] + }, + "criteria": { + "has_basalt_redstone_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:redstone_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:blasting_redstone_basalt_ore_to_redstone" + } + } + }, + "requirements": [ + [ + "has_basalt_redstone_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/advancements/recipes/redstone/smelting_redstone_basalt_ore_to_redstone.json b/src/generated/resources/data/janoeo/advancements/recipes/redstone/smelting_redstone_basalt_ore_to_redstone.json new file mode 100644 index 0000000..8ba8d7c --- /dev/null +++ b/src/generated/resources/data/janoeo/advancements/recipes/redstone/smelting_redstone_basalt_ore_to_redstone.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo:smelting_redstone_basalt_ore_to_redstone" + ] + }, + "criteria": { + "has_basalt_redstone_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "janoeo:redstone_basalt_ore" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo:smelting_redstone_basalt_ore_to_redstone" + } + } + }, + "requirements": [ + [ + "has_basalt_redstone_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_coal_basalt_ore_to_coal.json b/src/generated/resources/data/janoeo/recipes/blasting_coal_basalt_ore_to_coal.json new file mode 100644 index 0000000..8128c79 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_coal_basalt_ore_to_coal.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:coal_basalt_ore" + }, + "result": "minecraft:coal", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_diamond_basalt_ore_to_diamond.json b/src/generated/resources/data/janoeo/recipes/blasting_diamond_basalt_ore_to_diamond.json new file mode 100644 index 0000000..c51d8a6 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_diamond_basalt_ore_to_diamond.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:diamond_basalt_ore" + }, + "result": "minecraft:diamond", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_emerald_basalt_ore_to_emerald.json b/src/generated/resources/data/janoeo/recipes/blasting_emerald_basalt_ore_to_emerald.json new file mode 100644 index 0000000..1610f95 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_emerald_basalt_ore_to_emerald.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:emerald_basalt_ore" + }, + "result": "minecraft:emerald", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_gold_basalt_ore_to_gold_ingot.json b/src/generated/resources/data/janoeo/recipes/blasting_gold_basalt_ore_to_gold_ingot.json new file mode 100644 index 0000000..14f529c --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_gold_basalt_ore_to_gold_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:gold_basalt_ore" + }, + "result": "minecraft:gold_ingot", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_iron_basalt_ore_to_iron_ingot.json b/src/generated/resources/data/janoeo/recipes/blasting_iron_basalt_ore_to_iron_ingot.json new file mode 100644 index 0000000..e43565e --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_iron_basalt_ore_to_iron_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:iron_basalt_ore" + }, + "result": "minecraft:iron_ingot", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_lapis_basalt_ore_to_lapis_lazuli.json b/src/generated/resources/data/janoeo/recipes/blasting_lapis_basalt_ore_to_lapis_lazuli.json new file mode 100644 index 0000000..50187dc --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_lapis_basalt_ore_to_lapis_lazuli.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:lapis_basalt_ore" + }, + "result": "minecraft:lapis_lazuli", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/blasting_redstone_basalt_ore_to_redstone.json b/src/generated/resources/data/janoeo/recipes/blasting_redstone_basalt_ore_to_redstone.json new file mode 100644 index 0000000..021a5aa --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/blasting_redstone_basalt_ore_to_redstone.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "janoeo:redstone_basalt_ore" + }, + "result": "minecraft:redstone", + "experience": 0.1, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_coal_basalt_ore_to_coal.json b/src/generated/resources/data/janoeo/recipes/smelting_coal_basalt_ore_to_coal.json new file mode 100644 index 0000000..778a6c9 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_coal_basalt_ore_to_coal.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:coal_basalt_ore" + }, + "result": "minecraft:coal", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_diamond_basalt_ore_to_diamond.json b/src/generated/resources/data/janoeo/recipes/smelting_diamond_basalt_ore_to_diamond.json new file mode 100644 index 0000000..8674375 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_diamond_basalt_ore_to_diamond.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:diamond_basalt_ore" + }, + "result": "minecraft:diamond", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_emerald_basalt_ore_to_emerald.json b/src/generated/resources/data/janoeo/recipes/smelting_emerald_basalt_ore_to_emerald.json new file mode 100644 index 0000000..475db75 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_emerald_basalt_ore_to_emerald.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:emerald_basalt_ore" + }, + "result": "minecraft:emerald", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_gold_basalt_ore_to_gold_ingot.json b/src/generated/resources/data/janoeo/recipes/smelting_gold_basalt_ore_to_gold_ingot.json new file mode 100644 index 0000000..9b25223 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_gold_basalt_ore_to_gold_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:gold_basalt_ore" + }, + "result": "minecraft:gold_ingot", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_iron_basalt_ore_to_iron_ingot.json b/src/generated/resources/data/janoeo/recipes/smelting_iron_basalt_ore_to_iron_ingot.json new file mode 100644 index 0000000..d90b642 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_iron_basalt_ore_to_iron_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:iron_basalt_ore" + }, + "result": "minecraft:iron_ingot", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_lapis_basalt_ore_to_lapis_lazuli.json b/src/generated/resources/data/janoeo/recipes/smelting_lapis_basalt_ore_to_lapis_lazuli.json new file mode 100644 index 0000000..e4cf2e8 --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_lapis_basalt_ore_to_lapis_lazuli.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:lapis_basalt_ore" + }, + "result": "minecraft:lapis_lazuli", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo/recipes/smelting_redstone_basalt_ore_to_redstone.json b/src/generated/resources/data/janoeo/recipes/smelting_redstone_basalt_ore_to_redstone.json new file mode 100644 index 0000000..520be0f --- /dev/null +++ b/src/generated/resources/data/janoeo/recipes/smelting_redstone_basalt_ore_to_redstone.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "janoeo:redstone_basalt_ore" + }, + "result": "minecraft:redstone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/java/fr/alasdiablo/janoeo/Janoeo.java b/src/main/java/fr/alasdiablo/janoeo/Janoeo.java index 18ace10..2dd07d6 100644 --- a/src/main/java/fr/alasdiablo/janoeo/Janoeo.java +++ b/src/main/java/fr/alasdiablo/janoeo/Janoeo.java @@ -1,18 +1,16 @@ package fr.alasdiablo.janoeo; -import fr.alasdiablo.diolib.util.DateRange; import fr.alasdiablo.janoeo.config.*; import fr.alasdiablo.janoeo.util.Registries; import fr.alasdiablo.janoeo.world.OreGenUtils; import fr.alasdiablo.janoeo.world.gen.feature.OresFeatures; -import net.minecraftforge.common.Tags; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.server.FMLServerStartedEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLPaths; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,7 +20,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Calendar; /** * Janoeo Main class @@ -31,11 +28,17 @@ public class Janoeo { public static final Logger logger = LogManager.getLogger(Registries.MODID); + public static class Compact { + public static boolean CREATE = false; + } /** * Jannoeo default constructor */ public Janoeo() { + FMLLoader.getLoadingModList().getMods().forEach(modInfo -> { + if (modInfo.getModId().equals("create")) Compact.CREATE = true; + }); this.initConfig(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::initFeatures); diff --git a/src/main/java/fr/alasdiablo/janoeo/compat/create/data/CrushingRecipeCompat.java b/src/main/java/fr/alasdiablo/janoeo/compat/create/data/CrushingRecipeCompat.java new file mode 100644 index 0000000..b703e7c --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/compat/create/data/CrushingRecipeCompat.java @@ -0,0 +1,81 @@ +package fr.alasdiablo.janoeo.compat.create.data; + +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; +import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen; +import fr.alasdiablo.janoeo.init.*; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.data.DataGenerator; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.util.IItemProvider; +import net.minecraftforge.common.crafting.conditions.NotCondition; +import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; + +import java.util.function.Supplier; + +public class CrushingRecipeCompat extends ProcessingRecipeGen { + + private class Provider { + + private void coalOre(Supplier ingredient, final Block extra) { + CrushingRecipeCompat.this.create(ingredient, builder -> builder.duration(300).output(Items.COAL, 2).output(0.5F, Items.COAL, 2).output(0.125F, extra)); + } + + private void redstoneOre(Supplier ingredient, final Block extra) { + CrushingRecipeCompat.this.create(ingredient, (builder) -> builder.duration(300).output(Items.REDSTONE, 8).output(0.25F, Items.REDSTONE, 6).output(0.125F, extra)); + } + + private void dustFromIngotWithTag(String name, Item dust, int duration) { + CrushingRecipeCompat.this.create(name + "_dust", (builder) -> builder.duration(duration).withCondition(new NotCondition(new TagEmptyCondition("forge", "ingots/" + name))).require(AllTags.forgeItemTag("ingots/" + name)).output(dust)); + } + + private void dustFromGemsWithTag(String name, Item dust, int duration) { + CrushingRecipeCompat.this.create(name + "_dust", (builder) -> builder.duration(duration).withCondition(new NotCondition(new TagEmptyCondition("forge", "gems/" + name))).require(AllTags.forgeItemTag("gems/" + name)).output(dust)); + } + } + + private final Provider provider; + + public CrushingRecipeCompat(DataGenerator generator) { + super(generator); + this.provider = new Provider(); + this.ore(); + this.dust(); + } + + private void ore() { + this.provider.coalOre(() -> NetherOresBlocks.COAL_NETHER_ORE, Blocks.NETHERRACK); + this.provider.coalOre(() -> EndOresBlocks.COAL_END_ORE, Blocks.END_STONE); + this.provider.coalOre(() -> BasaltOresBlocks.COAL_BASALT_ORE, Blocks.BASALT); + + this.provider.redstoneOre(() -> NetherOresBlocks.REDSTONE_NETHER_ORE, Blocks.NETHERRACK); + this.provider.redstoneOre(() -> EndOresBlocks.REDSTONE_END_ORE, Blocks.END_STONE); + this.provider.redstoneOre(() -> BasaltOresBlocks.REDSTONE_BASALT_ORE, Blocks.BASALT); + } + + private void dust() { + this.create(() -> Items.DIAMOND, builder -> builder.duration(500).output(AllItems.Dusts.DIAMOND)); + this.create(() -> Items.EMERALD, builder -> builder.duration(500).output(AllItems.Dusts.EMERALD)); + this.create(() -> Items.IRON_INGOT, builder -> builder.duration(400).output(AllItems.Dusts.IRON)); + this.create(() -> Items.GOLD_INGOT, builder -> builder.duration(300).output(AllItems.Dusts.GOLD)); + this.create(() -> Items.LAPIS_LAZULI, builder -> builder.duration(300).output(AllItems.Dusts.LAPIS)); + this.create(() -> Items.COAL, builder -> builder.duration(300).output(AllItems.Dusts.COAL)); + this.provider.dustFromIngotWithTag("aluminium", AllItems.Dusts.ALUMINIUM, 300); + this.provider.dustFromIngotWithTag("copper", AllItems.Dusts.COPPER, 350); + this.provider.dustFromIngotWithTag("lead", AllItems.Dusts.LEAD, 250); + this.provider.dustFromIngotWithTag("nickel", AllItems.Dusts.NICKEL, 350); + this.provider.dustFromIngotWithTag("platinum", AllItems.Dusts.PLATINUM, 350); + this.provider.dustFromIngotWithTag("silver", AllItems.Dusts.SILVER, 400); + this.provider.dustFromIngotWithTag("tin", AllItems.Dusts.TIN, 300); + this.provider.dustFromIngotWithTag("uranium", AllItems.Dusts.URANIUM, 400); + this.provider.dustFromGemsWithTag("ruby", AllItems.Dusts.RUBY, 500); + this.provider.dustFromGemsWithTag("sapphire", AllItems.Dusts.SAPPHIRE, 500); + } + + @Override + protected AllRecipeTypes getRecipeType() { + return AllRecipeTypes.CRUSHING; + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/data/CraftRecipes.java b/src/main/java/fr/alasdiablo/janoeo/data/CraftRecipes.java index df31a76..ffef1f7 100644 --- a/src/main/java/fr/alasdiablo/janoeo/data/CraftRecipes.java +++ b/src/main/java/fr/alasdiablo/janoeo/data/CraftRecipes.java @@ -28,18 +28,18 @@ public CraftRecipes(DataGenerator generatorIn) { @SuppressWarnings("NullableProblems") @Override protected void registerRecipes(Consumer consumer) { - ShapelessRecipeBuilder.shapelessRecipe(GemsItems.RUBY, 9) + ShapelessRecipeBuilder.shapelessRecipe(AllItems.Gems.RUBY, 9) .addIngredient(ModBlocks.RUBY_BLOCK) .addCriterion("has_ruby_block", hasItem(ModBlocks.RUBY_BLOCK)) .build(consumer, new ResourceLocation(Registries.MODID, "ruby_from_block")); - ShapelessRecipeBuilder.shapelessRecipe(GemsItems.SAPPHIRE, 9) + ShapelessRecipeBuilder.shapelessRecipe(AllItems.Gems.SAPPHIRE, 9) .addIngredient(ModBlocks.SAPPHIRE_BLOCK) .addCriterion("has_sapphire_block", hasItem(ModBlocks.SAPPHIRE_BLOCK)) .build(consumer, new ResourceLocation(Registries.MODID, "sapphire_from_block")); ShapedRecipeBuilder.shapedRecipe(ModBlocks.RUBY_BLOCK) - .key('R', GemsItems.RUBY) + .key('R', AllItems.Gems.RUBY) .patternLine("RRR") .patternLine("RRR") .patternLine("RRR") @@ -47,7 +47,7 @@ protected void registerRecipes(Consumer consumer) { .build(consumer); ShapedRecipeBuilder.shapedRecipe(ModBlocks.SAPPHIRE_BLOCK) - .key('S', GemsItems.SAPPHIRE) + .key('S', AllItems.Gems.SAPPHIRE) .patternLine("SSS") .patternLine("SSS") .patternLine("SSS") diff --git a/src/main/java/fr/alasdiablo/janoeo/util/DataGenerators.java b/src/main/java/fr/alasdiablo/janoeo/data/DataGenerators.java similarity index 64% rename from src/main/java/fr/alasdiablo/janoeo/util/DataGenerators.java rename to src/main/java/fr/alasdiablo/janoeo/data/DataGenerators.java index 46727b9..826a6be 100644 --- a/src/main/java/fr/alasdiablo/janoeo/util/DataGenerators.java +++ b/src/main/java/fr/alasdiablo/janoeo/data/DataGenerators.java @@ -1,17 +1,23 @@ -package fr.alasdiablo.janoeo.util; +package fr.alasdiablo.janoeo.data; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import fr.alasdiablo.diolib.data.DioLootTableProvider; +import fr.alasdiablo.janoeo.Janoeo; import fr.alasdiablo.janoeo.data.ModBlockLootTable; import fr.alasdiablo.janoeo.data.CraftRecipes; import fr.alasdiablo.janoeo.data.SmeltingBlastingRecipes; +import fr.alasdiablo.janoeo.compat.create.data.CrushingRecipeCompat; import net.minecraft.data.DataGenerator; +import net.minecraft.data.DirectoryCache; +import net.minecraft.data.IDataProvider; import net.minecraft.loot.LootParameterSets; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; +import java.io.IOException; + /** * Data generator event handler */ @@ -21,6 +27,7 @@ public class DataGenerators { /** * Handle the data event + * * @param event Instance of the event */ @SubscribeEvent @@ -29,5 +36,17 @@ public static void gatherDate(GatherDataEvent event) { generator.addProvider(new CraftRecipes(generator)); generator.addProvider(new SmeltingBlastingRecipes(generator)); generator.addProvider(new DioLootTableProvider(generator, ImmutableList.of(Pair.of(ModBlockLootTable::new, LootParameterSets.BLOCK)), LootParameterSets.BLOCK, "Janoeo")); + + if (Janoeo.Compact.CREATE) { + generator.addProvider(new IDataProvider() { + @Override public void act(DirectoryCache cache) throws IOException { + new CrushingRecipeCompat(generator).act(cache); + } + + @Override public String getName() { + return "Janoeo - Create Compatibility Patch"; + } + }); + } } } diff --git a/src/main/java/fr/alasdiablo/janoeo/data/SmeltingBlastingRecipes.java b/src/main/java/fr/alasdiablo/janoeo/data/SmeltingBlastingRecipes.java index f851229..dce6c41 100644 --- a/src/main/java/fr/alasdiablo/janoeo/data/SmeltingBlastingRecipes.java +++ b/src/main/java/fr/alasdiablo/janoeo/data/SmeltingBlastingRecipes.java @@ -41,17 +41,17 @@ protected void registerRecipes(Consumer consumer) { this.registerSmeltingBlasting(EndOresBlocks.IRON_END_ORE, Items.IRON_INGOT, "has_end_iron_ore", consumer); this.registerSmeltingBlasting(EndOresBlocks.LAPIS_END_ORE, Items.LAPIS_LAZULI, "has_end_lapis_ore", consumer); this.registerSmeltingBlasting(EndOresBlocks.REDSTONE_END_ORE, Items.REDSTONE, "has_end_redstone_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.COPPER_ORE, IngotsItems.COPPER_INGOT,"has_copper_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.TIN_ORE, IngotsItems.TIN_INGOT, "has_tin_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.ALUMINIUM_ORE, IngotsItems.ALUMINIUM_INGOT, "has_aluminium_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.LEAD_ORE, IngotsItems.LEAD_INGOT, "has_lead_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.SILVER_ORE, IngotsItems.SILVER_INGOT, "has_silver_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.URANIUM_ORE, IngotsItems.URANIUM_INGOT, "has_uranium_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.OSMIUM_ORE, IngotsItems.OSMIUM_INGOT, "has_osmium_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.RUBY_ORE, GemsItems.RUBY, "has_ruby_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.SAPPHIRE_ORE, GemsItems.SAPPHIRE, "has_sapphire_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.AMETHYST_ORE, GemsItems.AMETHYST, "has_amethyst_ore", consumer); - this.registerSmeltingBlasting(OverworldOresBlocks.ZINC_ORE, IngotsItems.ZINC_INGOT, "has_zinc_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.COPPER_ORE, AllItems.Ingots.COPPER,"has_copper_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.TIN_ORE, AllItems.Ingots.TIN, "has_tin_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.ALUMINIUM_ORE, AllItems.Ingots.ALUMINIUM, "has_aluminium_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.LEAD_ORE, AllItems.Ingots.LEAD, "has_lead_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.SILVER_ORE, AllItems.Ingots.SILVER, "has_silver_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.URANIUM_ORE, AllItems.Ingots.URANIUM, "has_uranium_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.OSMIUM_ORE, AllItems.Ingots.OSMIUM, "has_osmium_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.RUBY_ORE, AllItems.Gems.RUBY, "has_ruby_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.SAPPHIRE_ORE, AllItems.Gems.SAPPHIRE, "has_sapphire_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.AMETHYST_ORE, AllItems.Gems.AMETHYST, "has_amethyst_ore", consumer); + this.registerSmeltingBlasting(OverworldOresBlocks.ZINC_ORE, AllItems.Ingots.ZINC, "has_zinc_ore", consumer); this.registerSmeltingBlasting(NetherOresBlocks.COAL_NETHER_ORE, Items.COAL, "has_nether_coal_ore", consumer); this.registerSmeltingBlasting(NetherOresBlocks.DIAMOND_NETHER_ORE, Items.DIAMOND, "has_nether_diamond_ore", consumer); this.registerSmeltingBlasting(NetherOresBlocks.EMERALD_NETHER_ORE, Items.EMERALD, "has_nether_emerald_ore", consumer); @@ -59,15 +59,22 @@ protected void registerRecipes(Consumer consumer) { this.registerSmeltingBlasting(NetherOresBlocks.IRON_NETHER_ORE, Items.IRON_INGOT, "has_nether_iron_ore", consumer); this.registerSmeltingBlasting(NetherOresBlocks.LAPIS_NETHER_ORE, Items.LAPIS_LAZULI, "has_nether_lapis_ore", consumer); this.registerSmeltingBlasting(NetherOresBlocks.REDSTONE_NETHER_ORE, Items.REDSTONE, "has_nether_redstone_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.ALUMINIUM_NETHER_ORE, IngotsItems.ALUMINIUM_INGOT, "has_nether_aluminium_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.LEAD_NETHER_ORE, IngotsItems.LEAD_INGOT, "has_nether_lead_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.RUBY_NETHER_ORE, GemsItems.RUBY, "has_nether_ruby_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.SAPPHIRE_NETHER_ORE, GemsItems.SAPPHIRE, "has_nether_sapphire_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.SILVER_NETHER_ORE, IngotsItems.SILVER_INGOT, "has_nether_silver_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.URANIUM_NETHER_ORE, IngotsItems.URANIUM_INGOT, "has_nether_uranium_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.TIN_NETHER_ORE, IngotsItems.TIN_INGOT, "has_nether_tin_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.COPPER_NETHER_ORE, IngotsItems.COPPER_INGOT, "has_nether_copper_ore", consumer); - this.registerSmeltingBlasting(NetherOresBlocks.OSMIUM_NETHER_ORE, IngotsItems.OSMIUM_INGOT, "has_nether_osmium_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.ALUMINIUM_NETHER_ORE, AllItems.Ingots.ALUMINIUM, "has_nether_aluminium_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.LEAD_NETHER_ORE, AllItems.Ingots.LEAD, "has_nether_lead_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.RUBY_NETHER_ORE, AllItems.Gems.RUBY, "has_nether_ruby_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.SAPPHIRE_NETHER_ORE, AllItems.Gems.SAPPHIRE, "has_nether_sapphire_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.SILVER_NETHER_ORE, AllItems.Ingots.SILVER, "has_nether_silver_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.URANIUM_NETHER_ORE, AllItems.Ingots.URANIUM, "has_nether_uranium_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.TIN_NETHER_ORE, AllItems.Ingots.TIN, "has_nether_tin_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.COPPER_NETHER_ORE, AllItems.Ingots.COPPER, "has_nether_copper_ore", consumer); + this.registerSmeltingBlasting(NetherOresBlocks.OSMIUM_NETHER_ORE, AllItems.Ingots.OSMIUM, "has_nether_osmium_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.COAL_BASALT_ORE, Items.COAL, "has_basalt_coal_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.REDSTONE_BASALT_ORE, Items.REDSTONE, "has_basalt_redstone_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.DIAMOND_BASALT_ORE, Items.DIAMOND, "has_basalt_diamond_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.EMERALD_BASALT_ORE, Items.EMERALD, "has_basalt_emerald_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.GOLD_BASALT_ORE, Items.GOLD_INGOT, "has_basalt_gold_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.IRON_BASALT_ORE, Items.IRON_INGOT, "has_basalt_iron_ore", consumer); + this.registerSmeltingBlasting(BasaltOresBlocks.LAPIS_BASALT_ORE, Items.LAPIS_LAZULI, "has_basalt_lapis_ore", consumer); } private void registerSmeltingBlasting(IItemProvider ingredientIn, IItemProvider resultIn, String criterion, Consumer consumer) { diff --git a/src/main/java/fr/alasdiablo/janoeo/init/AllBlocks.java b/src/main/java/fr/alasdiablo/janoeo/init/AllBlocks.java new file mode 100644 index 0000000..8a5261a --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/init/AllBlocks.java @@ -0,0 +1,10 @@ +package fr.alasdiablo.janoeo.init; + +public final class AllBlocks { + // TODO + public static final class Ores { + public static final class Nether { + // TODO + } + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/init/AllItems.java b/src/main/java/fr/alasdiablo/janoeo/init/AllItems.java new file mode 100644 index 0000000..8cb584d --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/init/AllItems.java @@ -0,0 +1,42 @@ +package fr.alasdiablo.janoeo.init; + +import net.minecraft.item.Item; + +public final class AllItems { + + public static final class Dusts { + public static final Item ALUMINIUM = DustsItems.ALUMINIUM_DUST; + public static final Item COAL = DustsItems.COAL_DUST; + public static final Item COPPER = DustsItems.COPPER_DUST; + public static final Item DIAMOND = DustsItems.DIAMOND_DUST; + public static final Item EMERALD = DustsItems.EMERALD_DUST; + public static final Item GOLD = DustsItems.GOLD_DUST; + public static final Item IRON = DustsItems.IRON_DUST; + public static final Item LAPIS = DustsItems.LAPIS_DUST; + public static final Item LEAD = DustsItems.LEAD_DUST; + public static final Item NICKEL = DustsItems.NICKEL_DUST; + public static final Item PLATINUM = DustsItems.PLATINUM_DUST; + public static final Item RUBY = DustsItems.RUBY_DUST; + public static final Item SAPPHIRE = DustsItems.SAPPHIRE_DUST; + public static final Item SILVER = DustsItems.SILVER_DUST; + public static final Item TIN = DustsItems.TIN_DUST; + public static final Item URANIUM = DustsItems.URANIUM_DUST; + } + + public static final class Ingots { + public static final Item ALUMINIUM = IngotsItems.ALUMINIUM_INGOT; + public static final Item COPPER = IngotsItems.COPPER_INGOT; + public static final Item LEAD = IngotsItems.LEAD_INGOT; + public static final Item OSMIUM = IngotsItems.OSMIUM_INGOT; + public static final Item SILVER = IngotsItems.SILVER_INGOT; + public static final Item TIN = IngotsItems.TIN_INGOT; + public static final Item URANIUM = IngotsItems.URANIUM_INGOT; + public static final Item ZINC = IngotsItems.ZINC_INGOT; + } + + public static final class Gems { + public static final Item RUBY = GemsItems.RUBY; + public static final Item SAPPHIRE = GemsItems.SAPPHIRE; + public static final Item AMETHYST = GemsItems.AMETHYST; + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/init/DustsItems.java b/src/main/java/fr/alasdiablo/janoeo/init/DustsItems.java index d9395e5..ef3dff6 100644 --- a/src/main/java/fr/alasdiablo/janoeo/init/DustsItems.java +++ b/src/main/java/fr/alasdiablo/janoeo/init/DustsItems.java @@ -17,28 +17,13 @@ public class DustsItems { /** * Instance of the Item Properties used by item declared by the class */ - private static final Item.Properties PROPERTIES - = new Item.Properties().group(JanoeoGroup.ORE_ITEMS); - - /** - * Instance of Diamond Dust Item - */ - public static Item DIAMOND_DUST - = new Item(PROPERTIES).setRegistryName(Registries.DIAMOND_DUST); - /** - * Instance of Gold Dust Item - */ - public static Item GOLD_DUST - = new Item(PROPERTIES).setRegistryName(Registries.GOLD_DUST); - /** - * Instance of Iron Dust Item - */ - public static Item IRON_DUST - = new Item(PROPERTIES).setRegistryName(Registries.IRON_DUST); + private static final Item.Properties PROPERTIES = new Item.Properties().group(JanoeoGroup.ORE_ITEMS); + public static Item DIAMOND_DUST = new Item(PROPERTIES).setRegistryName(Registries.DIAMOND_DUST); + public static Item GOLD_DUST = new Item(PROPERTIES).setRegistryName(Registries.GOLD_DUST); + public static Item IRON_DUST = new Item(PROPERTIES).setRegistryName(Registries.IRON_DUST); public static Item COAL_DUST = new Item(PROPERTIES).setRegistryName(Registries.COAL_DUST); public static Item LAPIS_DUST = new Item(PROPERTIES).setRegistryName(Registries.LAPIS_DUST); - public static Item EMERALD_DUST = new Item(PROPERTIES).setRegistryName(Registries.EMERALD_DUST); public static Item ALUMINIUM_DUST = new Item(PROPERTIES).setRegistryName(Registries.ALUMINIUM_DUST); public static Item LEAD_DUST = new Item(PROPERTIES).setRegistryName(Registries.LEAD_DUST); diff --git a/src/main/java/fr/alasdiablo/janoeo/init/GemsItems.java b/src/main/java/fr/alasdiablo/janoeo/init/GemsItems.java index 90a4737..60fc711 100644 --- a/src/main/java/fr/alasdiablo/janoeo/init/GemsItems.java +++ b/src/main/java/fr/alasdiablo/janoeo/init/GemsItems.java @@ -17,24 +17,11 @@ public class GemsItems { /** * Instance of the Item Properties used by item declared by the class */ - private static final Item.Properties PROPERTIES - = new Item.Properties().group(JanoeoGroup.ORE_ITEMS); + private static final Item.Properties PROPERTIES = new Item.Properties().group(JanoeoGroup.ORE_ITEMS); - /** - * Instance of Ruby Gem Item - */ - public static Item RUBY - = new Item(PROPERTIES).setRegistryName(Registries.RUBY); - /** - * Instance of Sapphire Gem Item - */ - public static Item SAPPHIRE - = new Item(PROPERTIES).setRegistryName(Registries.SAPPHIRE); - /** - * Instance of Amethyst Gem Item - */ - public static Item AMETHYST - = new Item(PROPERTIES).setRegistryName(Registries.AMETHYST); + public static Item RUBY = new Item(PROPERTIES).setRegistryName(Registries.RUBY); + public static Item SAPPHIRE = new Item(PROPERTIES).setRegistryName(Registries.SAPPHIRE); + public static Item AMETHYST = new Item(PROPERTIES).setRegistryName(Registries.AMETHYST); /** * Registry Event Handler diff --git a/src/main/java/fr/alasdiablo/janoeo/init/IngotsItems.java b/src/main/java/fr/alasdiablo/janoeo/init/IngotsItems.java index 7bd0783..fba24ce 100644 --- a/src/main/java/fr/alasdiablo/janoeo/init/IngotsItems.java +++ b/src/main/java/fr/alasdiablo/janoeo/init/IngotsItems.java @@ -17,50 +17,16 @@ public class IngotsItems { /** * Instance of the Item Properties used by item declared by the class */ - private static final Item.Properties PROPERTIES - = new Item.Properties().group(JanoeoGroup.ORE_ITEMS); + private static final Item.Properties PROPERTIES = new Item.Properties().group(JanoeoGroup.ORE_ITEMS); - /** - * Instance of Copper Ingot Item - */ - public static Item COPPER_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.COPPER_INGOT); - /** - * Instance of Tin Ingot Item - */ - public static Item TIN_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.TIN_INGOT); - /** - * Instance of Aluminium Ingot Item - */ - public static Item ALUMINIUM_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.ALUMINIUM_INGOT); - /** - * Instance of Lead Ingot Item - */ - public static Item LEAD_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.LEAD_INGOT); - /** - * Instance of Silver Ingot Item - */ - public static Item SILVER_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.SILVER_INGOT); - /** - * Instance of Uranium Ingot Item - */ - public static Item URANIUM_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.URANIUM_INGOT); - /** - * Instance of Zinc Ingot Item - */ - public static Item ZINC_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.ZINC_INGOT); - - /** - * Instance of Osmium Ingot Item - */ - public static Item OSMIUM_INGOT - = new Item(PROPERTIES).setRegistryName(Registries.OSMIUM_INGOT); + public static Item COPPER_INGOT = new Item(PROPERTIES).setRegistryName(Registries.COPPER_INGOT); + public static Item TIN_INGOT = new Item(PROPERTIES).setRegistryName(Registries.TIN_INGOT); + public static Item ALUMINIUM_INGOT = new Item(PROPERTIES).setRegistryName(Registries.ALUMINIUM_INGOT); + public static Item LEAD_INGOT = new Item(PROPERTIES).setRegistryName(Registries.LEAD_INGOT); + public static Item SILVER_INGOT = new Item(PROPERTIES).setRegistryName(Registries.SILVER_INGOT); + public static Item URANIUM_INGOT = new Item(PROPERTIES).setRegistryName(Registries.URANIUM_INGOT); + public static Item ZINC_INGOT = new Item(PROPERTIES).setRegistryName(Registries.ZINC_INGOT); + public static Item OSMIUM_INGOT = new Item(PROPERTIES).setRegistryName(Registries.OSMIUM_INGOT); /** * Registry Event Handler diff --git a/src/main/java/fr/alasdiablo/janoeo/init/NetherOresBlocks.java b/src/main/java/fr/alasdiablo/janoeo/init/NetherOresBlocks.java index a39f53a..b71688a 100644 --- a/src/main/java/fr/alasdiablo/janoeo/init/NetherOresBlocks.java +++ b/src/main/java/fr/alasdiablo/janoeo/init/NetherOresBlocks.java @@ -98,8 +98,7 @@ public class NetherOresBlocks { /** * Instance of Nether Osmium Ore Block */ - public static Block OSMIUM_NETHER_ORE - = new NetherOre(Registries.OSMIUM_NETHER_ORE, NULL); + public static Block OSMIUM_NETHER_ORE = new NetherOre(Registries.OSMIUM_NETHER_ORE, NULL); /** * Registry Event Handler diff --git a/src/main/java/fr/alasdiablo/janoeo/tags/BlocksTags.java b/src/main/java/fr/alasdiablo/janoeo/tags/BlocksTags.java new file mode 100644 index 0000000..7543e0b --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/tags/BlocksTags.java @@ -0,0 +1,18 @@ +package fr.alasdiablo.janoeo.tags; + +import net.minecraft.block.Block; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ITag; +import net.minecraft.util.ResourceLocation; + +public class BlocksTags { + + + private static ITag.INamedTag forgeTag(String path) { + return tag("forge", path); + } + + private static ITag.INamedTag tag(String namespace, String path) { + return BlockTags.makeWrapperTag(new ResourceLocation(namespace, path).toString()); + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/tags/ItemsTags.java b/src/main/java/fr/alasdiablo/janoeo/tags/ItemsTags.java index c3af0f0..4f677af 100644 --- a/src/main/java/fr/alasdiablo/janoeo/tags/ItemsTags.java +++ b/src/main/java/fr/alasdiablo/janoeo/tags/ItemsTags.java @@ -1,10 +1,17 @@ package fr.alasdiablo.janoeo.tags; +import net.minecraft.block.Block; +import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.FluidTags; +import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; +import java.util.function.Function; + /** * Tags Handler */ @@ -15,40 +22,63 @@ public class ItemsTags { * Handle Ingot tags */ public static class Ingots { - public static final Tags.IOptionalNamedTag COPPER = tag("ingots/copper"); - public static final Tags.IOptionalNamedTag TIN = tag("ingots/tin"); - public static final Tags.IOptionalNamedTag ALUMINIUM = tag("ingots/aluminium"); - public static final Tags.IOptionalNamedTag LEAD = tag("ingots/lead"); - public static final Tags.IOptionalNamedTag SILVER = tag("ingots/silver"); - public static final Tags.IOptionalNamedTag URANIUM = tag("ingots/uranium"); - public static final Tags.IOptionalNamedTag ZINC = tag("ingots/zinc"); + public static final ITag.INamedTag COPPER = dustTag("copper"); + public static final ITag.INamedTag TIN = dustTag("tin"); + public static final ITag.INamedTag ALUMINIUM = dustTag("aluminium"); + public static final ITag.INamedTag LEAD = dustTag("lead"); + public static final ITag.INamedTag SILVER = dustTag("silver"); + public static final ITag.INamedTag URANIUM = dustTag("uranium"); + public static final ITag.INamedTag ZINC = dustTag("zinc"); } /** * Handle Gem tags */ public static class Gems { - public static final Tags.IOptionalNamedTag RUBY = tag("gems/ruby"); - public static final Tags.IOptionalNamedTag SAPPHIRE = tag("gems/sapphire"); - public static final Tags.IOptionalNamedTag AMETHYST = tag("gems/amethyst"); + public static final ITag.INamedTag RUBY = gemTag("ruby"); + public static final ITag.INamedTag SAPPHIRE = gemTag("sapphire"); + public static final ITag.INamedTag AMETHYST = gemTag("amethyst"); } /** * Handle Dust tags */ public static class Dusts { - public static final Tags.IOptionalNamedTag DIAMOND = tag("dusts/diamond"); - public static final Tags.IOptionalNamedTag GOLD = tag("dusts/gold"); - public static final Tags.IOptionalNamedTag IRON = tag("dusts/iron"); + public static final ITag.INamedTag DIAMOND = dustTag("diamond"); + public static final ITag.INamedTag GOLD = dustTag("gold"); + public static final ITag.INamedTag IRON = dustTag("iron"); + public static final ITag.INamedTag COAL = dustTag("coal"); + public static final ITag.INamedTag LAPIS = dustTag("lapis"); + public static final ITag.INamedTag EMERALD = dustTag("emerald"); + public static final ITag.INamedTag ALUMINIUM = dustTag("aluminium"); + public static final ITag.INamedTag LEAD = dustTag("lead"); + public static final ITag.INamedTag NICKEL = dustTag("nickel"); + public static final ITag.INamedTag PLATINUM = dustTag("platinum"); + public static final ITag.INamedTag RUBY = dustTag("ruby"); + public static final ITag.INamedTag SAPPHIRE = dustTag("sapphire"); + public static final ITag.INamedTag SILVER = dustTag("silver"); + public static final ITag.INamedTag TIN = dustTag("tin"); + public static final ITag.INamedTag URANIUM = dustTag("uranium"); + public static final ITag.INamedTag COPPER = dustTag("copper"); } - /** - * Function use for create a instance of a tag - * - * @param name The name of the tag - * @return An instant of the tag corresponding to the name - */ - private static Tags.IOptionalNamedTag tag(String name) { - return ItemTags.createOptional(new ResourceLocation("forge", name)); + private static ITag.INamedTag ingotTag(String ingotName) { + return forgeTag("ingots/" + ingotName); + } + + private static ITag.INamedTag gemTag(String gemName) { + return forgeTag("gems/" + gemName); + } + + private static ITag.INamedTag dustTag(String dustName) { + return forgeTag("dusts/" + dustName); + } + + private static ITag.INamedTag forgeTag(String path) { + return tag("forge", path); + } + + private static ITag.INamedTag tag(String namespace, String path) { + return ItemTags.makeWrapperTag(new ResourceLocation(namespace, path).toString()); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3906786..d1752a4 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -30,4 +30,10 @@ Mod content: versionRange="[1.0.6,)" ordering="NONE" side="BOTH" +[[dependencies.janoeo]] + modId="create" + mandatory=false + versionRange="[mc1.16.3_v0.3e,)" + ordering="AFTER" + side="BOTH" diff --git a/src/main/resources/data/forge/tags/items/dusts.json b/src/main/resources/data/forge/tags/items/dusts.json index 856d775..0b49f60 100644 --- a/src/main/resources/data/forge/tags/items/dusts.json +++ b/src/main/resources/data/forge/tags/items/dusts.json @@ -1,8 +1,22 @@ -{ - "replace": false, - "values": [ - "#forge:dusts/iron", - "#forge:dusts/gold", - "#forge:dusts/diamond" - ] +{ + "replace": false, + "values": [ + "#forge:dusts/iron", + "#forge:dusts/gold", + "#forge:dusts/diamond", + "#forge:dusts/aluminium", + "#forge:dusts/aluminum", + "#forge:dusts/coal", + "#forge:dusts/copper", + "#forge:dusts/emerald", + "#forge:dusts/lapis", + "#forge:dusts/lead", + "#forge:dusts/nickel", + "#forge:dusts/platinum", + "#forge:dusts/ruby", + "#forge:dusts/sapphire", + "#forge:dusts/silver", + "#forge:dusts/tin", + "#forge:dusts/uranium" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/aluminium.json b/src/main/resources/data/forge/tags/items/dusts/aluminium.json new file mode 100644 index 0000000..88956e9 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/aluminium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:aluminium_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/aluminum.json b/src/main/resources/data/forge/tags/items/dusts/aluminum.json new file mode 100644 index 0000000..bc3a036 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/aluminum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#forge:dusts/aluminium" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/coal.json b/src/main/resources/data/forge/tags/items/dusts/coal.json new file mode 100644 index 0000000..c08147e --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/coal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:coal_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/copper.json b/src/main/resources/data/forge/tags/items/dusts/copper.json new file mode 100644 index 0000000..857e1b1 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:copper_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/emerald.json b/src/main/resources/data/forge/tags/items/dusts/emerald.json new file mode 100644 index 0000000..ca941ad --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/emerald.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:emerald_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/lapis.json b/src/main/resources/data/forge/tags/items/dusts/lapis.json new file mode 100644 index 0000000..481f5fd --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/lapis.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:lapis_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/lead.json b/src/main/resources/data/forge/tags/items/dusts/lead.json new file mode 100644 index 0000000..a38b73a --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/lead.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:lead_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/nickel.json b/src/main/resources/data/forge/tags/items/dusts/nickel.json new file mode 100644 index 0000000..f1aec69 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/nickel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:nickel_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/platinum.json b/src/main/resources/data/forge/tags/items/dusts/platinum.json new file mode 100644 index 0000000..fca525e --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/platinum.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:platinum_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/ruby.json b/src/main/resources/data/forge/tags/items/dusts/ruby.json new file mode 100644 index 0000000..2000bc3 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/ruby.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:ruby_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/sapphire.json b/src/main/resources/data/forge/tags/items/dusts/sapphire.json new file mode 100644 index 0000000..eb75c29 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/sapphire.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:sapphire_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/silver.json b/src/main/resources/data/forge/tags/items/dusts/silver.json new file mode 100644 index 0000000..7c6d11d --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/silver.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:silver_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/tin.json b/src/main/resources/data/forge/tags/items/dusts/tin.json new file mode 100644 index 0000000..02865b2 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/tin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:tin_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/uranium.json b/src/main/resources/data/forge/tags/items/dusts/uranium.json new file mode 100644 index 0000000..921fae0 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/uranium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "janoeo:uranium_dust" + ] +} \ No newline at end of file