diff --git a/build.gradle b/build.gradle index 1f80454..68d612e 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '4.4.0.46-experimental' +version = '4.4.0.47-experimental' group = 'fr.alasdiablo.janoeo' archivesBaseName = 'Janoeo' @@ -56,7 +56,7 @@ minecraft { } dependencies { - minecraft 'net.minecraftforge:forge:1.16.1-32.0.69' + minecraft 'net.minecraftforge:forge:1.16.1-32.0.98' } jar { diff --git a/changelog.md b/changelog.md index c4d6c8f..0db2157 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,15 @@ +### 4.4.0.47-experimental ++ fix harvest level ++ fix redstone ore always lit ++ add new basalt ore + + diamond + + emerald + + coal + + gold + + iron + + lapis + + redstone + ### 4.4.0.46-experimental + rework world ore generation internal code + balancing the nether and end ore generation diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 86cccf0..f1b376d 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,154 +1,182 @@ -3aea5feddb914c98422b6eb44500223c5b5a155c data\janoeo\advancements\recipes\janoeo.item.group\ruby_block.json -479e86996c8f514784f7406028ee12f5f3262402 data\janoeo\advancements\recipes\janoeo.item.group\sapphire_block.json -b905894b3fe253bcee8dd861eb13206d670b567a data\janoeo\recipes\ruby_block.json -99c179e8180da784dba15da62e79473f67e61592 data\janoeo\recipes\sapphire_block.json -af26a82321ae85684cf820890fcdbe4920d8c79f data\minecraft\advancements\recipes\janoeo.item.group\aluminium_blasting.json -0f4e0270d1a8920dd71876e0090101eeeb3c5ded data\minecraft\advancements\recipes\janoeo.item.group\aluminium_nether_blasting.json -a5051b1e78259a4f08b222f417f140caa387fd06 data\minecraft\advancements\recipes\janoeo.item.group\aluminium_nether_smelting.json -a725c5ba2c6fa985318435b11d55ab8fee5a2989 data\minecraft\advancements\recipes\janoeo.item.group\aluminium_smelting.json -f6137b74b904c2557bdd743936d9bb1909219c9a data\minecraft\advancements\recipes\janoeo.item.group\amethyst_blasting.json -d4a42645ce47090476bd67f4e591d3d7e711e96f data\minecraft\advancements\recipes\janoeo.item.group\amethyst_smelting.json -a90696a33df1dad0af1de2873f167363a0e37bf7 data\minecraft\advancements\recipes\janoeo.item.group\copper_blasting.json -4480423b655d63e160a5faad393d6548a0e7fd36 data\minecraft\advancements\recipes\janoeo.item.group\copper_nether_blasting.json -69a28397d5a53d67de7d7bbef96114065e15e680 data\minecraft\advancements\recipes\janoeo.item.group\copper_nether_smelting.json -b20718b96eafb441026179c83bf58e14df45a6aa data\minecraft\advancements\recipes\janoeo.item.group\copper_smelting.json -470af3d882490a67eed897d73cd17545953b4a17 data\minecraft\advancements\recipes\janoeo.item.group\lead_blasting.json -a4bacd6f354746ddf695d10a9fad4a1fc604ad63 data\minecraft\advancements\recipes\janoeo.item.group\lead_nether_blasting.json -d10ea326430cf5ab53d6d17b1f3096a03b984266 data\minecraft\advancements\recipes\janoeo.item.group\lead_nether_smelting.json -2557032c3e910c6aabdb98936d82a5c7bcfc286e data\minecraft\advancements\recipes\janoeo.item.group\lead_smelting.json -ce29430074be231275066c6c46dc441df7919f24 data\minecraft\advancements\recipes\janoeo.item.group\ruby_blasting.json -39d8ebec76d983421d667d1d044badfdadb53ae8 data\minecraft\advancements\recipes\janoeo.item.group\ruby_from_block.json -384f3901a9566b24749e5f2cbf08b98823e466d5 data\minecraft\advancements\recipes\janoeo.item.group\ruby_nether_blasting.json -e43f08a70d5f653c15bb4197591890b9042d1f5e data\minecraft\advancements\recipes\janoeo.item.group\ruby_nether_smelting.json -0516d43909216b8ae06c027cec5696b27642967b data\minecraft\advancements\recipes\janoeo.item.group\ruby_smelting.json -601246dc487c30c1602bbb2d9e7257d1a6f9e571 data\minecraft\advancements\recipes\janoeo.item.group\sapphire_blasting.json -cf50af395142c02c5e89f14e74a4ecc6b5d41208 data\minecraft\advancements\recipes\janoeo.item.group\sapphire_from_block.json -bf2edd189410b110ffd652fe316ceb0f2c5173b2 data\minecraft\advancements\recipes\janoeo.item.group\sapphire_nether_blasting.json -07a94d60c9a07754873bf2732fdc79df6a13c0c9 data\minecraft\advancements\recipes\janoeo.item.group\sapphire_nether_smelting.json -c0439dd11e135a458e85c43a488ff936155f1ef2 data\minecraft\advancements\recipes\janoeo.item.group\sapphire_smelting.json -27b8882c92f13ff7085ed778f04c8cf799bc5505 data\minecraft\advancements\recipes\janoeo.item.group\silver_blasting.json -5c592b908b1fade24c01cb88db2922005973957a data\minecraft\advancements\recipes\janoeo.item.group\silver_nether_blasting.json -de0a4e38cb27803553e7b78e6638aa6c42d1f9a8 data\minecraft\advancements\recipes\janoeo.item.group\silver_nether_smelting.json -8b5ddc9238ec94349673e23f9025b319f09e48b0 data\minecraft\advancements\recipes\janoeo.item.group\silver_smelting.json -0fcccb6fc7c54a3b924fc188e0c8e23443573943 data\minecraft\advancements\recipes\janoeo.item.group\tin_blasting.json -f2500f680f1193cafafb350c572ab85aece0b2f0 data\minecraft\advancements\recipes\janoeo.item.group\tin_nether_blasting.json -68433be959d3fdbee7ab8b3297b35ab016da360d data\minecraft\advancements\recipes\janoeo.item.group\tin_nether_smelting.json -38e81ff06c67b04c8fff207140094d40affeef82 data\minecraft\advancements\recipes\janoeo.item.group\tin_smelting.json -b6d0cab2dbdf9f0c392f023059bc9246dae9503a data\minecraft\advancements\recipes\janoeo.item.group\uranium_blasting.json -7c185b4f15e74c38cb521cf791263b9da38b3098 data\minecraft\advancements\recipes\janoeo.item.group\uranium_nether_blasting.json -e12e7468fa548b95324daa705740197109e4ce4f data\minecraft\advancements\recipes\janoeo.item.group\uranium_nether_smelting.json -6fd6399f430c6d38d847c7afa33f102682e1685a data\minecraft\advancements\recipes\janoeo.item.group\uranium_smelting.json -a95f990738a20172766f673368ed1b20544abcdd data\minecraft\advancements\recipes\janoeo.item.group\zinc_blasting.json -b8ba53a9c5e61f31499c00901e6d63d3ffd0a063 data\minecraft\advancements\recipes\janoeo.item.group\zinc_smelting.json -04798ba63d40366e2b30a28eda024a029d77f197 data\minecraft\advancements\recipes\misc\coal_end_blasting.json -ed747596c2c568e00e22ae1952944cbb10a59b8c data\minecraft\advancements\recipes\misc\coal_end_smelting.json -b060df2a8818b19aa0c7f7c27f70b523f8eb36c7 data\minecraft\advancements\recipes\misc\coal_nether_blasting.json -3bd39659a652e7d7fd2cc67321f302d6a1612e3f data\minecraft\advancements\recipes\misc\coal_nether_smelting.json -9995449c704c5f5bf69a1ceae6195f5f667f6909 data\minecraft\advancements\recipes\misc\diamond_dust_smelting.json -ad480f00cf536c23d3098bbaca87441e42d2dcd0 data\minecraft\advancements\recipes\misc\diamond_end_blasting.json -5d009449bfc0625432ae93f2c21bad5340d9c5c4 data\minecraft\advancements\recipes\misc\diamond_end_smelting.json -e7da24645768f709493f943ef82af065b7f03f46 data\minecraft\advancements\recipes\misc\diamond_gravel_blasting.json -8918440a4559510e77adeb6a23e4553a4d14be57 data\minecraft\advancements\recipes\misc\diamond_gravel_smelting.json -0dcb5f66ef0cce3d10e893b4efc8f03717eb7b7c data\minecraft\advancements\recipes\misc\diamond_nether_blasting.json -ba200ba430266f070f446f9e67ab1cef0e5baf21 data\minecraft\advancements\recipes\misc\diamond_nether_smelting.json -aadedd4a9669d31cf713d047ee049f59a5c5b8ed data\minecraft\advancements\recipes\misc\emerald_end_blasting.json -26d92929a6cc2f624b354fe3843599428e39452c data\minecraft\advancements\recipes\misc\emerald_end_smelting.json -5214c4432acdc3f6d1312d28768e0f392579d6fd data\minecraft\advancements\recipes\misc\emerald_nether_blasting.json -747aa57440727d1dd4f55c21c8e8bda025cc464a data\minecraft\advancements\recipes\misc\emerald_nether_smelting.json -1af5a33178deb954aa6b2e282c9e7c2c2f201291 data\minecraft\advancements\recipes\misc\gold_dust_smelting.json -5d0067a9e524ad8622e96454288dc60ef97118dc data\minecraft\advancements\recipes\misc\gold_end_blasting.json -d6d120d6b3b11192eedd9064a78dfd56ce705c81 data\minecraft\advancements\recipes\misc\gold_end_smelting.json -342b70b61e05c86f8dfc6c84c967499e0927e5f1 data\minecraft\advancements\recipes\misc\gold_gravel_blasting.json -1929af5a8c6d5e14e037c7e92b546613cede48eb data\minecraft\advancements\recipes\misc\gold_gravel_smelting.json -621cffd6d6cab3e653cef7078d9bfd24a34750e6 data\minecraft\advancements\recipes\misc\gold_nether_blasting.json -2a81f7124c66a6266efec4eb47ee7c07b4b3f25f data\minecraft\advancements\recipes\misc\gold_nether_smelting.json -a6dc02bcaf15fe061cba3e6c9d6523e905315ad6 data\minecraft\advancements\recipes\misc\iron_dust_smelting.json -b08d7809496bbbb41472441a85ef2a07f36f15cc data\minecraft\advancements\recipes\misc\iron_end_blasting.json -a57298c83231c26607af79e8dc10888888b12d2c data\minecraft\advancements\recipes\misc\iron_end_smelting.json -403a06e90c9232c251a7ff633a8098286f44996e data\minecraft\advancements\recipes\misc\iron_gravel_blasting.json -b82beaf83c036c2797423388564ae7927d2b5f0c data\minecraft\advancements\recipes\misc\iron_gravel_smelting.json -8e56650fc7c8836ce33bdd50c1663302ad26e052 data\minecraft\advancements\recipes\misc\iron_nether_blasting.json -8524111cbef46a8312737b66dcd62107c119594d data\minecraft\advancements\recipes\misc\iron_nether_smelting.json -03ce0971b49c48261c5c7d7b6ba173d331bff979 data\minecraft\advancements\recipes\misc\lapis_end_blasting.json -33d4b7452680ef3e8bcd37378fa0fb191e35ed47 data\minecraft\advancements\recipes\misc\lapis_end_smelting.json -f92de3f9c67d537f8d006d8554ad433b8cfb3b4b data\minecraft\advancements\recipes\misc\lapis_nether_blasting.json -70d1f297c09b96b993176f2f353b6369550b1800 data\minecraft\advancements\recipes\misc\lapis_nether_smelting.json -6a23e60016f9970ccb2cc55f07d7a1b00d6fc506 data\minecraft\advancements\recipes\redstone\redstone_end_blasting.json -77ada0675cdbeb425a316bb5ce78895b272e9238 data\minecraft\advancements\recipes\redstone\redstone_end_smelting.json -78547e96f4849d586cd116d4d59f2fd729aba65d data\minecraft\advancements\recipes\redstone\redstone_nether_blasting.json -6d2f23076ea6970b7081e43c37ddc84a6d4c56f2 data\minecraft\advancements\recipes\redstone\redstone_nether_smelting.json -9341a53020f4d6fcc14bd0623d05aa096ebf6dc3 data\minecraft\recipes\aluminium_blasting.json -4e57eb32319ccd22eeb441a38e23038985e4655a data\minecraft\recipes\aluminium_nether_blasting.json -a63de7256da04b176b79419b352ef1eda1ddbca3 data\minecraft\recipes\aluminium_nether_smelting.json -33ee9b7465118ce16447d2d8e54b08fcf81cfee3 data\minecraft\recipes\aluminium_smelting.json -a1f690cbfbf94b59d4a22db70b706784c24c9d26 data\minecraft\recipes\amethyst_blasting.json -f191a96ee02ed5decc4f6065d575bb04a9cd39a0 data\minecraft\recipes\amethyst_smelting.json -8cb218dcaf75ea41793fd50024b118de9daeea64 data\minecraft\recipes\coal_end_blasting.json -b780cb915a265aecdcac08b05a5d7916c287cf7f data\minecraft\recipes\coal_end_smelting.json -e98cbeb7ececd4b58c87f25a31c874a36221afb1 data\minecraft\recipes\coal_nether_blasting.json -9f4e7088237ec64867cf53ca23ad1df97cac072b data\minecraft\recipes\coal_nether_smelting.json -ac1ab3eaff96b8221a4172568a2e1c00e986e80f data\minecraft\recipes\copper_blasting.json -a38dfcde7bb781e1aeb7f159fa9f6c13027b71a3 data\minecraft\recipes\copper_nether_blasting.json -4cf75d1ad991d222bff4b3b1a3614a37a084c868 data\minecraft\recipes\copper_nether_smelting.json -0b5d641bf874880af6f1e2307368ef392cf1ec84 data\minecraft\recipes\copper_smelting.json -57168e48a7dccc5e89e4983ac76e1ca4a11fc303 data\minecraft\recipes\diamond_dust_smelting.json -7edb922f7ce7e320e9b5ea2ce6922d60c500ed71 data\minecraft\recipes\diamond_end_blasting.json -d673a2f66e10d7f6ba72c5c359b4bac023f32172 data\minecraft\recipes\diamond_end_smelting.json -a0f73758e2878c5b1d03afa8d606f7c510e671cf data\minecraft\recipes\diamond_gravel_blasting.json -b3212db6b8adfd2194bbe1c24cb6b876b9811a08 data\minecraft\recipes\diamond_gravel_smelting.json -043a23980dee5d1a03814dd6c0e1651b664c6e9c data\minecraft\recipes\diamond_nether_blasting.json -4fce0abc806fd21883d0d242bbe305de5ebe355b data\minecraft\recipes\diamond_nether_smelting.json -6dc107f716686a52f8dc1e9683975b803f3eb87c data\minecraft\recipes\emerald_end_blasting.json -89bb3d813d78612c16cefab5dcfe167530d84811 data\minecraft\recipes\emerald_end_smelting.json -34706f984d4a5936c7c0ace814cf913417f68058 data\minecraft\recipes\emerald_nether_blasting.json -11fe70887e5dbd653f121221f840ee1a35d8690d data\minecraft\recipes\emerald_nether_smelting.json -fea8d6c4962017e59423715a211379a80f9c8d26 data\minecraft\recipes\gold_dust_smelting.json -fbefe05291148cbe5f83ef0bf518aee760141157 data\minecraft\recipes\gold_end_blasting.json -c31f6599aa4d0286ca3cff1e1d2ef5b1947e519a data\minecraft\recipes\gold_end_smelting.json -4cacb14c9ac3dfa3dd7cc2d118bd7779bfc297e4 data\minecraft\recipes\gold_gravel_blasting.json -575382f45218c731072c06441bb06483892b4e9d data\minecraft\recipes\gold_gravel_smelting.json -78455d62c848a6f70236064288881b489f5087f3 data\minecraft\recipes\gold_nether_blasting.json -e5a500546ec67c08146d07f10bd6953707c5e97c data\minecraft\recipes\gold_nether_smelting.json -d4ee56b9538bd24126d3ac27c711c8228173b2ab data\minecraft\recipes\iron_dust_smelting.json -100ec162453b6593aeb1990250c30780e79716ba data\minecraft\recipes\iron_end_blasting.json -19ede4d573723b3a18f78adcb3f4b09bbff334cf data\minecraft\recipes\iron_end_smelting.json -e489d60970c4e05b8c4ff55d677f5defecc94142 data\minecraft\recipes\iron_gravel_blasting.json -801c0b6020ddb2c9a31643d6ee8dff61b5bc4966 data\minecraft\recipes\iron_gravel_smelting.json -d4566cbd70cefb81bf3c49e1e437f63e1cb592c4 data\minecraft\recipes\iron_nether_blasting.json -94606f41db80c4f2482222a3e9307bc6ef396a88 data\minecraft\recipes\iron_nether_smelting.json -0b7f564e94f647a2fd56a5b3c0ef288b224875cf data\minecraft\recipes\lapis_end_blasting.json -e8ea5298f57742b048c1f7b4a7f8151c87ae0381 data\minecraft\recipes\lapis_end_smelting.json -54a052ec80bcea950c371c0773d2b6bbbb160640 data\minecraft\recipes\lapis_nether_blasting.json -e6cd4fe8b6eb6c7fa26db6c455c558a9907095d0 data\minecraft\recipes\lapis_nether_smelting.json -4a4049fe0334a126dbe5072249c567e1af85dad7 data\minecraft\recipes\lead_blasting.json -c1a6a89b44f67e467f36e91603642cafef2fccce data\minecraft\recipes\lead_nether_blasting.json -4984d19eaf9eec5db90e79164d201ab68fc048ed data\minecraft\recipes\lead_nether_smelting.json -39dcdaa5b99f1f9ce7a5e4c83ef015176a00de0e data\minecraft\recipes\lead_smelting.json -d49299996981e6bab3eb0b196adf46ae77fc1a07 data\minecraft\recipes\redstone_end_blasting.json -c9ee0a7368dd8d7534d6a4ef1b7c8009a5dbf797 data\minecraft\recipes\redstone_end_smelting.json -004340ec5549fcaa6012724537b38a567fadcb6a data\minecraft\recipes\redstone_nether_blasting.json -49f7d2035da1eed56d75533fdb1191065fe468ce data\minecraft\recipes\redstone_nether_smelting.json -604e8f73df4217603db1a2ea957fec71287aac7d data\minecraft\recipes\ruby_blasting.json -3b0fc4b93bec5eb0752af1728b75f2f64bb5a03a data\minecraft\recipes\ruby_from_block.json -bb3d92b623b7c4d60f52a13d5dedf480c8e93252 data\minecraft\recipes\ruby_nether_blasting.json -30994589b4f3f8b9f232bdb89f4600a74a8c81c9 data\minecraft\recipes\ruby_nether_smelting.json -d825963c97ca9a1b860af667e6cdd0e68b62199f data\minecraft\recipes\ruby_smelting.json -7730be881ad2e179c03d33f4542a3d9b60a82f12 data\minecraft\recipes\sapphire_blasting.json -a53689c1494d44ffae7f14a7f2c002b43ff0a37a data\minecraft\recipes\sapphire_from_block.json -049581856178eb362c70d30acac235adf2166cd0 data\minecraft\recipes\sapphire_nether_blasting.json -3a0e763ba949b98c22aafb39c68a5a3d383ee800 data\minecraft\recipes\sapphire_nether_smelting.json -9cc46fc018463412f35afa3ae9eabb8d226df065 data\minecraft\recipes\sapphire_smelting.json -325560abb98d537be73a48cccb6ac00bca9f1b7c data\minecraft\recipes\silver_blasting.json -89f999ad967fac8c59b5b88ecf4d2655ccd00f89 data\minecraft\recipes\silver_nether_blasting.json -8ee1aa185debdf29704d99874a08131738ef87e2 data\minecraft\recipes\silver_nether_smelting.json -e680370f4138cc12ff4043ecd61cb7176cb63b7b data\minecraft\recipes\silver_smelting.json -4dd9e66023efc33dee9120d804bffa5e5983ced2 data\minecraft\recipes\tin_blasting.json -58132dc556d781d49972b91e7cc841d1e0039149 data\minecraft\recipes\tin_nether_blasting.json -d870c82c113fb35d62adfa7b6af0dd7c28393269 data\minecraft\recipes\tin_nether_smelting.json -fccd7a94e615309bd31c22165756e52836c8a10b data\minecraft\recipes\tin_smelting.json -ed60727d785528fac03e967b5269e18e9c20b83e data\minecraft\recipes\uranium_blasting.json -600803c7bae8ed132ebeb1139d3234f63f7845c6 data\minecraft\recipes\uranium_nether_blasting.json -559fdd200b2da9a3a115633975d8f0f3ca726546 data\minecraft\recipes\uranium_nether_smelting.json -d51923ac679458a2db63a3c7ac06dfe32b83866a data\minecraft\recipes\uranium_smelting.json -8f934d205054a4feb8dc7e5fb7e3ad35d85c9904 data\minecraft\recipes\zinc_blasting.json -abdec6cdcdb2792d66647cbbab72fc5a2dbddfea data\minecraft\recipes\zinc_smelting.json +3aea5feddb914c98422b6eb44500223c5b5a155c data/janoeo/advancements/recipes/janoeo.item.group/ruby_block.json +479e86996c8f514784f7406028ee12f5f3262402 data/janoeo/advancements/recipes/janoeo.item.group/sapphire_block.json +b905894b3fe253bcee8dd861eb13206d670b567a data/janoeo/recipes/ruby_block.json +99c179e8180da784dba15da62e79473f67e61592 data/janoeo/recipes/sapphire_block.json +af26a82321ae85684cf820890fcdbe4920d8c79f data/minecraft/advancements/recipes/janoeo.item.group/aluminium_blasting.json +0f4e0270d1a8920dd71876e0090101eeeb3c5ded data/minecraft/advancements/recipes/janoeo.item.group/aluminium_nether_blasting.json +a5051b1e78259a4f08b222f417f140caa387fd06 data/minecraft/advancements/recipes/janoeo.item.group/aluminium_nether_smelting.json +a725c5ba2c6fa985318435b11d55ab8fee5a2989 data/minecraft/advancements/recipes/janoeo.item.group/aluminium_smelting.json +f6137b74b904c2557bdd743936d9bb1909219c9a data/minecraft/advancements/recipes/janoeo.item.group/amethyst_blasting.json +d4a42645ce47090476bd67f4e591d3d7e711e96f data/minecraft/advancements/recipes/janoeo.item.group/amethyst_smelting.json +a90696a33df1dad0af1de2873f167363a0e37bf7 data/minecraft/advancements/recipes/janoeo.item.group/copper_blasting.json +4480423b655d63e160a5faad393d6548a0e7fd36 data/minecraft/advancements/recipes/janoeo.item.group/copper_nether_blasting.json +69a28397d5a53d67de7d7bbef96114065e15e680 data/minecraft/advancements/recipes/janoeo.item.group/copper_nether_smelting.json +b20718b96eafb441026179c83bf58e14df45a6aa data/minecraft/advancements/recipes/janoeo.item.group/copper_smelting.json +470af3d882490a67eed897d73cd17545953b4a17 data/minecraft/advancements/recipes/janoeo.item.group/lead_blasting.json +a4bacd6f354746ddf695d10a9fad4a1fc604ad63 data/minecraft/advancements/recipes/janoeo.item.group/lead_nether_blasting.json +d10ea326430cf5ab53d6d17b1f3096a03b984266 data/minecraft/advancements/recipes/janoeo.item.group/lead_nether_smelting.json +2557032c3e910c6aabdb98936d82a5c7bcfc286e data/minecraft/advancements/recipes/janoeo.item.group/lead_smelting.json +ce29430074be231275066c6c46dc441df7919f24 data/minecraft/advancements/recipes/janoeo.item.group/ruby_blasting.json +39d8ebec76d983421d667d1d044badfdadb53ae8 data/minecraft/advancements/recipes/janoeo.item.group/ruby_from_block.json +384f3901a9566b24749e5f2cbf08b98823e466d5 data/minecraft/advancements/recipes/janoeo.item.group/ruby_nether_blasting.json +e43f08a70d5f653c15bb4197591890b9042d1f5e data/minecraft/advancements/recipes/janoeo.item.group/ruby_nether_smelting.json +0516d43909216b8ae06c027cec5696b27642967b data/minecraft/advancements/recipes/janoeo.item.group/ruby_smelting.json +601246dc487c30c1602bbb2d9e7257d1a6f9e571 data/minecraft/advancements/recipes/janoeo.item.group/sapphire_blasting.json +cf50af395142c02c5e89f14e74a4ecc6b5d41208 data/minecraft/advancements/recipes/janoeo.item.group/sapphire_from_block.json +bf2edd189410b110ffd652fe316ceb0f2c5173b2 data/minecraft/advancements/recipes/janoeo.item.group/sapphire_nether_blasting.json +07a94d60c9a07754873bf2732fdc79df6a13c0c9 data/minecraft/advancements/recipes/janoeo.item.group/sapphire_nether_smelting.json +c0439dd11e135a458e85c43a488ff936155f1ef2 data/minecraft/advancements/recipes/janoeo.item.group/sapphire_smelting.json +27b8882c92f13ff7085ed778f04c8cf799bc5505 data/minecraft/advancements/recipes/janoeo.item.group/silver_blasting.json +5c592b908b1fade24c01cb88db2922005973957a data/minecraft/advancements/recipes/janoeo.item.group/silver_nether_blasting.json +de0a4e38cb27803553e7b78e6638aa6c42d1f9a8 data/minecraft/advancements/recipes/janoeo.item.group/silver_nether_smelting.json +8b5ddc9238ec94349673e23f9025b319f09e48b0 data/minecraft/advancements/recipes/janoeo.item.group/silver_smelting.json +0fcccb6fc7c54a3b924fc188e0c8e23443573943 data/minecraft/advancements/recipes/janoeo.item.group/tin_blasting.json +f2500f680f1193cafafb350c572ab85aece0b2f0 data/minecraft/advancements/recipes/janoeo.item.group/tin_nether_blasting.json +68433be959d3fdbee7ab8b3297b35ab016da360d data/minecraft/advancements/recipes/janoeo.item.group/tin_nether_smelting.json +38e81ff06c67b04c8fff207140094d40affeef82 data/minecraft/advancements/recipes/janoeo.item.group/tin_smelting.json +b6d0cab2dbdf9f0c392f023059bc9246dae9503a data/minecraft/advancements/recipes/janoeo.item.group/uranium_blasting.json +7c185b4f15e74c38cb521cf791263b9da38b3098 data/minecraft/advancements/recipes/janoeo.item.group/uranium_nether_blasting.json +e12e7468fa548b95324daa705740197109e4ce4f data/minecraft/advancements/recipes/janoeo.item.group/uranium_nether_smelting.json +6fd6399f430c6d38d847c7afa33f102682e1685a data/minecraft/advancements/recipes/janoeo.item.group/uranium_smelting.json +a95f990738a20172766f673368ed1b20544abcdd data/minecraft/advancements/recipes/janoeo.item.group/zinc_blasting.json +b8ba53a9c5e61f31499c00901e6d63d3ffd0a063 data/minecraft/advancements/recipes/janoeo.item.group/zinc_smelting.json +e37d2cd1122b105647c45a56b0632438014c3e26 data/minecraft/advancements/recipes/misc/coal_basalt_blasting.json +7051886b8d9b5722bb2b0b1cf5b2724dbf121eda data/minecraft/advancements/recipes/misc/coal_basalt_smelting.json +04798ba63d40366e2b30a28eda024a029d77f197 data/minecraft/advancements/recipes/misc/coal_end_blasting.json +ed747596c2c568e00e22ae1952944cbb10a59b8c data/minecraft/advancements/recipes/misc/coal_end_smelting.json +b060df2a8818b19aa0c7f7c27f70b523f8eb36c7 data/minecraft/advancements/recipes/misc/coal_nether_blasting.json +3bd39659a652e7d7fd2cc67321f302d6a1612e3f data/minecraft/advancements/recipes/misc/coal_nether_smelting.json +059dcb07340054438303fd1c1f2744c65aaf36ce data/minecraft/advancements/recipes/misc/diamond_basalt_blasting.json +94e8bc14518ed98a3cef8379484c8afe085d3aea data/minecraft/advancements/recipes/misc/diamond_basalt_smelting.json +9995449c704c5f5bf69a1ceae6195f5f667f6909 data/minecraft/advancements/recipes/misc/diamond_dust_smelting.json +ad480f00cf536c23d3098bbaca87441e42d2dcd0 data/minecraft/advancements/recipes/misc/diamond_end_blasting.json +5d009449bfc0625432ae93f2c21bad5340d9c5c4 data/minecraft/advancements/recipes/misc/diamond_end_smelting.json +e7da24645768f709493f943ef82af065b7f03f46 data/minecraft/advancements/recipes/misc/diamond_gravel_blasting.json +8918440a4559510e77adeb6a23e4553a4d14be57 data/minecraft/advancements/recipes/misc/diamond_gravel_smelting.json +0dcb5f66ef0cce3d10e893b4efc8f03717eb7b7c data/minecraft/advancements/recipes/misc/diamond_nether_blasting.json +ba200ba430266f070f446f9e67ab1cef0e5baf21 data/minecraft/advancements/recipes/misc/diamond_nether_smelting.json +2b6d532f08015bf72fd18776d54bab591f7253b4 data/minecraft/advancements/recipes/misc/emerald_basalt_blasting.json +e138c24a77cf33054815246a37cac2d27890dd22 data/minecraft/advancements/recipes/misc/emerald_basalt_smelting.json +aadedd4a9669d31cf713d047ee049f59a5c5b8ed data/minecraft/advancements/recipes/misc/emerald_end_blasting.json +26d92929a6cc2f624b354fe3843599428e39452c data/minecraft/advancements/recipes/misc/emerald_end_smelting.json +5214c4432acdc3f6d1312d28768e0f392579d6fd data/minecraft/advancements/recipes/misc/emerald_nether_blasting.json +747aa57440727d1dd4f55c21c8e8bda025cc464a data/minecraft/advancements/recipes/misc/emerald_nether_smelting.json +204d0e65784873a07fc8633614a2c79537f54d43 data/minecraft/advancements/recipes/misc/gold_basalt_blasting.json +49e6c05e57eaa456aeaf3247eca70abd1d929494 data/minecraft/advancements/recipes/misc/gold_basalt_smelting.json +1af5a33178deb954aa6b2e282c9e7c2c2f201291 data/minecraft/advancements/recipes/misc/gold_dust_smelting.json +5d0067a9e524ad8622e96454288dc60ef97118dc data/minecraft/advancements/recipes/misc/gold_end_blasting.json +d6d120d6b3b11192eedd9064a78dfd56ce705c81 data/minecraft/advancements/recipes/misc/gold_end_smelting.json +342b70b61e05c86f8dfc6c84c967499e0927e5f1 data/minecraft/advancements/recipes/misc/gold_gravel_blasting.json +1929af5a8c6d5e14e037c7e92b546613cede48eb data/minecraft/advancements/recipes/misc/gold_gravel_smelting.json +621cffd6d6cab3e653cef7078d9bfd24a34750e6 data/minecraft/advancements/recipes/misc/gold_nether_blasting.json +2a81f7124c66a6266efec4eb47ee7c07b4b3f25f data/minecraft/advancements/recipes/misc/gold_nether_smelting.json +af9251930e618d51a6763295f6eb4bd4ecb835c4 data/minecraft/advancements/recipes/misc/iron_basalt_blasting.json +b0a56d0d16ec15b40787199235dc7282f6b99bf2 data/minecraft/advancements/recipes/misc/iron_basalt_smelting.json +a6dc02bcaf15fe061cba3e6c9d6523e905315ad6 data/minecraft/advancements/recipes/misc/iron_dust_smelting.json +b08d7809496bbbb41472441a85ef2a07f36f15cc data/minecraft/advancements/recipes/misc/iron_end_blasting.json +a57298c83231c26607af79e8dc10888888b12d2c data/minecraft/advancements/recipes/misc/iron_end_smelting.json +403a06e90c9232c251a7ff633a8098286f44996e data/minecraft/advancements/recipes/misc/iron_gravel_blasting.json +b82beaf83c036c2797423388564ae7927d2b5f0c data/minecraft/advancements/recipes/misc/iron_gravel_smelting.json +8e56650fc7c8836ce33bdd50c1663302ad26e052 data/minecraft/advancements/recipes/misc/iron_nether_blasting.json +8524111cbef46a8312737b66dcd62107c119594d data/minecraft/advancements/recipes/misc/iron_nether_smelting.json +98a6e8a897cbb4daae89467a8019100a52afc93f data/minecraft/advancements/recipes/misc/lapis_basalt_blasting.json +fbc7c59eb69543e934e09cbfac9f2c0c882704a9 data/minecraft/advancements/recipes/misc/lapis_basalt_smelting.json +03ce0971b49c48261c5c7d7b6ba173d331bff979 data/minecraft/advancements/recipes/misc/lapis_end_blasting.json +33d4b7452680ef3e8bcd37378fa0fb191e35ed47 data/minecraft/advancements/recipes/misc/lapis_end_smelting.json +f92de3f9c67d537f8d006d8554ad433b8cfb3b4b data/minecraft/advancements/recipes/misc/lapis_nether_blasting.json +70d1f297c09b96b993176f2f353b6369550b1800 data/minecraft/advancements/recipes/misc/lapis_nether_smelting.json +d296a14386590dd3f04aa81fe76a8c7e5245ab23 data/minecraft/advancements/recipes/redstone/redstone_basalt_blasting.json +3634258568d7ac80ad66579e3784b683422e492d data/minecraft/advancements/recipes/redstone/redstone_basalt_smelting.json +6a23e60016f9970ccb2cc55f07d7a1b00d6fc506 data/minecraft/advancements/recipes/redstone/redstone_end_blasting.json +77ada0675cdbeb425a316bb5ce78895b272e9238 data/minecraft/advancements/recipes/redstone/redstone_end_smelting.json +78547e96f4849d586cd116d4d59f2fd729aba65d data/minecraft/advancements/recipes/redstone/redstone_nether_blasting.json +6d2f23076ea6970b7081e43c37ddc84a6d4c56f2 data/minecraft/advancements/recipes/redstone/redstone_nether_smelting.json +9341a53020f4d6fcc14bd0623d05aa096ebf6dc3 data/minecraft/recipes/aluminium_blasting.json +4e57eb32319ccd22eeb441a38e23038985e4655a data/minecraft/recipes/aluminium_nether_blasting.json +a63de7256da04b176b79419b352ef1eda1ddbca3 data/minecraft/recipes/aluminium_nether_smelting.json +33ee9b7465118ce16447d2d8e54b08fcf81cfee3 data/minecraft/recipes/aluminium_smelting.json +a1f690cbfbf94b59d4a22db70b706784c24c9d26 data/minecraft/recipes/amethyst_blasting.json +f191a96ee02ed5decc4f6065d575bb04a9cd39a0 data/minecraft/recipes/amethyst_smelting.json +9c28e0609e167e9db2c94a4004c75630c4f6f9e2 data/minecraft/recipes/coal_basalt_blasting.json +53c4f42918e168de3d8d3b417ea1eda8a7d44427 data/minecraft/recipes/coal_basalt_smelting.json +8cb218dcaf75ea41793fd50024b118de9daeea64 data/minecraft/recipes/coal_end_blasting.json +b780cb915a265aecdcac08b05a5d7916c287cf7f data/minecraft/recipes/coal_end_smelting.json +e98cbeb7ececd4b58c87f25a31c874a36221afb1 data/minecraft/recipes/coal_nether_blasting.json +9f4e7088237ec64867cf53ca23ad1df97cac072b data/minecraft/recipes/coal_nether_smelting.json +ac1ab3eaff96b8221a4172568a2e1c00e986e80f data/minecraft/recipes/copper_blasting.json +a38dfcde7bb781e1aeb7f159fa9f6c13027b71a3 data/minecraft/recipes/copper_nether_blasting.json +4cf75d1ad991d222bff4b3b1a3614a37a084c868 data/minecraft/recipes/copper_nether_smelting.json +0b5d641bf874880af6f1e2307368ef392cf1ec84 data/minecraft/recipes/copper_smelting.json +1047ab86ac4427881a57454126de9013adcbb571 data/minecraft/recipes/diamond_basalt_blasting.json +0c08876e707060717a22936d0c6a517cc899c17c data/minecraft/recipes/diamond_basalt_smelting.json +57168e48a7dccc5e89e4983ac76e1ca4a11fc303 data/minecraft/recipes/diamond_dust_smelting.json +7edb922f7ce7e320e9b5ea2ce6922d60c500ed71 data/minecraft/recipes/diamond_end_blasting.json +d673a2f66e10d7f6ba72c5c359b4bac023f32172 data/minecraft/recipes/diamond_end_smelting.json +a0f73758e2878c5b1d03afa8d606f7c510e671cf data/minecraft/recipes/diamond_gravel_blasting.json +b3212db6b8adfd2194bbe1c24cb6b876b9811a08 data/minecraft/recipes/diamond_gravel_smelting.json +043a23980dee5d1a03814dd6c0e1651b664c6e9c data/minecraft/recipes/diamond_nether_blasting.json +4fce0abc806fd21883d0d242bbe305de5ebe355b data/minecraft/recipes/diamond_nether_smelting.json +ca17af3c37907bb41a7d73f1cf3dab07b9c28ae5 data/minecraft/recipes/emerald_basalt_blasting.json +97dcb32033d7d7aa6d230e27d68c4f922408758b data/minecraft/recipes/emerald_basalt_smelting.json +6dc107f716686a52f8dc1e9683975b803f3eb87c data/minecraft/recipes/emerald_end_blasting.json +89bb3d813d78612c16cefab5dcfe167530d84811 data/minecraft/recipes/emerald_end_smelting.json +34706f984d4a5936c7c0ace814cf913417f68058 data/minecraft/recipes/emerald_nether_blasting.json +11fe70887e5dbd653f121221f840ee1a35d8690d data/minecraft/recipes/emerald_nether_smelting.json +d12ec498ca7366bc55f82cae2c9530b42f4b2b08 data/minecraft/recipes/gold_basalt_blasting.json +e96a4148def4586966ceaaed233b14a27d71b60e data/minecraft/recipes/gold_basalt_smelting.json +fea8d6c4962017e59423715a211379a80f9c8d26 data/minecraft/recipes/gold_dust_smelting.json +fbefe05291148cbe5f83ef0bf518aee760141157 data/minecraft/recipes/gold_end_blasting.json +c31f6599aa4d0286ca3cff1e1d2ef5b1947e519a data/minecraft/recipes/gold_end_smelting.json +4cacb14c9ac3dfa3dd7cc2d118bd7779bfc297e4 data/minecraft/recipes/gold_gravel_blasting.json +575382f45218c731072c06441bb06483892b4e9d data/minecraft/recipes/gold_gravel_smelting.json +78455d62c848a6f70236064288881b489f5087f3 data/minecraft/recipes/gold_nether_blasting.json +e5a500546ec67c08146d07f10bd6953707c5e97c data/minecraft/recipes/gold_nether_smelting.json +13ce99abeb9151a0de89f194c7c8e4915dee6cb6 data/minecraft/recipes/iron_basalt_blasting.json +89f1d4ec61c2bb6d0a5c816a96039713ea2bbca0 data/minecraft/recipes/iron_basalt_smelting.json +d4ee56b9538bd24126d3ac27c711c8228173b2ab data/minecraft/recipes/iron_dust_smelting.json +100ec162453b6593aeb1990250c30780e79716ba data/minecraft/recipes/iron_end_blasting.json +19ede4d573723b3a18f78adcb3f4b09bbff334cf data/minecraft/recipes/iron_end_smelting.json +e489d60970c4e05b8c4ff55d677f5defecc94142 data/minecraft/recipes/iron_gravel_blasting.json +801c0b6020ddb2c9a31643d6ee8dff61b5bc4966 data/minecraft/recipes/iron_gravel_smelting.json +d4566cbd70cefb81bf3c49e1e437f63e1cb592c4 data/minecraft/recipes/iron_nether_blasting.json +94606f41db80c4f2482222a3e9307bc6ef396a88 data/minecraft/recipes/iron_nether_smelting.json +39cc0148b5e4849d2114d7235c9cd6ca3a24fc8a data/minecraft/recipes/lapis_basalt_blasting.json +2f351334ecbe5cc7dcccd7d89a2f00c7d0c25ab8 data/minecraft/recipes/lapis_basalt_smelting.json +0b7f564e94f647a2fd56a5b3c0ef288b224875cf data/minecraft/recipes/lapis_end_blasting.json +e8ea5298f57742b048c1f7b4a7f8151c87ae0381 data/minecraft/recipes/lapis_end_smelting.json +54a052ec80bcea950c371c0773d2b6bbbb160640 data/minecraft/recipes/lapis_nether_blasting.json +e6cd4fe8b6eb6c7fa26db6c455c558a9907095d0 data/minecraft/recipes/lapis_nether_smelting.json +4a4049fe0334a126dbe5072249c567e1af85dad7 data/minecraft/recipes/lead_blasting.json +c1a6a89b44f67e467f36e91603642cafef2fccce data/minecraft/recipes/lead_nether_blasting.json +4984d19eaf9eec5db90e79164d201ab68fc048ed data/minecraft/recipes/lead_nether_smelting.json +39dcdaa5b99f1f9ce7a5e4c83ef015176a00de0e data/minecraft/recipes/lead_smelting.json +d931984a25e81fd5513b33e1df70f181c7fd6c87 data/minecraft/recipes/redstone_basalt_blasting.json +5abdbe8d069c6b3ba3d29e3c9e1e746e17a08b97 data/minecraft/recipes/redstone_basalt_smelting.json +d49299996981e6bab3eb0b196adf46ae77fc1a07 data/minecraft/recipes/redstone_end_blasting.json +c9ee0a7368dd8d7534d6a4ef1b7c8009a5dbf797 data/minecraft/recipes/redstone_end_smelting.json +004340ec5549fcaa6012724537b38a567fadcb6a data/minecraft/recipes/redstone_nether_blasting.json +49f7d2035da1eed56d75533fdb1191065fe468ce data/minecraft/recipes/redstone_nether_smelting.json +604e8f73df4217603db1a2ea957fec71287aac7d data/minecraft/recipes/ruby_blasting.json +3b0fc4b93bec5eb0752af1728b75f2f64bb5a03a data/minecraft/recipes/ruby_from_block.json +bb3d92b623b7c4d60f52a13d5dedf480c8e93252 data/minecraft/recipes/ruby_nether_blasting.json +30994589b4f3f8b9f232bdb89f4600a74a8c81c9 data/minecraft/recipes/ruby_nether_smelting.json +d825963c97ca9a1b860af667e6cdd0e68b62199f data/minecraft/recipes/ruby_smelting.json +7730be881ad2e179c03d33f4542a3d9b60a82f12 data/minecraft/recipes/sapphire_blasting.json +a53689c1494d44ffae7f14a7f2c002b43ff0a37a data/minecraft/recipes/sapphire_from_block.json +049581856178eb362c70d30acac235adf2166cd0 data/minecraft/recipes/sapphire_nether_blasting.json +3a0e763ba949b98c22aafb39c68a5a3d383ee800 data/minecraft/recipes/sapphire_nether_smelting.json +9cc46fc018463412f35afa3ae9eabb8d226df065 data/minecraft/recipes/sapphire_smelting.json +325560abb98d537be73a48cccb6ac00bca9f1b7c data/minecraft/recipes/silver_blasting.json +89f999ad967fac8c59b5b88ecf4d2655ccd00f89 data/minecraft/recipes/silver_nether_blasting.json +8ee1aa185debdf29704d99874a08131738ef87e2 data/minecraft/recipes/silver_nether_smelting.json +e680370f4138cc12ff4043ecd61cb7176cb63b7b data/minecraft/recipes/silver_smelting.json +4dd9e66023efc33dee9120d804bffa5e5983ced2 data/minecraft/recipes/tin_blasting.json +58132dc556d781d49972b91e7cc841d1e0039149 data/minecraft/recipes/tin_nether_blasting.json +d870c82c113fb35d62adfa7b6af0dd7c28393269 data/minecraft/recipes/tin_nether_smelting.json +fccd7a94e615309bd31c22165756e52836c8a10b data/minecraft/recipes/tin_smelting.json +ed60727d785528fac03e967b5269e18e9c20b83e data/minecraft/recipes/uranium_blasting.json +600803c7bae8ed132ebeb1139d3234f63f7845c6 data/minecraft/recipes/uranium_nether_blasting.json +559fdd200b2da9a3a115633975d8f0f3ca726546 data/minecraft/recipes/uranium_nether_smelting.json +d51923ac679458a2db63a3c7ac06dfe32b83866a data/minecraft/recipes/uranium_smelting.json +8f934d205054a4feb8dc7e5fb7e3ad35d85c9904 data/minecraft/recipes/zinc_blasting.json +abdec6cdcdb2792d66647cbbab72fc5a2dbddfea data/minecraft/recipes/zinc_smelting.json diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_blasting.json new file mode 100644 index 0000000..e754d96 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:coal_basalt_blasting" + ] + }, + "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": "minecraft:coal_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_coal_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_smelting.json new file mode 100644 index 0000000..9152967 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:coal_basalt_smelting" + ] + }, + "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": "minecraft:coal_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_coal_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_blasting.json new file mode 100644 index 0000000..a319da2 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diamond_basalt_blasting" + ] + }, + "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": "minecraft:diamond_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_diamond_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_smelting.json new file mode 100644 index 0000000..c96519c --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diamond_basalt_smelting" + ] + }, + "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": "minecraft:diamond_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_diamond_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_blasting.json new file mode 100644 index 0000000..c648f61 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:emerald_basalt_blasting" + ] + }, + "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": "minecraft:emerald_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_emerald_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_smelting.json new file mode 100644 index 0000000..ca41a64 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:emerald_basalt_smelting" + ] + }, + "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": "minecraft:emerald_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_emerald_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_blasting.json new file mode 100644 index 0000000..10c03e0 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:gold_basalt_blasting" + ] + }, + "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": "minecraft:gold_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_gold_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_smelting.json new file mode 100644 index 0000000..a7b89de --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:gold_basalt_smelting" + ] + }, + "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": "minecraft:gold_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_gold_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_blasting.json new file mode 100644 index 0000000..2ec48f8 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:iron_basalt_blasting" + ] + }, + "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": "minecraft:iron_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_iron_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_smelting.json new file mode 100644 index 0000000..d87c3d2 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:iron_basalt_smelting" + ] + }, + "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": "minecraft:iron_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_iron_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/lapis_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/lapis_basalt_blasting.json new file mode 100644 index 0000000..094adfd --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/lapis_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lapis_basalt_blasting" + ] + }, + "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": "minecraft:lapis_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_lapis_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/lapis_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/lapis_basalt_smelting.json new file mode 100644 index 0000000..d2d0580 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/lapis_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lapis_basalt_smelting" + ] + }, + "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": "minecraft:lapis_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_lapis_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/redstone/redstone_basalt_blasting.json b/src/generated/resources/data/minecraft/advancements/recipes/redstone/redstone_basalt_blasting.json new file mode 100644 index 0000000..a3e335d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/redstone/redstone_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:redstone_basalt_blasting" + ] + }, + "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": "minecraft:redstone_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_redstone_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/redstone/redstone_basalt_smelting.json b/src/generated/resources/data/minecraft/advancements/recipes/redstone/redstone_basalt_smelting.json new file mode 100644 index 0000000..bc2e796 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/redstone/redstone_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:redstone_basalt_smelting" + ] + }, + "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": "minecraft:redstone_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_redstone_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/coal_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/coal_basalt_blasting.json new file mode 100644 index 0000000..8128c79 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/coal_basalt_blasting.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/minecraft/recipes/coal_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/coal_basalt_smelting.json new file mode 100644 index 0000000..778a6c9 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/coal_basalt_smelting.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/minecraft/recipes/diamond_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/diamond_basalt_blasting.json new file mode 100644 index 0000000..c51d8a6 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/diamond_basalt_blasting.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/minecraft/recipes/diamond_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/diamond_basalt_smelting.json new file mode 100644 index 0000000..8674375 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/diamond_basalt_smelting.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/minecraft/recipes/emerald_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/emerald_basalt_blasting.json new file mode 100644 index 0000000..1610f95 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/emerald_basalt_blasting.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/minecraft/recipes/emerald_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/emerald_basalt_smelting.json new file mode 100644 index 0000000..475db75 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/emerald_basalt_smelting.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/minecraft/recipes/gold_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/gold_basalt_blasting.json new file mode 100644 index 0000000..14f529c --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/gold_basalt_blasting.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/minecraft/recipes/gold_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/gold_basalt_smelting.json new file mode 100644 index 0000000..9b25223 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/gold_basalt_smelting.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/minecraft/recipes/iron_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/iron_basalt_blasting.json new file mode 100644 index 0000000..e43565e --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/iron_basalt_blasting.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/minecraft/recipes/iron_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/iron_basalt_smelting.json new file mode 100644 index 0000000..d90b642 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/iron_basalt_smelting.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/minecraft/recipes/lapis_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/lapis_basalt_blasting.json new file mode 100644 index 0000000..50187dc --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/lapis_basalt_blasting.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/minecraft/recipes/lapis_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/lapis_basalt_smelting.json new file mode 100644 index 0000000..e4cf2e8 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/lapis_basalt_smelting.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/minecraft/recipes/redstone_basalt_blasting.json b/src/generated/resources/data/minecraft/recipes/redstone_basalt_blasting.json new file mode 100644 index 0000000..021a5aa --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/redstone_basalt_blasting.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/minecraft/recipes/redstone_basalt_smelting.json b/src/generated/resources/data/minecraft/recipes/redstone_basalt_smelting.json new file mode 100644 index 0000000..520be0f --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/redstone_basalt_smelting.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/block/BasaltOre.java b/src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java new file mode 100644 index 0000000..86fb48d --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/block/BasaltOre.java @@ -0,0 +1,33 @@ +package fr.alasdiablo.janoeo.block; + +import fr.alasdiablo.janoeo.block.util.ExperienceDrop; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.RotatedPillarBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.material.MaterialColor; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IWorldReader; +import net.minecraftforge.common.ToolType; + +public class BasaltOre extends RotatedPillarBlock { + public BasaltOre(String registryName) { + super(Properties.create(Material.ROCK, MaterialColor.BLACK) + .func_235861_h_() + .hardnessAndResistance(1.25F, 4.2F) + .sound(SoundType.field_235587_I_) + .harvestLevel(2) + .harvestTool(ToolType.PICKAXE) + ); + this.setRegistryName(registryName); + } + + @Override + public int getExpDrop(BlockState state, IWorldReader world, BlockPos pos, int fortune, int silktouch) { + if (silktouch == 0) { + int experience = ExperienceDrop.getExperience(RANDOM, this); + return experience != -1 ? experience : 0; + } else return 0; + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/block/BasaltOresBlocks.java b/src/main/java/fr/alasdiablo/janoeo/block/BasaltOresBlocks.java new file mode 100644 index 0000000..f400038 --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/block/BasaltOresBlocks.java @@ -0,0 +1,56 @@ +package fr.alasdiablo.janoeo.block; + +import fr.alasdiablo.janoeo.JANOEO; +import fr.alasdiablo.janoeo.util.Registries; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ObjectHolder; + +@SuppressWarnings("unused") +public class BasaltOresBlocks { + + @ObjectHolder(Registries.MODID + ":" + Registries.COAL_BASALT_ORE) + public static Block COAL_BASALT_ORE; + @ObjectHolder(Registries.MODID + ":" + Registries.DIAMOND_BASALT_ORE) + public static Block DIAMOND_BASALT_ORE; + @ObjectHolder(Registries.MODID + ":" + Registries.EMERALD_BASALT_ORE) + public static Block EMERALD_BASALT_ORE; + @ObjectHolder(Registries.MODID + ":" + Registries.GOLD_BASALT_ORE) + public static Block GOLD_BASALT_ORE; + @ObjectHolder(Registries.MODID + ":" + Registries.IRON_BASALT_ORE) + public static Block IRON_BASALT_ORE; + @ObjectHolder(Registries.MODID + ":" + Registries.LAPIS_BASALT_ORE) + public static Block LAPIS_BASALT_ORE; + @ObjectHolder(Registries.MODID + ":" + Registries.REDSTONE_BASALT_ORE) + public static Block REDSTONE_BASALT_ORE; + + @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) + public static class RegistryEvents { + @SubscribeEvent + public static void onBlocksRegistry(final RegistryEvent.Register event) { + event.getRegistry().register(new BasaltOre(Registries.COAL_BASALT_ORE)); + event.getRegistry().register(new BasaltOre(Registries.DIAMOND_BASALT_ORE)); + event.getRegistry().register(new BasaltOre(Registries.EMERALD_BASALT_ORE)); + event.getRegistry().register(new BasaltOre(Registries.GOLD_BASALT_ORE)); + event.getRegistry().register(new BasaltOre(Registries.IRON_BASALT_ORE)); + event.getRegistry().register(new BasaltOre(Registries.LAPIS_BASALT_ORE)); + event.getRegistry().register(new BasaltRedstoneOre(Registries.REDSTONE_BASALT_ORE)); + } + + @SubscribeEvent + public static void onItemsRegistry(final RegistryEvent.Register event) { + Item.Properties properties = new Item.Properties().group(JANOEO.setup.janoeoOreGroup); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.COAL_BASALT_ORE, properties).setRegistryName(Registries.COAL_BASALT_ORE)); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.DIAMOND_BASALT_ORE, properties).setRegistryName(Registries.DIAMOND_BASALT_ORE)); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.EMERALD_BASALT_ORE, properties).setRegistryName(Registries.EMERALD_BASALT_ORE)); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.GOLD_BASALT_ORE, properties).setRegistryName(Registries.GOLD_BASALT_ORE)); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.IRON_BASALT_ORE, properties).setRegistryName(Registries.IRON_BASALT_ORE)); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.LAPIS_BASALT_ORE, properties).setRegistryName(Registries.LAPIS_BASALT_ORE)); + event.getRegistry().register(new BlockItem(BasaltOresBlocks.REDSTONE_BASALT_ORE, properties).setRegistryName(Registries.REDSTONE_BASALT_ORE)); + } + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java b/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java new file mode 100644 index 0000000..9f2fb34 --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/block/BasaltRedstoneOre.java @@ -0,0 +1,60 @@ +package fr.alasdiablo.janoeo.block; + +import fr.alasdiablo.janoeo.block.util.RedstoneOreUtils; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.RedstoneOreBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.EnumProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Direction; +import net.minecraft.util.Rotation; +import net.minecraftforge.common.ToolType; + +public class BasaltRedstoneOre extends RedstoneOreBlock { + public static final EnumProperty AXIS = BlockStateProperties.AXIS; + + public BasaltRedstoneOre(String registryName) { + super(Properties.create(Material.ROCK) + .sound(SoundType.STONE) + .tickRandomly() + .hardnessAndResistance(3f) + .func_235861_h_() + .harvestLevel(2) + .harvestTool(ToolType.PICKAXE) + .func_235838_a_(RedstoneOreUtils.isLit(9)) + ); + this.setRegistryName(registryName); + this.setDefaultState(this.getDefaultState().with(AXIS, Direction.Axis.Y)); + } + + // Code from RotatedPillarBlock because we can't do dual extends + + public BlockState rotate(BlockState state, Rotation rot) { + switch(rot) { + case COUNTERCLOCKWISE_90: + case CLOCKWISE_90: + switch(state.get(AXIS)) { + case X: + return state.with(AXIS, Direction.Axis.Z); + case Z: + return state.with(AXIS, Direction.Axis.X); + default: + return state; + } + default: + return state; + } + } + + protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(AXIS).add(LIT); + } + + public BlockState getStateForPlacement(BlockItemUseContext context) { + return this.getDefaultState().with(AXIS, context.getFace().getAxis()); + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/block/util/ExperienceDrop.java b/src/main/java/fr/alasdiablo/janoeo/block/util/ExperienceDrop.java index e9c5c64..bc69467 100644 --- a/src/main/java/fr/alasdiablo/janoeo/block/util/ExperienceDrop.java +++ b/src/main/java/fr/alasdiablo/janoeo/block/util/ExperienceDrop.java @@ -29,7 +29,8 @@ public class ExperienceDrop { OverworldDenseOresBlocks.DENSE_IRON_ORE, OverworldDenseOresBlocks.DENSE_TIN_ORE, NetherDenseOresBlocks.DENSE_COAL_NETHER_ORE, - NetherDenseOresBlocks.DENSE_IRON_NETHER_ORE + NetherDenseOresBlocks.DENSE_IRON_NETHER_ORE, + BasaltOresBlocks.COAL_BASALT_ORE ); experience_3_7 = Arrays.asList( @@ -46,7 +47,9 @@ public class ExperienceDrop { OverworldDenseOresBlocks.DENSE_DIAMOND_ORE, OverworldDenseOresBlocks.DENSE_EMERALD_ORE, NetherDenseOresBlocks.DENSE_DIAMOND_NETHER_ORE, - NetherDenseOresBlocks.DENSE_EMERALD_NETHER_ORE + NetherDenseOresBlocks.DENSE_EMERALD_NETHER_ORE, + BasaltOresBlocks.DIAMOND_BASALT_ORE, + BasaltOresBlocks.EMERALD_BASALT_ORE ); experience_2_5 = Arrays.asList( @@ -54,7 +57,8 @@ public class ExperienceDrop { EndOresBlocks.LAPIS_END_ORE, OverworldDenseOresBlocks.DENSE_LAPIS_ORE, NetherDenseOresBlocks.DENSE_LAPIS_NETHER_ORE, - NetherDenseOresBlocks.DENSE_QUARTZ_NETHER_ORE + NetherDenseOresBlocks.DENSE_QUARTZ_NETHER_ORE, + BasaltOresBlocks.LAPIS_BASALT_ORE ); experience_1_4 = Arrays.asList( @@ -62,7 +66,8 @@ public class ExperienceDrop { EndOresBlocks.GOLD_END_ORE, NetherOresBlocks.GOLD_NETHER_ORE, OverworldDenseOresBlocks.DENSE_GOLD_ORE, - NetherDenseOresBlocks.DENSE_GOLD_NETHER_ORE + NetherDenseOresBlocks.DENSE_GOLD_NETHER_ORE, + BasaltOresBlocks.GOLD_BASALT_ORE ); } diff --git a/src/main/java/fr/alasdiablo/janoeo/config/BasaltConfig.java b/src/main/java/fr/alasdiablo/janoeo/config/BasaltConfig.java new file mode 100644 index 0000000..784d659 --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/config/BasaltConfig.java @@ -0,0 +1,43 @@ +package fr.alasdiablo.janoeo.config; + +import net.minecraftforge.common.ForgeConfigSpec; +import org.apache.commons.lang3.tuple.Pair; + +public class BasaltConfig { + + public static final ForgeConfigSpec CONFIG_SPEC; + public static final BasaltConfig.Config CONFIG; + + static { + Pair configPair = new ForgeConfigSpec.Builder().configure(BasaltConfig.Config::new); + CONFIG_SPEC = configPair.getRight(); + CONFIG = configPair.getLeft(); + } + + + public static class Config { + + public final ForgeConfigSpec.BooleanValue COAL_BASALT_ORE; + public final ForgeConfigSpec.BooleanValue GOLD_BASALT_ORE; + public final ForgeConfigSpec.BooleanValue DIAMOND_BASALT_ORE; + public final ForgeConfigSpec.BooleanValue EMERALD_BASALT_ORE; + public final ForgeConfigSpec.BooleanValue IRON_BASALT_ORE; + public final ForgeConfigSpec.BooleanValue LAPIS_BASALT_ORE; + public final ForgeConfigSpec.BooleanValue REDSTONE_BASALT_ORE; + + + public Config(ForgeConfigSpec.Builder builder) { + builder.comment("Basalt Ore config for janoeo").push("janoeo"); + + COAL_BASALT_ORE = builder.comment("Basalt coal ore generation: disable / enable").define("basaltCoalOreGen", true); + DIAMOND_BASALT_ORE = builder.comment("Basalt diamond ore generation: disable / enable").define("basaltDiamondOreGen", true); + EMERALD_BASALT_ORE = builder.comment("Basalt emerald ore generation: disable / enable").define("basaltEmeraldOreGen", true); + GOLD_BASALT_ORE = builder.comment("Basalt gold ore generation: disable / enable").define("basaltGoldOreGen", true); + IRON_BASALT_ORE = builder.comment("Basalt iron ore generation: disable / enable").define("basaltIronOreGen", true); + LAPIS_BASALT_ORE = builder.comment("Basalt lapis ore generation: disable / enable").define("basaltLapisOreGen", true); + REDSTONE_BASALT_ORE = builder.comment("Basalt redstone ore generation: disable / enable").define("basaltRedstoneOreGen", true); + + builder.pop(); + } + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/config/FrequencyConfig.java b/src/main/java/fr/alasdiablo/janoeo/config/FrequencyConfig.java index 53354da..ee6a476 100644 --- a/src/main/java/fr/alasdiablo/janoeo/config/FrequencyConfig.java +++ b/src/main/java/fr/alasdiablo/janoeo/config/FrequencyConfig.java @@ -16,8 +16,6 @@ public class FrequencyConfig { public static class Config { - public final int sizeMin = 1, sizeMax = 128, countMin = 0, countMax = 4096, worldMin = 1, worldMax = 255; - public final ForgeConfigSpec.IntValue COPPER_ORE_SIZE; public final ForgeConfigSpec.IntValue COPPER_ORE_COUNT; public final ForgeConfigSpec.IntValue COPPER_ORE_BOTTOM; @@ -104,9 +102,45 @@ public static class Config { public final ForgeConfigSpec.IntValue DENSE_DIAMOND_ORE_BOTTOM; public final ForgeConfigSpec.IntValue DENSE_DIAMOND_ORE_TOP; + public final ForgeConfigSpec.IntValue COAL_BASALT_ORE_SIZE; + public final ForgeConfigSpec.IntValue COAL_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue COAL_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue COAL_BASALT_ORE_TOP; + + public final ForgeConfigSpec.IntValue GOLD_BASALT_ORE_SIZE; + public final ForgeConfigSpec.IntValue GOLD_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue GOLD_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue GOLD_BASALT_ORE_TOP; + + public final ForgeConfigSpec.IntValue DIAMOND_BASALT_ORE_SIZE; + public final ForgeConfigSpec.IntValue DIAMOND_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue DIAMOND_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue DIAMOND_BASALT_ORE_TOP; + + public final ForgeConfigSpec.IntValue EMERALD_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue EMERALD_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue EMERALD_BASALT_ORE_TOP; + + public final ForgeConfigSpec.IntValue IRON_BASALT_ORE_SIZE; + public final ForgeConfigSpec.IntValue IRON_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue IRON_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue IRON_BASALT_ORE_TOP; + + public final ForgeConfigSpec.IntValue LAPIS_BASALT_ORE_SIZE; + public final ForgeConfigSpec.IntValue LAPIS_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue LAPIS_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue LAPIS_BASALT_ORE_TOP; + + public final ForgeConfigSpec.IntValue REDSTONE_BASALT_ORE_SIZE; + public final ForgeConfigSpec.IntValue REDSTONE_BASALT_ORE_COUNT; + public final ForgeConfigSpec.IntValue REDSTONE_BASALT_ORE_BOTTOM; + public final ForgeConfigSpec.IntValue REDSTONE_BASALT_ORE_TOP; + public Config(ForgeConfigSpec.Builder builder) { builder.comment("Ore frequency and height config for janoeo").push("janoeo"); + final int sizeMin = 1, sizeMax = 128, countMin = 0, countMax = 4096, worldMin = 1, worldMax = 255; + COPPER_ORE_SIZE = builder.defineInRange("overworld.copper_size" , 8 , sizeMin, sizeMax); COPPER_ORE_COUNT = builder.defineInRange("overworld.copper_count" , 12, countMin, countMax); COPPER_ORE_TOP = builder.defineInRange("overworld.copper_top" , 63, worldMin, worldMax); @@ -193,6 +227,40 @@ public Config(ForgeConfigSpec.Builder builder) { DENSE_DIAMOND_ORE_TOP = builder.defineInRange("overworld.dense.diamond_top" , 16 , worldMin, worldMax); DENSE_DIAMOND_ORE_BOTTOM = builder.defineInRange("overworld.dense.diamond_bottom" , 1 , worldMin, worldMax); + COAL_BASALT_ORE_SIZE = builder.defineInRange("nether.basalt.coal_size" , 12 , sizeMin, sizeMax); + COAL_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.coal_count" , 17 , countMin, countMax); + COAL_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.coal_top" , 127, worldMin, worldMax); + COAL_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.coal_bottom" , 1 , worldMin, worldMax); + + DIAMOND_BASALT_ORE_SIZE = builder.defineInRange("nether.basalt.diamond_size" , 4 , sizeMin, sizeMax); + DIAMOND_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.diamond_count" , 5 , countMin, countMax); + DIAMOND_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.diamond_top" , 127, worldMin, worldMax); + DIAMOND_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.diamond_bottom" , 1 , worldMin, worldMax); + + EMERALD_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.emerald_count" , 2 , countMin, countMax); + EMERALD_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.emerald_top" , 127, worldMin, worldMax); + EMERALD_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.emerald_bottom" , 1 , worldMin, worldMax); + + GOLD_BASALT_ORE_SIZE = builder.defineInRange("nether.basalt.gold_size" , 4 , sizeMin, sizeMax); + GOLD_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.gold_count" , 8 , countMin, countMax); + GOLD_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.gold_top" , 127, worldMin, worldMax); + GOLD_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.gold_bottom" , 1 , worldMin, worldMax); + + IRON_BASALT_ORE_SIZE = builder.defineInRange("nether.basalt.iron_size" , 6 , sizeMin, sizeMax); + IRON_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.iron_count" , 10 , countMin, countMax); + IRON_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.iron_top" , 127, worldMin, worldMax); + IRON_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.iron_bottom" , 1 , worldMin, worldMax); + + LAPIS_BASALT_ORE_SIZE = builder.defineInRange("nether.basalt.lapis_size" , 6 , sizeMin, sizeMax); + LAPIS_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.lapis_count" , 5 , countMin, countMax); + LAPIS_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.lapis_top" , 127, worldMin, worldMax); + LAPIS_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.lapis_bottom" , 1 , worldMin, worldMax); + + REDSTONE_BASALT_ORE_SIZE = builder.defineInRange("nether.basalt.redstone_size" , 8 , sizeMin, sizeMax); + REDSTONE_BASALT_ORE_COUNT = builder.defineInRange("nether.basalt.redstone_count" , 8 , countMin, countMax); + REDSTONE_BASALT_ORE_TOP = builder.defineInRange("nether.basalt.redstone_top" , 127, worldMin, worldMax); + REDSTONE_BASALT_ORE_BOTTOM = builder.defineInRange("nether.basalt.redstone_bottom" , 1 , worldMin, worldMax); + builder.pop(); } } diff --git a/src/main/java/fr/alasdiablo/janoeo/config/GlobalConfig.java b/src/main/java/fr/alasdiablo/janoeo/config/GlobalConfig.java index aab1b4f..02ec2e2 100644 --- a/src/main/java/fr/alasdiablo/janoeo/config/GlobalConfig.java +++ b/src/main/java/fr/alasdiablo/janoeo/config/GlobalConfig.java @@ -43,6 +43,7 @@ public static class Config { public final ForgeConfigSpec.BooleanValue GRAVEL_ORE_GEN; + public final ForgeConfigSpec.BooleanValue BASALT_ORE_GEN; /** * dense ore generation config value @@ -77,6 +78,7 @@ public Config(ForgeConfigSpec.Builder builder) { NETHER_ORE_GEN = builder.comment("Nether ore generation: disable / enable").define("netherOreGen", true); END_ORE_GEN = builder.comment("End ore generation: disable / enable").define("endOreGen", true); GRAVEL_ORE_GEN = builder.comment("Gravel ore generation: disable / enable").define("gravelOreGen", true); + BASALT_ORE_GEN = builder.comment("Basalt ore generation: disable / enable").define("basaltOreGen", true); DENSE_ORE_GEN = builder.comment("Overworld dense ore generation: disable / enable").define("denseOreGen", true); NETHER_DENSE_ORE_GEN = builder.comment("Nether dense ore generation: disable / enable").define("denseOreGen", true); EXTRA_ORE_GEN = builder.comment("Extra ore generation: disable / enable").define("extraOreGen", true); diff --git a/src/main/java/fr/alasdiablo/janoeo/datagen/Recipes.java b/src/main/java/fr/alasdiablo/janoeo/datagen/Recipes.java index 7d2311e..f84c822 100644 --- a/src/main/java/fr/alasdiablo/janoeo/datagen/Recipes.java +++ b/src/main/java/fr/alasdiablo/janoeo/datagen/Recipes.java @@ -1,13 +1,9 @@ package fr.alasdiablo.janoeo.datagen; -import fr.alasdiablo.janoeo.block.ModBlocks; +import fr.alasdiablo.janoeo.block.*; import fr.alasdiablo.janoeo.item.DustsItems; import fr.alasdiablo.janoeo.item.GemsItems; -import fr.alasdiablo.janoeo.block.GravelsOresBlocks; -import fr.alasdiablo.janoeo.block.EndOresBlocks; import fr.alasdiablo.janoeo.item.IngotsItems; -import fr.alasdiablo.janoeo.block.NetherOresBlocks; -import fr.alasdiablo.janoeo.block.OverworldOresBlocks; import net.minecraft.data.*; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; @@ -32,6 +28,8 @@ public Recipes(DataGenerator generatorIn) { */ @Override protected void registerRecipes(Consumer consumer) { + this.basaltOreSmelting(consumer); + this.basaltOreBlasting(consumer); this.endOreSmelting(consumer); this.endOreBlasting(consumer); this.extraOreSmelting(consumer); @@ -43,24 +41,74 @@ protected void registerRecipes(Consumer consumer) { this.gravelOreSmelting(consumer); } + + private void basaltOreSmelting(Consumer consumer) { + // coal + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.COAL_BASALT_ORE), Items.COAL, 0.1f, 200) + .addCriterion("has_basalt_coal_ore", hasItem(BasaltOresBlocks.COAL_BASALT_ORE)).build(consumer, "coal_basalt_smelting"); + // diamond + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.DIAMOND_BASALT_ORE), Items.DIAMOND, 0.1f, 200) + .addCriterion("has_basalt_diamond_ore", hasItem(BasaltOresBlocks.DIAMOND_BASALT_ORE)).build(consumer, "diamond_basalt_smelting"); + // emerald + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.EMERALD_BASALT_ORE), Items.EMERALD, 0.1f, 200) + .addCriterion("has_basalt_emerald_ore", hasItem(BasaltOresBlocks.EMERALD_BASALT_ORE)).build(consumer, "emerald_basalt_smelting"); + // gold + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.GOLD_BASALT_ORE), Items.GOLD_INGOT, 0.1f, 200) + .addCriterion("has_basalt_gold_ore", hasItem(BasaltOresBlocks.GOLD_BASALT_ORE)).build(consumer, "gold_basalt_smelting"); + // iron + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.IRON_BASALT_ORE), Items.IRON_INGOT, 0.1f, 200) + .addCriterion("has_basalt_iron_ore", hasItem(BasaltOresBlocks.IRON_BASALT_ORE)).build(consumer, "iron_basalt_smelting"); + // lapis + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.LAPIS_BASALT_ORE), Items.LAPIS_LAZULI, 0.1f, 200) + .addCriterion("has_basalt_lapis_ore", hasItem(BasaltOresBlocks.LAPIS_BASALT_ORE)).build(consumer, "lapis_basalt_smelting"); + // redstone + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(BasaltOresBlocks.REDSTONE_BASALT_ORE), Items.REDSTONE, 0.1f, 200) + .addCriterion("has_basalt_redstone_ore", hasItem(BasaltOresBlocks.REDSTONE_BASALT_ORE)).build(consumer, "redstone_basalt_smelting"); + } + + private void basaltOreBlasting(Consumer consumer) { + // coal + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.COAL_BASALT_ORE), Items.COAL, 0.1f, 100) + .addCriterion("has_basalt_coal_ore", hasItem(BasaltOresBlocks.COAL_BASALT_ORE)).build(consumer, "coal_basalt_blasting"); + // diamond + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.DIAMOND_BASALT_ORE), Items.DIAMOND, 0.1f, 100) + .addCriterion("has_basalt_diamond_ore", hasItem(BasaltOresBlocks.DIAMOND_BASALT_ORE)).build(consumer, "diamond_basalt_blasting"); + // emerald + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.EMERALD_BASALT_ORE), Items.EMERALD, 0.1f, 100) + .addCriterion("has_basalt_emerald_ore", hasItem(BasaltOresBlocks.EMERALD_BASALT_ORE)).build(consumer, "emerald_basalt_blasting"); + // gold + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.GOLD_BASALT_ORE), Items.GOLD_INGOT, 0.1f, 100) + .addCriterion("has_basalt_gold_ore", hasItem(BasaltOresBlocks.GOLD_BASALT_ORE)).build(consumer, "gold_basalt_blasting"); + // iron + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.IRON_BASALT_ORE), Items.IRON_INGOT, 0.1f, 100) + .addCriterion("has_basalt_iron_ore", hasItem(BasaltOresBlocks.IRON_BASALT_ORE)).build(consumer, "iron_basalt_blasting"); + // lapis + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.LAPIS_BASALT_ORE), Items.LAPIS_LAZULI, 0.1f, 100) + .addCriterion("has_basalt_lapis_ore", hasItem(BasaltOresBlocks.LAPIS_BASALT_ORE)).build(consumer, "lapis_basalt_blasting"); + // redstone + CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(BasaltOresBlocks.REDSTONE_BASALT_ORE), Items.REDSTONE, 0.1f, 100) + .addCriterion("has_basalt_redstone_ore", hasItem(BasaltOresBlocks.REDSTONE_BASALT_ORE)).build(consumer, "redstone_basalt_blasting"); + } + + private void resourceRecipe(Consumer consumer) { CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(DustsItems.IRON_DUST), Items.IRON_INGOT, 0.1f, 200) - .addCriterion("has_iron_dust", this.hasItem(DustsItems.IRON_DUST)).build(consumer, "iron_dust_smelting"); + .addCriterion("has_iron_dust", hasItem(DustsItems.IRON_DUST)).build(consumer, "iron_dust_smelting"); CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(DustsItems.GOLD_DUST), Items.GOLD_INGOT, 0.1f, 200) - .addCriterion("has_gold_dust", this.hasItem(DustsItems.GOLD_DUST)).build(consumer, "gold_dust_smelting"); + .addCriterion("has_gold_dust", hasItem(DustsItems.GOLD_DUST)).build(consumer, "gold_dust_smelting"); CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(DustsItems.DIAMOND_DUST), Items.DIAMOND, 0.1f, 200) - .addCriterion("has_diamond_dust", this.hasItem(DustsItems.DIAMOND_DUST)).build(consumer, "diamond_dust_smelting"); + .addCriterion("has_diamond_dust", hasItem(DustsItems.DIAMOND_DUST)).build(consumer, "diamond_dust_smelting"); ShapelessRecipeBuilder.shapelessRecipe(GemsItems.RUBY, 9) .addIngredient(ModBlocks.RUBY_BLOCK) - .addCriterion("has_ruby_block", this.hasItem(ModBlocks.RUBY_BLOCK)) + .addCriterion("has_ruby_block", hasItem(ModBlocks.RUBY_BLOCK)) .build(consumer, "ruby_from_block"); ShapelessRecipeBuilder.shapelessRecipe(GemsItems.SAPPHIRE, 9) .addIngredient(ModBlocks.SAPPHIRE_BLOCK) - .addCriterion("has_sapphire_block", this.hasItem(ModBlocks.SAPPHIRE_BLOCK)) + .addCriterion("has_sapphire_block", hasItem(ModBlocks.SAPPHIRE_BLOCK)) .build(consumer, "sapphire_from_block"); ShapedRecipeBuilder.shapedRecipe(ModBlocks.RUBY_BLOCK) @@ -68,7 +116,7 @@ private void resourceRecipe(Consumer consumer) { .patternLine("RRR") .patternLine("RRR") .patternLine("RRR") - .addCriterion("has_ruby", this.hasItem(ModBlocks.RUBY_BLOCK)) + .addCriterion("has_ruby", hasItem(ModBlocks.RUBY_BLOCK)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(ModBlocks.SAPPHIRE_BLOCK) @@ -76,243 +124,243 @@ private void resourceRecipe(Consumer consumer) { .patternLine("SSS") .patternLine("SSS") .patternLine("SSS") - .addCriterion("has_sapphire", this.hasItem(ModBlocks.SAPPHIRE_BLOCK)) + .addCriterion("has_sapphire", hasItem(ModBlocks.SAPPHIRE_BLOCK)) .build(consumer); } private void gravelOreSmelting(Consumer consumer) { // iron CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(GravelsOresBlocks.IRON_GRAVEL_ORE), Items.IRON_INGOT, 0.1f, 200) - .addCriterion("has_gravel_iron_ore", this.hasItem(GravelsOresBlocks.IRON_GRAVEL_ORE)).build(consumer, "iron_gravel_smelting"); + .addCriterion("has_gravel_iron_ore", hasItem(GravelsOresBlocks.IRON_GRAVEL_ORE)).build(consumer, "iron_gravel_smelting"); // gold CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(GravelsOresBlocks.GOLD_GRAVEL_ORE), Items.GOLD_INGOT, 0.1f, 200) - .addCriterion("has_gravel_gold_ore", this.hasItem(GravelsOresBlocks.GOLD_GRAVEL_ORE)).build(consumer, "gold_gravel_smelting"); + .addCriterion("has_gravel_gold_ore", hasItem(GravelsOresBlocks.GOLD_GRAVEL_ORE)).build(consumer, "gold_gravel_smelting"); // diamond CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(GravelsOresBlocks.DIAMOND_GRAVEL_ORE), Items.DIAMOND, 0.1f, 200) - .addCriterion("has_gravel_diamond_ore", this.hasItem(GravelsOresBlocks.DIAMOND_GRAVEL_ORE)).build(consumer, "diamond_gravel_smelting"); + .addCriterion("has_gravel_diamond_ore", hasItem(GravelsOresBlocks.DIAMOND_GRAVEL_ORE)).build(consumer, "diamond_gravel_smelting"); } private void gravelOreBlasting(Consumer consumer) { // iron CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(GravelsOresBlocks.IRON_GRAVEL_ORE), Items.IRON_INGOT, 0.1f, 100) - .addCriterion("has_gravel_iron_ore", this.hasItem(GravelsOresBlocks.IRON_GRAVEL_ORE)).build(consumer, "iron_gravel_blasting"); + .addCriterion("has_gravel_iron_ore", hasItem(GravelsOresBlocks.IRON_GRAVEL_ORE)).build(consumer, "iron_gravel_blasting"); // gold CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(GravelsOresBlocks.GOLD_GRAVEL_ORE), Items.GOLD_INGOT, 0.1f, 100) - .addCriterion("has_gravel_gold_ore", this.hasItem(GravelsOresBlocks.GOLD_GRAVEL_ORE)).build(consumer, "gold_gravel_blasting"); + .addCriterion("has_gravel_gold_ore", hasItem(GravelsOresBlocks.GOLD_GRAVEL_ORE)).build(consumer, "gold_gravel_blasting"); // diamond CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(GravelsOresBlocks.DIAMOND_GRAVEL_ORE), Items.DIAMOND, 0.1f, 100) - .addCriterion("has_gravel_diamond_ore", this.hasItem(GravelsOresBlocks.DIAMOND_GRAVEL_ORE)).build(consumer, "diamond_gravel_blasting"); + .addCriterion("has_gravel_diamond_ore", hasItem(GravelsOresBlocks.DIAMOND_GRAVEL_ORE)).build(consumer, "diamond_gravel_blasting"); } private void endOreSmelting(Consumer consumer) { // coal CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.COAL_END_ORE), Items.COAL, 0.1f, 200) - .addCriterion("has_end_coal_ore", this.hasItem(EndOresBlocks.COAL_END_ORE)).build(consumer, "coal_end_smelting"); + .addCriterion("has_end_coal_ore", hasItem(EndOresBlocks.COAL_END_ORE)).build(consumer, "coal_end_smelting"); // diamond CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.DIAMOND_END_ORE), Items.DIAMOND, 0.1f, 200) - .addCriterion("has_end_diamond_ore", this.hasItem(EndOresBlocks.DIAMOND_END_ORE)).build(consumer, "diamond_end_smelting"); + .addCriterion("has_end_diamond_ore", hasItem(EndOresBlocks.DIAMOND_END_ORE)).build(consumer, "diamond_end_smelting"); // emerald CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.EMERALD_END_ORE), Items.EMERALD, 0.1f, 200) - .addCriterion("has_end_emerald_ore", this.hasItem(EndOresBlocks.EMERALD_END_ORE)).build(consumer, "emerald_end_smelting"); + .addCriterion("has_end_emerald_ore", hasItem(EndOresBlocks.EMERALD_END_ORE)).build(consumer, "emerald_end_smelting"); // gold CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.GOLD_END_ORE), Items.GOLD_INGOT, 0.1f, 200) - .addCriterion("has_end_gold_ore", this.hasItem(EndOresBlocks.GOLD_END_ORE)).build(consumer, "gold_end_smelting"); + .addCriterion("has_end_gold_ore", hasItem(EndOresBlocks.GOLD_END_ORE)).build(consumer, "gold_end_smelting"); // iron CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.IRON_END_ORE), Items.IRON_INGOT, 0.1f, 200) - .addCriterion("has_end_iron_ore", this.hasItem(EndOresBlocks.IRON_END_ORE)).build(consumer, "iron_end_smelting"); + .addCriterion("has_end_iron_ore", hasItem(EndOresBlocks.IRON_END_ORE)).build(consumer, "iron_end_smelting"); // lapis CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.LAPIS_END_ORE), Items.LAPIS_LAZULI, 0.1f, 200) - .addCriterion("has_end_lapis_ore", this.hasItem(EndOresBlocks.LAPIS_END_ORE)).build(consumer, "lapis_end_smelting"); + .addCriterion("has_end_lapis_ore", hasItem(EndOresBlocks.LAPIS_END_ORE)).build(consumer, "lapis_end_smelting"); // redstone CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(EndOresBlocks.REDSTONE_END_ORE), Items.REDSTONE, 0.1f, 200) - .addCriterion("has_end_redstone_ore", this.hasItem(EndOresBlocks.REDSTONE_END_ORE)).build(consumer, "redstone_end_smelting"); + .addCriterion("has_end_redstone_ore", hasItem(EndOresBlocks.REDSTONE_END_ORE)).build(consumer, "redstone_end_smelting"); } private void endOreBlasting(Consumer consumer) { // coal CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.COAL_END_ORE), Items.COAL, 0.1f, 100) - .addCriterion("has_end_coal_ore", this.hasItem(EndOresBlocks.COAL_END_ORE)).build(consumer, "coal_end_blasting"); + .addCriterion("has_end_coal_ore", hasItem(EndOresBlocks.COAL_END_ORE)).build(consumer, "coal_end_blasting"); // diamond CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.DIAMOND_END_ORE), Items.DIAMOND, 0.1f, 100) - .addCriterion("has_end_diamond_ore", this.hasItem(EndOresBlocks.DIAMOND_END_ORE)).build(consumer, "diamond_end_blasting"); + .addCriterion("has_end_diamond_ore", hasItem(EndOresBlocks.DIAMOND_END_ORE)).build(consumer, "diamond_end_blasting"); // emerald CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.EMERALD_END_ORE), Items.EMERALD, 0.1f, 100) - .addCriterion("has_end_emerald_ore", this.hasItem(EndOresBlocks.EMERALD_END_ORE)).build(consumer, "emerald_end_blasting"); + .addCriterion("has_end_emerald_ore", hasItem(EndOresBlocks.EMERALD_END_ORE)).build(consumer, "emerald_end_blasting"); // gold CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.GOLD_END_ORE), Items.GOLD_INGOT, 0.1f, 100) - .addCriterion("has_end_gold_ore", this.hasItem(EndOresBlocks.GOLD_END_ORE)).build(consumer, "gold_end_blasting"); + .addCriterion("has_end_gold_ore", hasItem(EndOresBlocks.GOLD_END_ORE)).build(consumer, "gold_end_blasting"); // iron CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.IRON_END_ORE), Items.IRON_INGOT, 0.1f, 100) - .addCriterion("has_end_iron_ore", this.hasItem(EndOresBlocks.IRON_END_ORE)).build(consumer, "iron_end_blasting"); + .addCriterion("has_end_iron_ore", hasItem(EndOresBlocks.IRON_END_ORE)).build(consumer, "iron_end_blasting"); // lapis CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.LAPIS_END_ORE), Items.LAPIS_LAZULI, 0.1f, 100) - .addCriterion("has_end_lapis_ore", this.hasItem(EndOresBlocks.LAPIS_END_ORE)).build(consumer, "lapis_end_blasting"); + .addCriterion("has_end_lapis_ore", hasItem(EndOresBlocks.LAPIS_END_ORE)).build(consumer, "lapis_end_blasting"); // redstone CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(EndOresBlocks.REDSTONE_END_ORE), Items.REDSTONE, 0.1f, 100) - .addCriterion("has_end_redstone_ore", this.hasItem(EndOresBlocks.REDSTONE_END_ORE)).build(consumer, "redstone_end_blasting"); + .addCriterion("has_end_redstone_ore", hasItem(EndOresBlocks.REDSTONE_END_ORE)).build(consumer, "redstone_end_blasting"); } private void extraOreSmelting(Consumer consumer) { // copper CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.COPPER_ORE), IngotsItems.COPPER_INGOT, 0.1f, 200) - .addCriterion("has_copper_ore", this.hasItem(OverworldOresBlocks.COPPER_ORE)).build(consumer, "copper_smelting"); + .addCriterion("has_copper_ore", hasItem(OverworldOresBlocks.COPPER_ORE)).build(consumer, "copper_smelting"); // tin CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.TIN_ORE), IngotsItems.TIN_INGOT, 0.1f, 200) - .addCriterion("has_tin_ore", this.hasItem(OverworldOresBlocks.TIN_ORE)).build(consumer, "tin_smelting"); + .addCriterion("has_tin_ore", hasItem(OverworldOresBlocks.TIN_ORE)).build(consumer, "tin_smelting"); // aluminium CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.ALUMINIUM_ORE), IngotsItems.ALUMINIUM_INGOT, 0.1f, 200) - .addCriterion("has_aluminium_ore", this.hasItem(OverworldOresBlocks.ALUMINIUM_ORE)).build(consumer, "aluminium_smelting"); + .addCriterion("has_aluminium_ore", hasItem(OverworldOresBlocks.ALUMINIUM_ORE)).build(consumer, "aluminium_smelting"); // lead CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.LEAD_ORE), IngotsItems.LEAD_INGOT, 0.1f, 200) - .addCriterion("has_lead_ore", this.hasItem(OverworldOresBlocks.LEAD_ORE)).build(consumer, "lead_smelting"); + .addCriterion("has_lead_ore", hasItem(OverworldOresBlocks.LEAD_ORE)).build(consumer, "lead_smelting"); // silver CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.SILVER_ORE), IngotsItems.SILVER_INGOT, 0.1f, 200) - .addCriterion("has_silver_ore", this.hasItem(OverworldOresBlocks.SILVER_ORE)).build(consumer, "silver_smelting"); + .addCriterion("has_silver_ore", hasItem(OverworldOresBlocks.SILVER_ORE)).build(consumer, "silver_smelting"); // uranium CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.URANIUM_ORE), IngotsItems.URANIUM_INGOT, 0.1f, 200) - .addCriterion("has_uranium_ore", this.hasItem(OverworldOresBlocks.URANIUM_ORE)).build(consumer, "uranium_smelting"); + .addCriterion("has_uranium_ore", hasItem(OverworldOresBlocks.URANIUM_ORE)).build(consumer, "uranium_smelting"); // ruby CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.RUBY_ORE), GemsItems.RUBY, 0.1f, 200) - .addCriterion("has_ruby_ore", this.hasItem(OverworldOresBlocks.RUBY_ORE)).build(consumer, "ruby_smelting"); + .addCriterion("has_ruby_ore", hasItem(OverworldOresBlocks.RUBY_ORE)).build(consumer, "ruby_smelting"); // sapphire CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.SAPPHIRE_ORE), GemsItems.SAPPHIRE, 0.1f, 200) - .addCriterion("has_sapphire_ore", this.hasItem(OverworldOresBlocks.SAPPHIRE_ORE)).build(consumer, "sapphire_smelting"); + .addCriterion("has_sapphire_ore", hasItem(OverworldOresBlocks.SAPPHIRE_ORE)).build(consumer, "sapphire_smelting"); // amethyst CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.AMETHYST_ORE), GemsItems.AMETHYST, 0.1f, 200) - .addCriterion("has_amethyst_ore", this.hasItem(OverworldOresBlocks.AMETHYST_ORE)).build(consumer, "amethyst_smelting"); + .addCriterion("has_amethyst_ore", hasItem(OverworldOresBlocks.AMETHYST_ORE)).build(consumer, "amethyst_smelting"); // zinc CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(OverworldOresBlocks.ZINC_ORE), IngotsItems.ZINC_INGOT, 0.1f, 200) - .addCriterion("has_zinc_ore", this.hasItem(OverworldOresBlocks.ZINC_ORE)).build(consumer, "zinc_smelting"); + .addCriterion("has_zinc_ore", hasItem(OverworldOresBlocks.ZINC_ORE)).build(consumer, "zinc_smelting"); } private void extraOreBlasting(Consumer consumer) { // copper CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.COPPER_ORE), IngotsItems.COPPER_INGOT, 0.1f, 100) - .addCriterion("has_copper_ore", this.hasItem(OverworldOresBlocks.COPPER_ORE)).build(consumer, "copper_blasting"); + .addCriterion("has_copper_ore", hasItem(OverworldOresBlocks.COPPER_ORE)).build(consumer, "copper_blasting"); // tin CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.TIN_ORE), IngotsItems.TIN_INGOT, 0.1f, 100) - .addCriterion("has_tin_ore", this.hasItem(OverworldOresBlocks.TIN_ORE)).build(consumer, "tin_blasting"); + .addCriterion("has_tin_ore", hasItem(OverworldOresBlocks.TIN_ORE)).build(consumer, "tin_blasting"); // aluminium CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.ALUMINIUM_ORE), IngotsItems.ALUMINIUM_INGOT, 0.1f, 100) - .addCriterion("has_aluminium_ore", this.hasItem(OverworldOresBlocks.ALUMINIUM_ORE)).build(consumer, "aluminium_blasting"); + .addCriterion("has_aluminium_ore", hasItem(OverworldOresBlocks.ALUMINIUM_ORE)).build(consumer, "aluminium_blasting"); // lead CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.LEAD_ORE), IngotsItems.LEAD_INGOT, 0.1f, 100) - .addCriterion("has_lead_ore", this.hasItem(OverworldOresBlocks.LEAD_ORE)).build(consumer, "lead_blasting"); + .addCriterion("has_lead_ore", hasItem(OverworldOresBlocks.LEAD_ORE)).build(consumer, "lead_blasting"); // silver CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.SILVER_ORE), IngotsItems.SILVER_INGOT, 0.1f, 100) - .addCriterion("has_silver_ore", this.hasItem(OverworldOresBlocks.SILVER_ORE)).build(consumer, "silver_blasting"); + .addCriterion("has_silver_ore", hasItem(OverworldOresBlocks.SILVER_ORE)).build(consumer, "silver_blasting"); // uranium CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.URANIUM_ORE), IngotsItems.URANIUM_INGOT, 0.1f, 100) - .addCriterion("has_uranium_ore", this.hasItem(OverworldOresBlocks.URANIUM_ORE)).build(consumer, "uranium_blasting"); + .addCriterion("has_uranium_ore", hasItem(OverworldOresBlocks.URANIUM_ORE)).build(consumer, "uranium_blasting"); // ruby CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.RUBY_ORE), GemsItems.RUBY, 0.1f, 100) - .addCriterion("has_ruby_ore", this.hasItem(OverworldOresBlocks.RUBY_ORE)).build(consumer, "ruby_blasting"); + .addCriterion("has_ruby_ore", hasItem(OverworldOresBlocks.RUBY_ORE)).build(consumer, "ruby_blasting"); // sapphire CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.SAPPHIRE_ORE), GemsItems.SAPPHIRE, 0.1f, 100) - .addCriterion("has_sapphire_ore", this.hasItem(OverworldOresBlocks.SAPPHIRE_ORE)).build(consumer, "sapphire_blasting"); + .addCriterion("has_sapphire_ore", hasItem(OverworldOresBlocks.SAPPHIRE_ORE)).build(consumer, "sapphire_blasting"); // amethyst CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.AMETHYST_ORE), GemsItems.AMETHYST, 0.1f, 100) - .addCriterion("has_amethyst_ore", this.hasItem(OverworldOresBlocks.AMETHYST_ORE)).build(consumer, "amethyst_blasting"); + .addCriterion("has_amethyst_ore", hasItem(OverworldOresBlocks.AMETHYST_ORE)).build(consumer, "amethyst_blasting"); // zinc CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(OverworldOresBlocks.ZINC_ORE), IngotsItems.ZINC_INGOT, 0.1f, 100) - .addCriterion("has_zinc_ore", this.hasItem(OverworldOresBlocks.ZINC_ORE)).build(consumer, "zinc_blasting"); + .addCriterion("has_zinc_ore", hasItem(OverworldOresBlocks.ZINC_ORE)).build(consumer, "zinc_blasting"); } private void netherOreSmelting(Consumer consumer) { // coal CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.COAL_NETHER_ORE), Items.COAL, 0.1f, 200) - .addCriterion("has_nether_coal_ore", this.hasItem(NetherOresBlocks.COAL_NETHER_ORE)).build(consumer, "coal_nether_smelting"); + .addCriterion("has_nether_coal_ore", hasItem(NetherOresBlocks.COAL_NETHER_ORE)).build(consumer, "coal_nether_smelting"); // diamond CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.DIAMOND_NETHER_ORE), Items.DIAMOND, 0.1f, 200) - .addCriterion("has_nether_diamond_ore", this.hasItem(NetherOresBlocks.DIAMOND_NETHER_ORE)).build(consumer, "diamond_nether_smelting"); + .addCriterion("has_nether_diamond_ore", hasItem(NetherOresBlocks.DIAMOND_NETHER_ORE)).build(consumer, "diamond_nether_smelting"); // emerald CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.EMERALD_NETHER_ORE), Items.EMERALD, 0.1f, 200) - .addCriterion("has_nether_emerald_ore", this.hasItem(NetherOresBlocks.EMERALD_NETHER_ORE)).build(consumer, "emerald_nether_smelting"); + .addCriterion("has_nether_emerald_ore", hasItem(NetherOresBlocks.EMERALD_NETHER_ORE)).build(consumer, "emerald_nether_smelting"); // gold CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.GOLD_NETHER_ORE), Items.GOLD_INGOT, 0.1f, 200) - .addCriterion("has_nether_gold_ore", this.hasItem(NetherOresBlocks.GOLD_NETHER_ORE)).build(consumer, "gold_nether_smelting"); + .addCriterion("has_nether_gold_ore", hasItem(NetherOresBlocks.GOLD_NETHER_ORE)).build(consumer, "gold_nether_smelting"); // iron CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.IRON_NETHER_ORE), Items.IRON_INGOT, 0.1f, 200) - .addCriterion("has_nether_iron_ore", this.hasItem(NetherOresBlocks.IRON_NETHER_ORE)).build(consumer, "iron_nether_smelting"); + .addCriterion("has_nether_iron_ore", hasItem(NetherOresBlocks.IRON_NETHER_ORE)).build(consumer, "iron_nether_smelting"); // lapis CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.LAPIS_NETHER_ORE), Items.LAPIS_LAZULI, 0.1f, 200) - .addCriterion("has_nether_lapis_ore", this.hasItem(NetherOresBlocks.LAPIS_NETHER_ORE)).build(consumer, "lapis_nether_smelting"); + .addCriterion("has_nether_lapis_ore", hasItem(NetherOresBlocks.LAPIS_NETHER_ORE)).build(consumer, "lapis_nether_smelting"); // redstone CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.REDSTONE_NETHER_ORE), Items.REDSTONE, 0.1f, 200) - .addCriterion("has_nether_redstone_ore", this.hasItem(NetherOresBlocks.REDSTONE_NETHER_ORE)).build(consumer, "redstone_nether_smelting"); + .addCriterion("has_nether_redstone_ore", hasItem(NetherOresBlocks.REDSTONE_NETHER_ORE)).build(consumer, "redstone_nether_smelting"); // aluminium CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.ALUMINIUM_NETHER_ORE), IngotsItems.ALUMINIUM_INGOT, 0.1f, 200) - .addCriterion("has_nether_aluminium_ore", this.hasItem(NetherOresBlocks.ALUMINIUM_NETHER_ORE)).build(consumer, "aluminium_nether_smelting"); + .addCriterion("has_nether_aluminium_ore", hasItem(NetherOresBlocks.ALUMINIUM_NETHER_ORE)).build(consumer, "aluminium_nether_smelting"); // lead CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.LEAD_NETHER_ORE), IngotsItems.LEAD_INGOT, 0.1f, 200) - .addCriterion("has_nether_lead_ore", this.hasItem(NetherOresBlocks.LEAD_NETHER_ORE)).build(consumer, "lead_nether_smelting"); + .addCriterion("has_nether_lead_ore", hasItem(NetherOresBlocks.LEAD_NETHER_ORE)).build(consumer, "lead_nether_smelting"); // ruby CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.RUBY_NETHER_ORE), GemsItems.RUBY, 0.1f, 200) - .addCriterion("has_nether_ruby_ore", this.hasItem(NetherOresBlocks.RUBY_NETHER_ORE)).build(consumer, "ruby_nether_smelting"); + .addCriterion("has_nether_ruby_ore", hasItem(NetherOresBlocks.RUBY_NETHER_ORE)).build(consumer, "ruby_nether_smelting"); // sapphire CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.SAPPHIRE_NETHER_ORE), GemsItems.SAPPHIRE, 0.1f, 200) - .addCriterion("has_nether_sapphire_ore", this.hasItem(NetherOresBlocks.SAPPHIRE_NETHER_ORE)).build(consumer, "sapphire_nether_smelting"); + .addCriterion("has_nether_sapphire_ore", hasItem(NetherOresBlocks.SAPPHIRE_NETHER_ORE)).build(consumer, "sapphire_nether_smelting"); // silver CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.SILVER_NETHER_ORE), IngotsItems.SILVER_INGOT, 0.1f, 200) - .addCriterion("has_nether_silver_ore", this.hasItem(NetherOresBlocks.SILVER_NETHER_ORE)).build(consumer, "silver_nether_smelting"); + .addCriterion("has_nether_silver_ore", hasItem(NetherOresBlocks.SILVER_NETHER_ORE)).build(consumer, "silver_nether_smelting"); // uranium CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.URANIUM_NETHER_ORE), IngotsItems.URANIUM_INGOT, 0.1f, 200) - .addCriterion("has_nether_uranium_ore", this.hasItem(NetherOresBlocks.URANIUM_NETHER_ORE)).build(consumer, "uranium_nether_smelting"); + .addCriterion("has_nether_uranium_ore", hasItem(NetherOresBlocks.URANIUM_NETHER_ORE)).build(consumer, "uranium_nether_smelting"); // tin CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.TIN_NETHER_ORE), IngotsItems.TIN_INGOT, 0.1f, 200) - .addCriterion("has_nether_tin_ore", this.hasItem(NetherOresBlocks.TIN_NETHER_ORE)).build(consumer, "tin_nether_smelting"); + .addCriterion("has_nether_tin_ore", hasItem(NetherOresBlocks.TIN_NETHER_ORE)).build(consumer, "tin_nether_smelting"); // copper CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(NetherOresBlocks.COPPER_NETHER_ORE), IngotsItems.COPPER_INGOT, 0.1f, 200) - .addCriterion("has_nether_copper_ore", this.hasItem(NetherOresBlocks.COPPER_NETHER_ORE)).build(consumer, "copper_nether_smelting"); + .addCriterion("has_nether_copper_ore", hasItem(NetherOresBlocks.COPPER_NETHER_ORE)).build(consumer, "copper_nether_smelting"); } private void netherOreBlasting(Consumer consumer) { // coal CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.COAL_NETHER_ORE), Items.COAL, 0.1f, 100) - .addCriterion("has_nether_coal_ore", this.hasItem(NetherOresBlocks.COAL_NETHER_ORE)).build(consumer, "coal_nether_blasting"); + .addCriterion("has_nether_coal_ore", hasItem(NetherOresBlocks.COAL_NETHER_ORE)).build(consumer, "coal_nether_blasting"); // diamond CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.DIAMOND_NETHER_ORE), Items.DIAMOND, 0.1f, 100) - .addCriterion("has_nether_diamond_ore", this.hasItem(NetherOresBlocks.DIAMOND_NETHER_ORE)).build(consumer, "diamond_nether_blasting"); + .addCriterion("has_nether_diamond_ore", hasItem(NetherOresBlocks.DIAMOND_NETHER_ORE)).build(consumer, "diamond_nether_blasting"); // emerald CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.EMERALD_NETHER_ORE), Items.EMERALD, 0.1f, 100) - .addCriterion("has_nether_emerald_ore", this.hasItem(NetherOresBlocks.EMERALD_NETHER_ORE)).build(consumer, "emerald_nether_blasting"); + .addCriterion("has_nether_emerald_ore", hasItem(NetherOresBlocks.EMERALD_NETHER_ORE)).build(consumer, "emerald_nether_blasting"); // gold CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.GOLD_NETHER_ORE), Items.GOLD_INGOT, 0.1f, 100) - .addCriterion("has_nether_gold_ore", this.hasItem(NetherOresBlocks.GOLD_NETHER_ORE)).build(consumer, "gold_nether_blasting"); + .addCriterion("has_nether_gold_ore", hasItem(NetherOresBlocks.GOLD_NETHER_ORE)).build(consumer, "gold_nether_blasting"); // iron CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.IRON_NETHER_ORE), Items.IRON_INGOT, 0.1f, 100) - .addCriterion("has_nether_iron_ore", this.hasItem(NetherOresBlocks.IRON_NETHER_ORE)).build(consumer, "iron_nether_blasting"); + .addCriterion("has_nether_iron_ore", hasItem(NetherOresBlocks.IRON_NETHER_ORE)).build(consumer, "iron_nether_blasting"); // lapis CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.LAPIS_NETHER_ORE), Items.LAPIS_LAZULI, 0.1f, 100) - .addCriterion("has_nether_lapis_ore", this.hasItem(NetherOresBlocks.LAPIS_NETHER_ORE)).build(consumer, "lapis_nether_blasting"); + .addCriterion("has_nether_lapis_ore", hasItem(NetherOresBlocks.LAPIS_NETHER_ORE)).build(consumer, "lapis_nether_blasting"); // redstone CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.REDSTONE_NETHER_ORE), Items.REDSTONE, 0.1f, 100) - .addCriterion("has_nether_redstone_ore", this.hasItem(NetherOresBlocks.REDSTONE_NETHER_ORE)).build(consumer, "redstone_nether_blasting"); + .addCriterion("has_nether_redstone_ore", hasItem(NetherOresBlocks.REDSTONE_NETHER_ORE)).build(consumer, "redstone_nether_blasting"); // aluminium CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.ALUMINIUM_NETHER_ORE), IngotsItems.ALUMINIUM_INGOT, 0.1f, 100) - .addCriterion("has_nether_aluminium_ore", this.hasItem(NetherOresBlocks.ALUMINIUM_NETHER_ORE)).build(consumer, "aluminium_nether_blasting"); + .addCriterion("has_nether_aluminium_ore", hasItem(NetherOresBlocks.ALUMINIUM_NETHER_ORE)).build(consumer, "aluminium_nether_blasting"); // lead CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.LEAD_NETHER_ORE), IngotsItems.LEAD_INGOT, 0.1f, 100) - .addCriterion("has_nether_lead_ore", this.hasItem(NetherOresBlocks.LEAD_NETHER_ORE)).build(consumer, "lead_nether_blasting"); + .addCriterion("has_nether_lead_ore", hasItem(NetherOresBlocks.LEAD_NETHER_ORE)).build(consumer, "lead_nether_blasting"); // ruby CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.RUBY_NETHER_ORE), GemsItems.RUBY, 0.1f, 100) - .addCriterion("has_nether_ruby_ore", this.hasItem(NetherOresBlocks.RUBY_NETHER_ORE)).build(consumer, "ruby_nether_blasting"); + .addCriterion("has_nether_ruby_ore", hasItem(NetherOresBlocks.RUBY_NETHER_ORE)).build(consumer, "ruby_nether_blasting"); // sapphire CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.SAPPHIRE_NETHER_ORE), GemsItems.SAPPHIRE, 0.1f, 100) - .addCriterion("has_nether_sapphire_ore", this.hasItem(NetherOresBlocks.SAPPHIRE_NETHER_ORE)).build(consumer, "sapphire_nether_blasting"); + .addCriterion("has_nether_sapphire_ore", hasItem(NetherOresBlocks.SAPPHIRE_NETHER_ORE)).build(consumer, "sapphire_nether_blasting"); // silver CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.SILVER_NETHER_ORE), IngotsItems.SILVER_INGOT, 0.1f, 100) - .addCriterion("has_nether_silver_ore", this.hasItem(NetherOresBlocks.SILVER_NETHER_ORE)).build(consumer, "silver_nether_blasting"); + .addCriterion("has_nether_silver_ore", hasItem(NetherOresBlocks.SILVER_NETHER_ORE)).build(consumer, "silver_nether_blasting"); // uranium CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.URANIUM_NETHER_ORE), IngotsItems.URANIUM_INGOT, 0.1f, 100) - .addCriterion("has_nether_uranium_ore", this.hasItem(NetherOresBlocks.URANIUM_NETHER_ORE)).build(consumer, "uranium_nether_blasting"); + .addCriterion("has_nether_uranium_ore", hasItem(NetherOresBlocks.URANIUM_NETHER_ORE)).build(consumer, "uranium_nether_blasting"); // tin CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.TIN_NETHER_ORE), IngotsItems.TIN_INGOT, 0.1f, 100) - .addCriterion("has_nether_uranium_ore", this.hasItem(NetherOresBlocks.TIN_NETHER_ORE)).build(consumer, "tin_nether_blasting"); + .addCriterion("has_nether_uranium_ore", hasItem(NetherOresBlocks.TIN_NETHER_ORE)).build(consumer, "tin_nether_blasting"); // copper CookingRecipeBuilder.blastingRecipe(Ingredient.fromItems(NetherOresBlocks.COPPER_NETHER_ORE), IngotsItems.COPPER_INGOT, 0.1f, 100) - .addCriterion("has_nether_copper_ore", this.hasItem(NetherOresBlocks.COPPER_NETHER_ORE)).build(consumer, "copper_nether_blasting"); + .addCriterion("has_nether_copper_ore", hasItem(NetherOresBlocks.COPPER_NETHER_ORE)).build(consumer, "copper_nether_blasting"); } @Override diff --git a/src/main/java/fr/alasdiablo/janoeo/util/ModSetup.java b/src/main/java/fr/alasdiablo/janoeo/util/ModSetup.java index ddc8bc6..cc29651 100644 --- a/src/main/java/fr/alasdiablo/janoeo/util/ModSetup.java +++ b/src/main/java/fr/alasdiablo/janoeo/util/ModSetup.java @@ -51,6 +51,7 @@ public void init() { generators.add(new NetherOreGenerator()); generators.add(new EndOreGenerator()); generators.add(new GravelOreGenerator()); + generators.add(new BasaltOreGenerator()); generators.forEach(IWorldGenerator::startWorldGeneration); } } diff --git a/src/main/java/fr/alasdiablo/janoeo/world/gen/BasaltOreGenerator.java b/src/main/java/fr/alasdiablo/janoeo/world/gen/BasaltOreGenerator.java new file mode 100644 index 0000000..182bdd6 --- /dev/null +++ b/src/main/java/fr/alasdiablo/janoeo/world/gen/BasaltOreGenerator.java @@ -0,0 +1,105 @@ +package fr.alasdiablo.janoeo.world.gen; + +import fr.alasdiablo.janoeo.block.BasaltOresBlocks; +import fr.alasdiablo.janoeo.config.BasaltConfig; +import fr.alasdiablo.janoeo.config.FrequencyConfig; +import fr.alasdiablo.janoeo.config.GlobalConfig; +import fr.alasdiablo.janoeo.world.OreGenUtils; +import fr.alasdiablo.janoeo.world.gen.feature.CustomFillerBlockType; +import net.minecraft.block.Blocks; +import net.minecraftforge.registries.ForgeRegistries; + +public class BasaltOreGenerator implements IWorldGenerator { + @Override + public void startWorldGeneration() { + GlobalConfig.Config globalConfig = GlobalConfig.CONFIG; + BasaltConfig.Config basaltConfig = BasaltConfig.CONFIG; + FrequencyConfig.Config frequencyConfig = FrequencyConfig.CONFIG; + + if (globalConfig.BASALT_ORE_GEN.get()) ForgeRegistries.BIOMES.forEach(biome -> { + + if (basaltConfig.COAL_BASALT_ORE.get()) { + OreGenUtils.addOreGenOnBiome( + biome, + CustomFillerBlockType.BASALT, + BasaltOresBlocks.COAL_BASALT_ORE.getDefaultState(), + frequencyConfig.COAL_BASALT_ORE_SIZE.get(), + frequencyConfig.COAL_BASALT_ORE_COUNT.get(), + frequencyConfig.COAL_BASALT_ORE_BOTTOM.get(), + frequencyConfig.COAL_BASALT_ORE_TOP.get() + ); + } + + if (basaltConfig.DIAMOND_BASALT_ORE.get()) { + OreGenUtils.addOreGenOnBiome( + biome, + CustomFillerBlockType.BASALT, + BasaltOresBlocks.DIAMOND_BASALT_ORE.getDefaultState(), + frequencyConfig.DIAMOND_BASALT_ORE_SIZE.get(), + frequencyConfig.DIAMOND_BASALT_ORE_COUNT.get(), + frequencyConfig.DIAMOND_BASALT_ORE_BOTTOM.get(), + frequencyConfig.DIAMOND_BASALT_ORE_TOP.get() + ); + } + + if (basaltConfig.EMERALD_BASALT_ORE.get()) { + OreGenUtils.addBlockGenOnBiome( + biome, + Blocks.field_235337_cO_.getDefaultState(), + BasaltOresBlocks.EMERALD_BASALT_ORE.getDefaultState(), + frequencyConfig.EMERALD_BASALT_ORE_COUNT.get(), + frequencyConfig.EMERALD_BASALT_ORE_BOTTOM.get(), + frequencyConfig.EMERALD_BASALT_ORE_TOP.get() + ); + } + + if (basaltConfig.GOLD_BASALT_ORE.get()) { + OreGenUtils.addOreGenOnBiome( + biome, + CustomFillerBlockType.BASALT, + BasaltOresBlocks.GOLD_BASALT_ORE.getDefaultState(), + frequencyConfig.GOLD_BASALT_ORE_SIZE.get(), + frequencyConfig.GOLD_BASALT_ORE_COUNT.get(), + frequencyConfig.GOLD_BASALT_ORE_BOTTOM.get(), + frequencyConfig.GOLD_BASALT_ORE_TOP.get() + ); + } + + if (basaltConfig.IRON_BASALT_ORE.get()) { + OreGenUtils.addOreGenOnBiome( + biome, + CustomFillerBlockType.BASALT, + BasaltOresBlocks.IRON_BASALT_ORE.getDefaultState(), + frequencyConfig.IRON_BASALT_ORE_SIZE.get(), + frequencyConfig.IRON_BASALT_ORE_COUNT.get(), + frequencyConfig.IRON_BASALT_ORE_BOTTOM.get(), + frequencyConfig.IRON_BASALT_ORE_TOP.get() + ); + } + + if (basaltConfig.LAPIS_BASALT_ORE.get()) { + OreGenUtils.addOreGenOnBiome( + biome, + CustomFillerBlockType.BASALT, + BasaltOresBlocks.LAPIS_BASALT_ORE.getDefaultState(), + frequencyConfig.LAPIS_BASALT_ORE_SIZE.get(), + frequencyConfig.LAPIS_BASALT_ORE_COUNT.get(), + frequencyConfig.LAPIS_BASALT_ORE_BOTTOM.get(), + frequencyConfig.LAPIS_BASALT_ORE_TOP.get() + ); + } + + if (basaltConfig.REDSTONE_BASALT_ORE.get()) { + OreGenUtils.addOreGenOnBiome( + biome, + CustomFillerBlockType.BASALT, + BasaltOresBlocks.REDSTONE_BASALT_ORE.getDefaultState(), + frequencyConfig.REDSTONE_BASALT_ORE_SIZE.get(), + frequencyConfig.REDSTONE_BASALT_ORE_COUNT.get(), + frequencyConfig.REDSTONE_BASALT_ORE_BOTTOM.get(), + frequencyConfig.REDSTONE_BASALT_ORE_TOP.get() + ); + } + }); + } +} diff --git a/src/main/java/fr/alasdiablo/janoeo/world/gen/feature/CustomFillerBlockType.java b/src/main/java/fr/alasdiablo/janoeo/world/gen/feature/CustomFillerBlockType.java index 0c4e153..01a05cb 100644 --- a/src/main/java/fr/alasdiablo/janoeo/world/gen/feature/CustomFillerBlockType.java +++ b/src/main/java/fr/alasdiablo/janoeo/world/gen/feature/CustomFillerBlockType.java @@ -23,7 +23,8 @@ public enum CustomFillerBlockType implements IStringSerializable { }), NETHERRACK("netherrack", new BlockMatcher(Blocks.NETHERRACK)), END_STONE("end_stone", new BlockMatcher(Blocks.END_STONE)), - GRAVEL("gravel", new BlockMatcher(Blocks.GRAVEL)); + GRAVEL("gravel", new BlockMatcher(Blocks.GRAVEL)), + BASALT("basalt", new BlockMatcher(Blocks.field_235337_cO_)); private static final Map CUSTOM_FILLER_BLOCK_TYPE_MAP; public static final Codec FILLER_BLOCK_TYPE_CODEC; diff --git a/src/main/resources/assets/janoeo/blockstates/coal_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/coal_basalt_ore.json new file mode 100644 index 0000000..3cdea16 --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/coal_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/coal_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/coal_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/coal_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/blockstates/diamond_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/diamond_basalt_ore.json new file mode 100644 index 0000000..b69e3f2 --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/diamond_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/diamond_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/diamond_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/diamond_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/blockstates/emerald_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/emerald_basalt_ore.json new file mode 100644 index 0000000..9ddfefd --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/emerald_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/emerald_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/emerald_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/emerald_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/blockstates/gold_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/gold_basalt_ore.json new file mode 100644 index 0000000..5598515 --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/gold_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/gold_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/gold_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/gold_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/blockstates/iron_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/iron_basalt_ore.json new file mode 100644 index 0000000..7b54f1d --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/iron_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/iron_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/iron_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/iron_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/blockstates/lapis_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/lapis_basalt_ore.json new file mode 100644 index 0000000..73a22ec --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/lapis_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/lapis_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/lapis_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/lapis_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/blockstates/redstone_basalt_ore.json b/src/main/resources/assets/janoeo/blockstates/redstone_basalt_ore.json new file mode 100644 index 0000000..4902100 --- /dev/null +++ b/src/main/resources/assets/janoeo/blockstates/redstone_basalt_ore.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "janoeo:block/redstone_basalt_ore", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "janoeo:block/redstone_basalt_ore" + }, + "axis=z": { + "model": "janoeo:block/redstone_basalt_ore", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/lang/en_us.json b/src/main/resources/assets/janoeo/lang/en_us.json index 1c5b17b..41b5af4 100644 --- a/src/main/resources/assets/janoeo/lang/en_us.json +++ b/src/main/resources/assets/janoeo/lang/en_us.json @@ -67,6 +67,12 @@ "block.janoeo.tin_nether_ore": "Nether Tin Ore", "block.janoeo.iron_gravel_ore": "Gravel Iron Ore", "block.janoeo.gold_gravel_ore": "Gravel Gold Ore", - "block.janoeo.diamond_gravel_ore": "Gravel Diamond Ore" - + "block.janoeo.diamond_gravel_ore": "Gravel Diamond Ore", + "block.janoeo.coal_basalt_ore": "Basalt Coal Ore", + "block.janoeo.diamond_basalt_ore": "Basalt Diamond Ore", + "block.janoeo.emerald_basalt_ore": "Basalt Emerald Ore", + "block.janoeo.gold_basalt_ore": "Basalt Gold Ore", + "block.janoeo.iron_basalt_ore": "Basalt Iron Ore", + "block.janoeo.lapis_basalt_ore": "Basalt Lapis Ore", + "block.janoeo.redstone_basalt_ore": "Basalt Redstone Ore" } \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/coal_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/coal_basalt_ore.json new file mode 100644 index 0000000..c00b8c2 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/coal_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/coal_basalt_ore_top", + "side": "janoeo:block/nether/basalt/coal_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/diamond_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/diamond_basalt_ore.json new file mode 100644 index 0000000..ccd635f --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/diamond_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/diamond_basalt_ore_top", + "side": "janoeo:block/nether/basalt/diamond_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/emerald_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/emerald_basalt_ore.json new file mode 100644 index 0000000..75a18e5 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/emerald_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/emerald_basalt_ore_top", + "side": "janoeo:block/nether/basalt/emerald_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/gold_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/gold_basalt_ore.json new file mode 100644 index 0000000..a2850b8 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/gold_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/gold_basalt_ore_top", + "side": "janoeo:block/nether/basalt/gold_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/iron_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/iron_basalt_ore.json new file mode 100644 index 0000000..4d8e6ee --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/iron_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/iron_basalt_ore_top", + "side": "janoeo:block/nether/basalt/iron_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/lapis_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/lapis_basalt_ore.json new file mode 100644 index 0000000..f913c93 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/lapis_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/lapis_basalt_ore_top", + "side": "janoeo:block/nether/basalt/lapis_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/block/redstone_basalt_ore.json b/src/main/resources/assets/janoeo/models/block/redstone_basalt_ore.json new file mode 100644 index 0000000..fb14fc1 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/block/redstone_basalt_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "janoeo:block/nether/basalt/redstone_basalt_ore_top", + "side": "janoeo:block/nether/basalt/redstone_basalt_ore_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/coal_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/coal_basalt_ore.json new file mode 100644 index 0000000..a38df03 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/coal_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/coal_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/diamond_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/diamond_basalt_ore.json new file mode 100644 index 0000000..a0a3777 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/diamond_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/diamond_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/emerald_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/emerald_basalt_ore.json new file mode 100644 index 0000000..4c8ace1 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/emerald_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/emerald_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/gold_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/gold_basalt_ore.json new file mode 100644 index 0000000..12e73be --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/gold_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/gold_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/iron_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/iron_basalt_ore.json new file mode 100644 index 0000000..fab527c --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/iron_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/iron_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/lapis_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/lapis_basalt_ore.json new file mode 100644 index 0000000..86603f6 --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/lapis_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/lapis_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/models/item/redstone_basalt_ore.json b/src/main/resources/assets/janoeo/models/item/redstone_basalt_ore.json new file mode 100644 index 0000000..fe697bb --- /dev/null +++ b/src/main/resources/assets/janoeo/models/item/redstone_basalt_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "janoeo:block/redstone_basalt_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/coal_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/coal_basalt_ore_side.png new file mode 100644 index 0000000..8c0b53e Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/coal_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/coal_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/coal_basalt_ore_top.png new file mode 100644 index 0000000..483a9b4 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/coal_basalt_ore_top.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/diamond_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/diamond_basalt_ore_side.png new file mode 100644 index 0000000..4a1e51c Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/diamond_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/diamond_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/diamond_basalt_ore_top.png new file mode 100644 index 0000000..df5bbf0 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/diamond_basalt_ore_top.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/emerald_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/emerald_basalt_ore_side.png new file mode 100644 index 0000000..242f38a Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/emerald_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/emerald_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/emerald_basalt_ore_top.png new file mode 100644 index 0000000..7e753b1 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/emerald_basalt_ore_top.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/gold_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/gold_basalt_ore_side.png new file mode 100644 index 0000000..8350278 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/gold_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/gold_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/gold_basalt_ore_top.png new file mode 100644 index 0000000..648554a Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/gold_basalt_ore_top.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/iron_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/iron_basalt_ore_side.png new file mode 100644 index 0000000..7d3328f Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/iron_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/iron_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/iron_basalt_ore_top.png new file mode 100644 index 0000000..e6d781b Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/iron_basalt_ore_top.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/lapis_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/lapis_basalt_ore_side.png new file mode 100644 index 0000000..1a2dec8 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/lapis_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/lapis_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/lapis_basalt_ore_top.png new file mode 100644 index 0000000..c3afd09 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/lapis_basalt_ore_top.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/redstone_basalt_ore_side.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/redstone_basalt_ore_side.png new file mode 100644 index 0000000..d0b9a14 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/redstone_basalt_ore_side.png differ diff --git a/src/main/resources/assets/janoeo/textures/block/nether/basalt/redstone_basalt_ore_top.png b/src/main/resources/assets/janoeo/textures/block/nether/basalt/redstone_basalt_ore_top.png new file mode 100644 index 0000000..75ea255 Binary files /dev/null and b/src/main/resources/assets/janoeo/textures/block/nether/basalt/redstone_basalt_ore_top.png differ diff --git a/src/main/resources/data/forge/tags/blocks/ores/coal.json b/src/main/resources/data/forge/tags/blocks/ores/coal.json index f032744..94fbb5f 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/coal.json +++ b/src/main/resources/data/forge/tags/blocks/ores/coal.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:coal_nether_ore", - "janoeo:coal_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:coal_nether_ore", + "janoeo:coal_end_ore", + "janoeo:coal_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/diamond.json b/src/main/resources/data/forge/tags/blocks/ores/diamond.json index 7ec094f..3c4894b 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/diamond.json +++ b/src/main/resources/data/forge/tags/blocks/ores/diamond.json @@ -3,6 +3,7 @@ "values": [ "janoeo:diamond_nether_ore", "janoeo:diamond_end_ore", - "janoeo:diamond_gravel_ore" + "janoeo:diamond_gravel_ore", + "janoeo:diamond_basalt_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/emerald.json b/src/main/resources/data/forge/tags/blocks/ores/emerald.json index 3bdb715..37b5e2a 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/emerald.json +++ b/src/main/resources/data/forge/tags/blocks/ores/emerald.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:emerald_nether_ore", - "janoeo:emerald_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:emerald_nether_ore", + "janoeo:emerald_end_ore", + "janoeo:emerald_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/gold.json b/src/main/resources/data/forge/tags/blocks/ores/gold.json index 9ed1d21..53f5e80 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/gold.json +++ b/src/main/resources/data/forge/tags/blocks/ores/gold.json @@ -3,6 +3,7 @@ "values": [ "janoeo:gold_nether_ore", "janoeo:gold_end_ore", - "janoeo:gold_gravel_ore" + "janoeo:gold_gravel_ore", + "janoeo:gold_basalt_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/iron.json b/src/main/resources/data/forge/tags/blocks/ores/iron.json index 9c242f5..c95713a 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/iron.json +++ b/src/main/resources/data/forge/tags/blocks/ores/iron.json @@ -3,6 +3,7 @@ "values": [ "janoeo:iron_nether_ore", "janoeo:iron_end_ore", - "janoeo:iron_gravel_ore" + "janoeo:iron_gravel_ore", + "janoeo:iron_basalt_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/lapis.json b/src/main/resources/data/forge/tags/blocks/ores/lapis.json index 313297c..9d2fe6d 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/lapis.json +++ b/src/main/resources/data/forge/tags/blocks/ores/lapis.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:lapis_nether_ore", - "janoeo:lapis_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:lapis_nether_ore", + "janoeo:lapis_end_ore", + "janoeo:lapis_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/redstone.json b/src/main/resources/data/forge/tags/blocks/ores/redstone.json index 722918e..dfe60f8 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/redstone.json +++ b/src/main/resources/data/forge/tags/blocks/ores/redstone.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:redstone_nether_ore", - "janoeo:redstone_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:redstone_nether_ore", + "janoeo:redstone_end_ore", + "janoeo:redstone_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/coal.json b/src/main/resources/data/forge/tags/items/ores/coal.json index f032744..94fbb5f 100644 --- a/src/main/resources/data/forge/tags/items/ores/coal.json +++ b/src/main/resources/data/forge/tags/items/ores/coal.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:coal_nether_ore", - "janoeo:coal_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:coal_nether_ore", + "janoeo:coal_end_ore", + "janoeo:coal_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/diamond.json b/src/main/resources/data/forge/tags/items/ores/diamond.json index 7ec094f..3c4894b 100644 --- a/src/main/resources/data/forge/tags/items/ores/diamond.json +++ b/src/main/resources/data/forge/tags/items/ores/diamond.json @@ -3,6 +3,7 @@ "values": [ "janoeo:diamond_nether_ore", "janoeo:diamond_end_ore", - "janoeo:diamond_gravel_ore" + "janoeo:diamond_gravel_ore", + "janoeo:diamond_basalt_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/emerald.json b/src/main/resources/data/forge/tags/items/ores/emerald.json index 3bdb715..37b5e2a 100644 --- a/src/main/resources/data/forge/tags/items/ores/emerald.json +++ b/src/main/resources/data/forge/tags/items/ores/emerald.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:emerald_nether_ore", - "janoeo:emerald_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:emerald_nether_ore", + "janoeo:emerald_end_ore", + "janoeo:emerald_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/gold.json b/src/main/resources/data/forge/tags/items/ores/gold.json index 9ed1d21..53f5e80 100644 --- a/src/main/resources/data/forge/tags/items/ores/gold.json +++ b/src/main/resources/data/forge/tags/items/ores/gold.json @@ -3,6 +3,7 @@ "values": [ "janoeo:gold_nether_ore", "janoeo:gold_end_ore", - "janoeo:gold_gravel_ore" + "janoeo:gold_gravel_ore", + "janoeo:gold_basalt_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/iron.json b/src/main/resources/data/forge/tags/items/ores/iron.json index 9c242f5..c95713a 100644 --- a/src/main/resources/data/forge/tags/items/ores/iron.json +++ b/src/main/resources/data/forge/tags/items/ores/iron.json @@ -3,6 +3,7 @@ "values": [ "janoeo:iron_nether_ore", "janoeo:iron_end_ore", - "janoeo:iron_gravel_ore" + "janoeo:iron_gravel_ore", + "janoeo:iron_basalt_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/lapis.json b/src/main/resources/data/forge/tags/items/ores/lapis.json index 313297c..9d2fe6d 100644 --- a/src/main/resources/data/forge/tags/items/ores/lapis.json +++ b/src/main/resources/data/forge/tags/items/ores/lapis.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:lapis_nether_ore", - "janoeo:lapis_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:lapis_nether_ore", + "janoeo:lapis_end_ore", + "janoeo:lapis_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/redstone.json b/src/main/resources/data/forge/tags/items/ores/redstone.json index 722918e..dfe60f8 100644 --- a/src/main/resources/data/forge/tags/items/ores/redstone.json +++ b/src/main/resources/data/forge/tags/items/ores/redstone.json @@ -1,7 +1,8 @@ -{ - "replace": false, - "values": [ - "janoeo:redstone_nether_ore", - "janoeo:redstone_end_ore" - ] +{ + "replace": false, + "values": [ + "janoeo:redstone_nether_ore", + "janoeo:redstone_end_ore", + "janoeo:redstone_basalt_ore" + ] } \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/coal_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/coal_basalt_blasting.json new file mode 100644 index 0000000..e754d96 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/coal_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:coal_basalt_blasting" + ] + }, + "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": "minecraft:coal_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_coal_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/coal_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/coal_basalt_smelting.json new file mode 100644 index 0000000..9152967 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/coal_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:coal_basalt_smelting" + ] + }, + "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": "minecraft:coal_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_coal_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/diamond_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/diamond_basalt_blasting.json new file mode 100644 index 0000000..a319da2 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/diamond_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diamond_basalt_blasting" + ] + }, + "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": "minecraft:diamond_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_diamond_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/diamond_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/diamond_basalt_smelting.json new file mode 100644 index 0000000..c96519c --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/diamond_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diamond_basalt_smelting" + ] + }, + "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": "minecraft:diamond_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_diamond_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/emerald_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/emerald_basalt_blasting.json new file mode 100644 index 0000000..c648f61 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/emerald_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:emerald_basalt_blasting" + ] + }, + "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": "minecraft:emerald_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_emerald_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/emerald_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/emerald_basalt_smelting.json new file mode 100644 index 0000000..ca41a64 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/emerald_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:emerald_basalt_smelting" + ] + }, + "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": "minecraft:emerald_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_emerald_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/gold_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/gold_basalt_blasting.json new file mode 100644 index 0000000..10c03e0 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/gold_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:gold_basalt_blasting" + ] + }, + "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": "minecraft:gold_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_gold_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/gold_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/gold_basalt_smelting.json new file mode 100644 index 0000000..a7b89de --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/gold_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:gold_basalt_smelting" + ] + }, + "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": "minecraft:gold_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_gold_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/iron_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/iron_basalt_blasting.json new file mode 100644 index 0000000..2ec48f8 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/iron_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:iron_basalt_blasting" + ] + }, + "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": "minecraft:iron_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_iron_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/iron_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/iron_basalt_smelting.json new file mode 100644 index 0000000..d87c3d2 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/iron_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:iron_basalt_smelting" + ] + }, + "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": "minecraft:iron_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_iron_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/lapis_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/lapis_basalt_blasting.json new file mode 100644 index 0000000..094adfd --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/lapis_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lapis_basalt_blasting" + ] + }, + "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": "minecraft:lapis_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_lapis_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/misc/lapis_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/misc/lapis_basalt_smelting.json new file mode 100644 index 0000000..d2d0580 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/misc/lapis_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lapis_basalt_smelting" + ] + }, + "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": "minecraft:lapis_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_lapis_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/redstone/redstone_basalt_blasting.json b/src/main/resources/data/janoeo/advancements/recipes/redstone/redstone_basalt_blasting.json new file mode 100644 index 0000000..a3e335d --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/redstone/redstone_basalt_blasting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:redstone_basalt_blasting" + ] + }, + "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": "minecraft:redstone_basalt_blasting" + } + } + }, + "requirements": [ + [ + "has_basalt_redstone_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/advancements/recipes/redstone/redstone_basalt_smelting.json b/src/main/resources/data/janoeo/advancements/recipes/redstone/redstone_basalt_smelting.json new file mode 100644 index 0000000..bc2e796 --- /dev/null +++ b/src/main/resources/data/janoeo/advancements/recipes/redstone/redstone_basalt_smelting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:redstone_basalt_smelting" + ] + }, + "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": "minecraft:redstone_basalt_smelting" + } + } + }, + "requirements": [ + [ + "has_basalt_redstone_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/coal_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/coal_basalt_ore.json new file mode 100644 index 0000000..d9dd3c2 --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/coal_basalt_ore.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "janoeo:coal_basalt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:coal" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/diamond_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/diamond_basalt_ore.json new file mode 100644 index 0000000..50546a5 --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/diamond_basalt_ore.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "janoeo:diamond_basalt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:diamond" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/emerald_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/emerald_basalt_ore.json new file mode 100644 index 0000000..2d704fb --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/emerald_basalt_ore.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "janoeo:emerald_basalt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:emerald" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/gold_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/gold_basalt_ore.json new file mode 100644 index 0000000..443c98e --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/gold_basalt_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "janoeo:gold_basalt_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/iron_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/iron_basalt_ore.json new file mode 100644 index 0000000..a39d1ea --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/iron_basalt_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "janoeo:iron_basalt_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/lapis_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/lapis_basalt_ore.json new file mode 100644 index 0000000..0f70f5d --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/lapis_basalt_ore.json @@ -0,0 +1,56 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "janoeo:lapis_basalt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4.0, + "max": 9.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:lapis_lazuli" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/loot_tables/blocks/redstone_basalt_ore.json b/src/main/resources/data/janoeo/loot_tables/blocks/redstone_basalt_ore.json new file mode 100644 index 0000000..db79e19 --- /dev/null +++ b/src/main/resources/data/janoeo/loot_tables/blocks/redstone_basalt_ore.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "janoeo:redstone_basalt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4.0, + "max": 5.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 1 + } + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:redstone" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo/recipes/coal_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/coal_basalt_blasting.json new file mode 100644 index 0000000..8128c79 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/coal_basalt_blasting.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/main/resources/data/janoeo/recipes/coal_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/coal_basalt_smelting.json new file mode 100644 index 0000000..778a6c9 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/coal_basalt_smelting.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/main/resources/data/janoeo/recipes/diamond_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/diamond_basalt_blasting.json new file mode 100644 index 0000000..c51d8a6 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/diamond_basalt_blasting.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/main/resources/data/janoeo/recipes/diamond_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/diamond_basalt_smelting.json new file mode 100644 index 0000000..8674375 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/diamond_basalt_smelting.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/main/resources/data/janoeo/recipes/emerald_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/emerald_basalt_blasting.json new file mode 100644 index 0000000..1610f95 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/emerald_basalt_blasting.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/main/resources/data/janoeo/recipes/emerald_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/emerald_basalt_smelting.json new file mode 100644 index 0000000..475db75 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/emerald_basalt_smelting.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/main/resources/data/janoeo/recipes/gold_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/gold_basalt_blasting.json new file mode 100644 index 0000000..14f529c --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/gold_basalt_blasting.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/main/resources/data/janoeo/recipes/gold_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/gold_basalt_smelting.json new file mode 100644 index 0000000..9b25223 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/gold_basalt_smelting.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/main/resources/data/janoeo/recipes/iron_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/iron_basalt_blasting.json new file mode 100644 index 0000000..e43565e --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/iron_basalt_blasting.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/main/resources/data/janoeo/recipes/iron_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/iron_basalt_smelting.json new file mode 100644 index 0000000..d90b642 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/iron_basalt_smelting.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/main/resources/data/janoeo/recipes/lapis_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/lapis_basalt_blasting.json new file mode 100644 index 0000000..50187dc --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/lapis_basalt_blasting.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/main/resources/data/janoeo/recipes/lapis_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/lapis_basalt_smelting.json new file mode 100644 index 0000000..e4cf2e8 --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/lapis_basalt_smelting.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/main/resources/data/janoeo/recipes/redstone_basalt_blasting.json b/src/main/resources/data/janoeo/recipes/redstone_basalt_blasting.json new file mode 100644 index 0000000..021a5aa --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/redstone_basalt_blasting.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/main/resources/data/janoeo/recipes/redstone_basalt_smelting.json b/src/main/resources/data/janoeo/recipes/redstone_basalt_smelting.json new file mode 100644 index 0000000..520be0f --- /dev/null +++ b/src/main/resources/data/janoeo/recipes/redstone_basalt_smelting.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/textures/bazalt_ore/basalt_aluminium_ore_side.png b/textures/bazalt_ore/basalt_aluminium_ore_side.png new file mode 100644 index 0000000..e70b1ce Binary files /dev/null and b/textures/bazalt_ore/basalt_aluminium_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_aluminium_ore_top.png b/textures/bazalt_ore/basalt_aluminium_ore_top.png new file mode 100644 index 0000000..5a8730f Binary files /dev/null and b/textures/bazalt_ore/basalt_aluminium_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_coal_ore_side.png b/textures/bazalt_ore/basalt_coal_ore_side.png new file mode 100644 index 0000000..8c0b53e Binary files /dev/null and b/textures/bazalt_ore/basalt_coal_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_coal_ore_top.png b/textures/bazalt_ore/basalt_coal_ore_top.png new file mode 100644 index 0000000..483a9b4 Binary files /dev/null and b/textures/bazalt_ore/basalt_coal_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_copper_ore_side.png b/textures/bazalt_ore/basalt_copper_ore_side.png new file mode 100644 index 0000000..e7f4933 Binary files /dev/null and b/textures/bazalt_ore/basalt_copper_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_copper_ore_top.png b/textures/bazalt_ore/basalt_copper_ore_top.png new file mode 100644 index 0000000..eeb55b0 Binary files /dev/null and b/textures/bazalt_ore/basalt_copper_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_diamond_ore_side.png b/textures/bazalt_ore/basalt_diamond_ore_side.png new file mode 100644 index 0000000..4a1e51c Binary files /dev/null and b/textures/bazalt_ore/basalt_diamond_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_diamond_ore_top.png b/textures/bazalt_ore/basalt_diamond_ore_top.png new file mode 100644 index 0000000..df5bbf0 Binary files /dev/null and b/textures/bazalt_ore/basalt_diamond_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_emerald_ore_side.png b/textures/bazalt_ore/basalt_emerald_ore_side.png new file mode 100644 index 0000000..242f38a Binary files /dev/null and b/textures/bazalt_ore/basalt_emerald_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_emerald_ore_top.png b/textures/bazalt_ore/basalt_emerald_ore_top.png new file mode 100644 index 0000000..7e753b1 Binary files /dev/null and b/textures/bazalt_ore/basalt_emerald_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_gold_ore_side.png b/textures/bazalt_ore/basalt_gold_ore_side.png new file mode 100644 index 0000000..8350278 Binary files /dev/null and b/textures/bazalt_ore/basalt_gold_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_gold_ore_top.png b/textures/bazalt_ore/basalt_gold_ore_top.png new file mode 100644 index 0000000..648554a Binary files /dev/null and b/textures/bazalt_ore/basalt_gold_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_iron_ore_side.png b/textures/bazalt_ore/basalt_iron_ore_side.png new file mode 100644 index 0000000..7d3328f Binary files /dev/null and b/textures/bazalt_ore/basalt_iron_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_iron_ore_top.png b/textures/bazalt_ore/basalt_iron_ore_top.png new file mode 100644 index 0000000..e6d781b Binary files /dev/null and b/textures/bazalt_ore/basalt_iron_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_lapis_ore_side.png b/textures/bazalt_ore/basalt_lapis_ore_side.png new file mode 100644 index 0000000..1a2dec8 Binary files /dev/null and b/textures/bazalt_ore/basalt_lapis_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_lapis_ore_top.png b/textures/bazalt_ore/basalt_lapis_ore_top.png new file mode 100644 index 0000000..c3afd09 Binary files /dev/null and b/textures/bazalt_ore/basalt_lapis_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_lead_ore_side.png b/textures/bazalt_ore/basalt_lead_ore_side.png new file mode 100644 index 0000000..6addade Binary files /dev/null and b/textures/bazalt_ore/basalt_lead_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_lead_ore_top.png b/textures/bazalt_ore/basalt_lead_ore_top.png new file mode 100644 index 0000000..efe4c8c Binary files /dev/null and b/textures/bazalt_ore/basalt_lead_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_nickel_ore_side.png b/textures/bazalt_ore/basalt_nickel_ore_side.png new file mode 100644 index 0000000..5d458ed Binary files /dev/null and b/textures/bazalt_ore/basalt_nickel_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_nickel_ore_top.png b/textures/bazalt_ore/basalt_nickel_ore_top.png new file mode 100644 index 0000000..214d3a5 Binary files /dev/null and b/textures/bazalt_ore/basalt_nickel_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_platinium_ore_side.png b/textures/bazalt_ore/basalt_platinium_ore_side.png new file mode 100644 index 0000000..849be84 Binary files /dev/null and b/textures/bazalt_ore/basalt_platinium_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_platinium_ore_top.png b/textures/bazalt_ore/basalt_platinium_ore_top.png new file mode 100644 index 0000000..435e755 Binary files /dev/null and b/textures/bazalt_ore/basalt_platinium_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_redstone_ore_side.png b/textures/bazalt_ore/basalt_redstone_ore_side.png new file mode 100644 index 0000000..d0b9a14 Binary files /dev/null and b/textures/bazalt_ore/basalt_redstone_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_redstone_ore_top.png b/textures/bazalt_ore/basalt_redstone_ore_top.png new file mode 100644 index 0000000..75ea255 Binary files /dev/null and b/textures/bazalt_ore/basalt_redstone_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_ruby_ore_side.png b/textures/bazalt_ore/basalt_ruby_ore_side.png new file mode 100644 index 0000000..16cd1dc Binary files /dev/null and b/textures/bazalt_ore/basalt_ruby_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_ruby_ore_top.png b/textures/bazalt_ore/basalt_ruby_ore_top.png new file mode 100644 index 0000000..a81234c Binary files /dev/null and b/textures/bazalt_ore/basalt_ruby_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_sapphire_ore_side.png b/textures/bazalt_ore/basalt_sapphire_ore_side.png new file mode 100644 index 0000000..137a738 Binary files /dev/null and b/textures/bazalt_ore/basalt_sapphire_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_sapphire_ore_top.png b/textures/bazalt_ore/basalt_sapphire_ore_top.png new file mode 100644 index 0000000..a470057 Binary files /dev/null and b/textures/bazalt_ore/basalt_sapphire_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_silver_ore_side.png b/textures/bazalt_ore/basalt_silver_ore_side.png new file mode 100644 index 0000000..2702751 Binary files /dev/null and b/textures/bazalt_ore/basalt_silver_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_silver_ore_top.png b/textures/bazalt_ore/basalt_silver_ore_top.png new file mode 100644 index 0000000..f5c4199 Binary files /dev/null and b/textures/bazalt_ore/basalt_silver_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_tin_ore_side.png b/textures/bazalt_ore/basalt_tin_ore_side.png new file mode 100644 index 0000000..9b7a709 Binary files /dev/null and b/textures/bazalt_ore/basalt_tin_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_tin_ore_top.png b/textures/bazalt_ore/basalt_tin_ore_top.png new file mode 100644 index 0000000..bb403c0 Binary files /dev/null and b/textures/bazalt_ore/basalt_tin_ore_top.png differ diff --git a/textures/bazalt_ore/basalt_uranium_ore_side.png b/textures/bazalt_ore/basalt_uranium_ore_side.png new file mode 100644 index 0000000..643de67 Binary files /dev/null and b/textures/bazalt_ore/basalt_uranium_ore_side.png differ diff --git a/textures/bazalt_ore/basalt_uranium_ore_top.png b/textures/bazalt_ore/basalt_uranium_ore_top.png new file mode 100644 index 0000000..5a35ceb Binary files /dev/null and b/textures/bazalt_ore/basalt_uranium_ore_top.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_aluminium_ore.png b/textures/soulsand_ore/dense_soul_sand_aluminium_ore.png new file mode 100644 index 0000000..3db49ab Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_aluminium_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_coal_ore.png b/textures/soulsand_ore/dense_soul_sand_coal_ore.png new file mode 100644 index 0000000..3566949 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_coal_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_copper_ore.png b/textures/soulsand_ore/dense_soul_sand_copper_ore.png new file mode 100644 index 0000000..e9b9bd5 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_copper_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_diamond_ore.png b/textures/soulsand_ore/dense_soul_sand_diamond_ore.png new file mode 100644 index 0000000..4433eca Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_diamond_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_emerald_ore.png b/textures/soulsand_ore/dense_soul_sand_emerald_ore.png new file mode 100644 index 0000000..7a0245e Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_emerald_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_gold_ore.png b/textures/soulsand_ore/dense_soul_sand_gold_ore.png new file mode 100644 index 0000000..11861a3 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_gold_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_iron_ore.png b/textures/soulsand_ore/dense_soul_sand_iron_ore.png new file mode 100644 index 0000000..b24ca06 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_iron_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_lapis_ore.png b/textures/soulsand_ore/dense_soul_sand_lapis_ore.png new file mode 100644 index 0000000..ed166c3 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_lapis_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_lead_ore.png b/textures/soulsand_ore/dense_soul_sand_lead_ore.png new file mode 100644 index 0000000..7d7734f Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_lead_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_nickel_ore.png b/textures/soulsand_ore/dense_soul_sand_nickel_ore.png new file mode 100644 index 0000000..8907de5 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_nickel_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_platinium_ore.png b/textures/soulsand_ore/dense_soul_sand_platinium_ore.png new file mode 100644 index 0000000..9d8935a Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_platinium_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_quartz_ore.png b/textures/soulsand_ore/dense_soul_sand_quartz_ore.png new file mode 100644 index 0000000..abdead3 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_quartz_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_redstone_ore.png b/textures/soulsand_ore/dense_soul_sand_redstone_ore.png new file mode 100644 index 0000000..77f3faa Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_redstone_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_ruby_ore.png b/textures/soulsand_ore/dense_soul_sand_ruby_ore.png new file mode 100644 index 0000000..3fcc5d8 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_ruby_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_sapphire_ore.png b/textures/soulsand_ore/dense_soul_sand_sapphire_ore.png new file mode 100644 index 0000000..a3df4b3 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_sapphire_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_silver_ore.png b/textures/soulsand_ore/dense_soul_sand_silver_ore.png new file mode 100644 index 0000000..ec423d8 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_silver_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_tin_ore.png b/textures/soulsand_ore/dense_soul_sand_tin_ore.png new file mode 100644 index 0000000..c567708 Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_tin_ore.png differ diff --git a/textures/soulsand_ore/dense_soul_sand_uranium_ore.png b/textures/soulsand_ore/dense_soul_sand_uranium_ore.png new file mode 100644 index 0000000..29df3da Binary files /dev/null and b/textures/soulsand_ore/dense_soul_sand_uranium_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_aluminium_ore.png b/textures/soulsand_ore/soul_sand_aluminium_ore.png new file mode 100644 index 0000000..81ef29a Binary files /dev/null and b/textures/soulsand_ore/soul_sand_aluminium_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_coal_ore.png b/textures/soulsand_ore/soul_sand_coal_ore.png new file mode 100644 index 0000000..bb03709 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_coal_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_copper_ore.png b/textures/soulsand_ore/soul_sand_copper_ore.png new file mode 100644 index 0000000..959620b Binary files /dev/null and b/textures/soulsand_ore/soul_sand_copper_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_diamond_ore.png b/textures/soulsand_ore/soul_sand_diamond_ore.png new file mode 100644 index 0000000..1f3138c Binary files /dev/null and b/textures/soulsand_ore/soul_sand_diamond_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_emerald_ore.png b/textures/soulsand_ore/soul_sand_emerald_ore.png new file mode 100644 index 0000000..63a4d5f Binary files /dev/null and b/textures/soulsand_ore/soul_sand_emerald_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_gold_ore.png b/textures/soulsand_ore/soul_sand_gold_ore.png new file mode 100644 index 0000000..6b7a61e Binary files /dev/null and b/textures/soulsand_ore/soul_sand_gold_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_iron_ore.png b/textures/soulsand_ore/soul_sand_iron_ore.png new file mode 100644 index 0000000..b323617 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_iron_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_lapis_ore.png b/textures/soulsand_ore/soul_sand_lapis_ore.png new file mode 100644 index 0000000..e2b68ff Binary files /dev/null and b/textures/soulsand_ore/soul_sand_lapis_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_lead_ore.png b/textures/soulsand_ore/soul_sand_lead_ore.png new file mode 100644 index 0000000..75aaca1 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_lead_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_nickel_ore.png b/textures/soulsand_ore/soul_sand_nickel_ore.png new file mode 100644 index 0000000..96725f9 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_nickel_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_platiniuml_ore.png b/textures/soulsand_ore/soul_sand_platiniuml_ore.png new file mode 100644 index 0000000..40e96b5 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_platiniuml_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_redstone_ore.png b/textures/soulsand_ore/soul_sand_redstone_ore.png new file mode 100644 index 0000000..fcc1c89 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_redstone_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_ruby_ore.png b/textures/soulsand_ore/soul_sand_ruby_ore.png new file mode 100644 index 0000000..9477d32 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_ruby_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_sapphire_ore.png b/textures/soulsand_ore/soul_sand_sapphire_ore.png new file mode 100644 index 0000000..e01d247 Binary files /dev/null and b/textures/soulsand_ore/soul_sand_sapphire_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_silver_ore.png b/textures/soulsand_ore/soul_sand_silver_ore.png new file mode 100644 index 0000000..ad6e54a Binary files /dev/null and b/textures/soulsand_ore/soul_sand_silver_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_tin_ore.png b/textures/soulsand_ore/soul_sand_tin_ore.png new file mode 100644 index 0000000..b75a8aa Binary files /dev/null and b/textures/soulsand_ore/soul_sand_tin_ore.png differ diff --git a/textures/soulsand_ore/soul_sand_uranium_ore.png b/textures/soulsand_ore/soul_sand_uranium_ore.png new file mode 100644 index 0000000..46b3a2c Binary files /dev/null and b/textures/soulsand_ore/soul_sand_uranium_ore.png differ