From a15d7c5569c2bf689f6a943c3b20360abeb89b7c Mon Sep 17 00:00:00 2001 From: attack8 Date: Tue, 19 Mar 2024 20:13:45 -0400 Subject: [PATCH 1/7] More Mod Compat 1 - Add Galosphere stone recipes like the Create stones - Add Elementary Ores compat - Add Infernal Expansion path pressing recipes --- build.gradle | 4 + src/generated/resources/.cache/cache | 131 +++++++++++------- .../compat/elementaryores/ore_coal_end.json | 32 +++++ .../elementaryores/ore_coal_nether.json | 32 +++++ .../compat/elementaryores/ore_copper_end.json | 33 +++++ .../elementaryores/ore_copper_nether.json | 33 +++++ .../elementaryores/ore_diamond_end.json | 32 +++++ .../elementaryores/ore_diamond_nether.json | 32 +++++ .../elementaryores/ore_emerald_end.json | 32 +++++ .../elementaryores/ore_emerald_nether.json | 32 +++++ .../compat/elementaryores/ore_ender_end.json | 32 +++++ .../elementaryores/ore_ghast_nether.json | 32 +++++ .../compat/elementaryores/ore_iron_end.json | 32 +++++ .../elementaryores/ore_iron_nether.json | 32 +++++ .../compat/elementaryores/ore_lapis_end.json | 33 +++++ .../elementaryores/ore_lapis_nether.json | 33 +++++ .../elementaryores/ore_redstone_end.json | 33 +++++ .../elementaryores/ore_redstone_nether.json | 33 +++++ .../crushing/compat/galosphere/allurite.json | 22 +++ .../crushing/compat/galosphere/amethyst.json | 22 +++ .../crushing/compat/galosphere/lumiere.json | 22 +++ .../crushing/compat/silentgems/agate_ore.json | 4 + .../compat/silentgems/alexandrite_ore.json | 4 + .../crushing/compat/silentgems/amber_ore.json | 4 + .../compat/silentgems/amethyst_ore.json | 4 + .../compat/silentgems/ametrine_ore.json | 4 + .../compat/silentgems/ammolite_ore.json | 4 + .../compat/silentgems/apatite_ore.json | 4 + .../compat/silentgems/aquamarine_ore.json | 4 + .../compat/silentgems/beniotite_ore.json | 4 + .../compat/silentgems/black_diamond_ore.json | 4 + .../compat/silentgems/carnelian_ore.json | 4 + .../compat/silentgems/cats_eye_ore.json | 4 + .../compat/silentgems/chrysoprase_ore.json | 4 + .../compat/silentgems/citrine_ore.json | 4 + .../crushing/compat/silentgems/coral_ore.json | 4 + .../compat/silentgems/eculase_ore.json | 4 + .../compat/silentgems/flourite_ore.json | 4 + .../compat/silentgems/garnet_ore.json | 4 + .../compat/silentgems/green_sapphire_ore.json | 4 + .../compat/silentgems/helidor_ore.json | 4 + .../compat/silentgems/iolite_ore.json | 4 + .../crushing/compat/silentgems/jade_ore.json | 4 + .../compat/silentgems/jasper_ore.json | 4 + .../compat/silentgems/kunzite_ore.json | 4 + .../compat/silentgems/kyanite_ore.json | 4 + .../compat/silentgems/lepidolite_ore.json | 4 + .../compat/silentgems/malachite_ore.json | 4 + .../compat/silentgems/moldavite_ore.json | 4 + .../compat/silentgems/moonstone_ore.json | 4 + .../compat/silentgems/morganite_ore.json | 4 + .../crushing/compat/silentgems/onyx_ore.json | 4 + .../crushing/compat/silentgems/opal_ore.json | 4 + .../crushing/compat/silentgems/pearl_ore.json | 4 + .../compat/silentgems/peridot_ore.json | 4 + .../silentgems/phosphophyllite_ore.json | 4 + .../compat/silentgems/pyrope_ore.json | 4 + .../compat/silentgems/rose_quartz_ore.json | 4 + .../crushing/compat/silentgems/ruby_ore.json | 4 + .../compat/silentgems/sapphire_ore.json | 4 + .../compat/silentgems/sodalite_ore.json | 4 + .../compat/silentgems/spinel_ore.json | 4 + .../compat/silentgems/sunstone_ore.json | 4 + .../compat/silentgems/tanzite_ore.json | 4 + .../compat/silentgems/tektite_ore.json | 4 + .../crushing/compat/silentgems/topaz_ore.json | 4 + .../compat/silentgems/turquoise_ore.json | 4 + .../compat/silentgems/yellow_diamond_ore.json | 4 + .../compat/silentgems/zircon_ore.json | 4 + .../crushing/compat/thermal/apatite_ore.json | 4 + .../crushing/compat/thermal/cinnabar_ore.json | 4 + .../crushing/compat/thermal/niter_ore.json | 4 + .../crushing/compat/thermal/sulfur_ore.json | 4 + .../compat/alexsmobs/lava_bottle.json | 2 +- .../infernalexp/crimson_nylium_path.json | 19 +++ .../compat/infernalexp/soul_soil_path.json | 19 +++ .../infernalexp/warped_nylium_path.json | 19 +++ .../stone_types/galosphere/allurite.json | 45 ++++++ .../stone_types/galosphere/amethyst.json | 45 ++++++ .../items/stone_types/galosphere/lumiere.json | 45 ++++++ .../java/com/simibubi/create/AllTags.java | 10 +- .../create/foundation/data/TagGen.java | 4 +- .../data/recipe/CrushingRecipeGen.java | 65 ++++++++- .../create/foundation/data/recipe/Mods.java | 1 + .../data/recipe/PressingRecipeGen.java | 14 +- .../data/CreateRegistrateTags.java | 28 +++- 86 files changed, 1181 insertions(+), 62 deletions(-) create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ender_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ghast_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/galosphere/allurite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/galosphere/amethyst.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/galosphere/lumiere.json create mode 100644 src/generated/resources/data/create/recipes/pressing/compat/infernalexp/crimson_nylium_path.json create mode 100644 src/generated/resources/data/create/recipes/pressing/compat/infernalexp/soul_soil_path.json create mode 100644 src/generated/resources/data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json create mode 100644 src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json create mode 100644 src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json create mode 100644 src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json diff --git a/build.gradle b/build.gradle index 51000d1ce..59d59a6f0 100644 --- a/build.gradle +++ b/build.gradle @@ -197,6 +197,10 @@ dependencies { // implementation fg.deobf("curse.maven:ic2-classic-242942:4563059") // implementation fg.deobf("curse.maven:druidcraft-340991:3101903") // implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.16.5:0.10.0-Beta25") + // runtimeOnly fg.deobf("curse.maven:galosphere-631098:4398234") + // runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:3956498") + // runtimeOnly fg.deobf("curse.maven:flib-661261:3956196") + // runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:3854062") // runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69") // runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984") // runtimeOnly fg.deobf("slimeknights.mantle:Mantle:1.16.5-1.6.115") diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1f49b621b..cc5939136 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -4190,64 +4190,83 @@ e2c92c797fbff8bb847cb56c0b65b1f8667b794a data/create/recipes/crushing/compat/byg a9be98a532df5f5ec972e959c1dc81d4b361ca7b data/create/recipes/crushing/compat/druidcraft/amber_ore.json edfb534be6fff8d0ae3508738a87c0479bb4e214 data/create/recipes/crushing/compat/druidcraft/fiery_glass_ore.json ef992bff354d7bcb7e9729b00e1bd3014cbbe901 data/create/recipes/crushing/compat/druidcraft/moonstone_ore.json +5481f27964f5eb0fee1ea74ef99c454a1a71a146 data/create/recipes/crushing/compat/elementaryores/ore_coal_end.json +2381e37e2b84b15b7347665c069cbc82d420b8f6 data/create/recipes/crushing/compat/elementaryores/ore_coal_nether.json +ac10e027dbb487c9f2a9a72f47fb220ffe07b4c7 data/create/recipes/crushing/compat/elementaryores/ore_copper_end.json +9bbc670ec7aaff708d9c4d682a894047ab2a9f8d data/create/recipes/crushing/compat/elementaryores/ore_copper_nether.json +3fe750061b89d0ab16d6b704dfcbb8a89087dab1 data/create/recipes/crushing/compat/elementaryores/ore_diamond_end.json +cba5fe7feeca25fac4f29433f86740fa8ef21ba9 data/create/recipes/crushing/compat/elementaryores/ore_diamond_nether.json +27efa428d4287595c7808ecd830a0666ee0474e7 data/create/recipes/crushing/compat/elementaryores/ore_emerald_end.json +07b07728ac35d0dcd1065bf7f1586e8647c7cea5 data/create/recipes/crushing/compat/elementaryores/ore_emerald_nether.json +9387ea485058dc5ffdd79609b6d828f8ad3dfad2 data/create/recipes/crushing/compat/elementaryores/ore_ender_end.json +14d42ff469fd287692419396bc76cacb7f4b2c29 data/create/recipes/crushing/compat/elementaryores/ore_ghast_nether.json +b7170d07c510a71095efe1982928dee4c884dfc5 data/create/recipes/crushing/compat/elementaryores/ore_iron_end.json +886ce968cbdcbee9c3aae1ce5deba44c2f6c7d61 data/create/recipes/crushing/compat/elementaryores/ore_iron_nether.json +c4c835cb43f02ab9d3188a290d165cc331bbdb8c data/create/recipes/crushing/compat/elementaryores/ore_lapis_end.json +8513b0f046d3a4592fab6aa2c4d0d88857927873 data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json +a18ff5eb6a8c11c866f159a207d61cd1373ef565 data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json +8b01607b11949fc6848826a5fc4bae9253b0134b data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json +b1db1983cfe1d9573cd00a59a5b3a4a57a470d4d data/create/recipes/crushing/compat/galosphere/allurite.json +7f324629c6285f52e168f8b55097c6e8d927811f data/create/recipes/crushing/compat/galosphere/amethyst.json +c47ad0f5238b8c6a8019bafb09a880b939373ead data/create/recipes/crushing/compat/galosphere/lumiere.json 293ce29b4e3bbef45925a2631641674656cff5ab data/create/recipes/crushing/compat/neapolitan/ice.json 380cde95b19c4b868f9954e29152c6784190c4cb data/create/recipes/crushing/compat/quark/moss_block.json -7deda13b4089c4b58bdc3cc5ca3fed4bed62c6e9 data/create/recipes/crushing/compat/silentgems/agate_ore.json -91ccd2e1d35b48132611c65d44873846d094962f data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json -7b6d99c440e9f8d6885779643a3c898419c42d59 data/create/recipes/crushing/compat/silentgems/amber_ore.json -a63a7e926365fd436ba2b37d20e844e34c78326a data/create/recipes/crushing/compat/silentgems/amethyst_ore.json -e6944f57b4f5c96834879736b0ac69b66e4d6c31 data/create/recipes/crushing/compat/silentgems/ametrine_ore.json -0a001a32f90d467dfd621be0dd46588a602263e1 data/create/recipes/crushing/compat/silentgems/ammolite_ore.json -982b44d50e25d7ec7087a6fcc2efd83ddc2f6ecd data/create/recipes/crushing/compat/silentgems/apatite_ore.json -6af0a67d8af1af909e991ec7f8c67111a6a70a14 data/create/recipes/crushing/compat/silentgems/aquamarine_ore.json -4174fb8af1d029dc1c1bbdb205d9893c0d0551ad data/create/recipes/crushing/compat/silentgems/beniotite_ore.json -571fcb05ddfb57be1ad5e4acbde6a6bbef0f663c data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json -3144ea8b21bb719b767ebb67b3c78351b184ae42 data/create/recipes/crushing/compat/silentgems/carnelian_ore.json -398435664bc7cc482eafe5778813a45a0d2f1f62 data/create/recipes/crushing/compat/silentgems/cats_eye_ore.json -4fcafb98d762d44279e60b7359bd8c2e440f9868 data/create/recipes/crushing/compat/silentgems/chrysoprase_ore.json -ea550bc69c5c7dea45ca607994f236a68150c9de data/create/recipes/crushing/compat/silentgems/citrine_ore.json -2b4ee3678ba5954301e56d849da4d44679ebe009 data/create/recipes/crushing/compat/silentgems/coral_ore.json -3daeff5814ca26751937892efdb975c39a4e5e6c data/create/recipes/crushing/compat/silentgems/eculase_ore.json -f6cff068a1e375cba0569dcc6b515b63cec40d89 data/create/recipes/crushing/compat/silentgems/flourite_ore.json -787735e93a05eda3fcb6d65025b846ee32bd5bc7 data/create/recipes/crushing/compat/silentgems/garnet_ore.json -5c8eb203f369aabeeb9b1095545ccf54a3038337 data/create/recipes/crushing/compat/silentgems/green_sapphire_ore.json -7251b2b3d12c7b46ac40c87d12746f762f3537c0 data/create/recipes/crushing/compat/silentgems/helidor_ore.json -2daf60a0135e998a607eb2911fb2fbc76117b957 data/create/recipes/crushing/compat/silentgems/iolite_ore.json -09edd7a93077f0cdb4a05dc9af7ce2de05f96eba data/create/recipes/crushing/compat/silentgems/jade_ore.json -3280e36e0f89f5894937adaf85a808a2339b608d data/create/recipes/crushing/compat/silentgems/jasper_ore.json -4a62a773d2838b9bd4a1c090a2dfcec0264c231e data/create/recipes/crushing/compat/silentgems/kunzite_ore.json -a627f68e44a4b7680b60e06b6fd84415ba9b93ce data/create/recipes/crushing/compat/silentgems/kyanite_ore.json -b4b6a1e73cd450a0022d708a7efd8237fff217bb data/create/recipes/crushing/compat/silentgems/lepidolite_ore.json -d710bb1c376535a227f14bb87d0fc543e7ec02ac data/create/recipes/crushing/compat/silentgems/malachite_ore.json -81101342dfc9ff12ea96ab692e6e2a3862088a92 data/create/recipes/crushing/compat/silentgems/moldavite_ore.json -9aa2877aa367e097b794924157757c88810396fb data/create/recipes/crushing/compat/silentgems/moonstone_ore.json -017787022648cfa83648e266b3282ef4c8bb9de4 data/create/recipes/crushing/compat/silentgems/morganite_ore.json -37b1f43106ebada6ff08061dc78dd3eabc7141ec data/create/recipes/crushing/compat/silentgems/onyx_ore.json -89de73e9c09067dcc3b985ee4dd19440b7a1ba71 data/create/recipes/crushing/compat/silentgems/opal_ore.json -75566b00bf883fcabe1350fe16bb2c85b700cccb data/create/recipes/crushing/compat/silentgems/pearl_ore.json -ce1f7b07204d34077462343a291c56eb8554a47e data/create/recipes/crushing/compat/silentgems/peridot_ore.json -7f9a7ad56152194841e491ccc6a1a8d376655626 data/create/recipes/crushing/compat/silentgems/phosphophyllite_ore.json -d7af2d50576112194ad0a8ecbe49a4876ed0c371 data/create/recipes/crushing/compat/silentgems/pyrope_ore.json -66fd8395b2c4c85f845fe0fd9c5b70d73aec573c data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json -464dc82898165e47916706dce0447d98dfd06e64 data/create/recipes/crushing/compat/silentgems/ruby_ore.json -de5853eed7af539f33003888baeb236a917906ac data/create/recipes/crushing/compat/silentgems/sapphire_ore.json -3674d0e7283d0c8fb2af76bb9f8f5ec27bf2952d data/create/recipes/crushing/compat/silentgems/sodalite_ore.json -0832fa4f6c7a7e51b662f069c60c0759b22b4187 data/create/recipes/crushing/compat/silentgems/spinel_ore.json -89477b02860a961d1b359c22eaa6c04bed6fba55 data/create/recipes/crushing/compat/silentgems/sunstone_ore.json -2c96179940122f7c3b590c84c60279c1828e8036 data/create/recipes/crushing/compat/silentgems/tanzite_ore.json -b996d35f65d5ab7ca014d692af7f89725c8eb272 data/create/recipes/crushing/compat/silentgems/tektite_ore.json -55d7c227e89e4c4ecd73a754e021cf512d0a7295 data/create/recipes/crushing/compat/silentgems/topaz_ore.json -65c8c29a709a993d41bd5c88108f5e0ba4e9a40a data/create/recipes/crushing/compat/silentgems/turquoise_ore.json -06506dbf7b6e6152ff7d5cde10a814c60ff30784 data/create/recipes/crushing/compat/silentgems/yellow_diamond_ore.json -9e0821148f013653c9e56e4359637e7731122aaa data/create/recipes/crushing/compat/silentgems/zircon_ore.json +97999de2b698f2dfe14e26cf1b66065b5ea9b4aa data/create/recipes/crushing/compat/silentgems/agate_ore.json +b496ec86afe5d7d50e56c5231dc2d121dc9555af data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json +dd41f9ada961be77f42c0c3fe564124007ff75d0 data/create/recipes/crushing/compat/silentgems/amber_ore.json +f432fbc93db40174dba7e60c64d051ef5e00fdf5 data/create/recipes/crushing/compat/silentgems/amethyst_ore.json +71d058358909bca588e9d31252e632aa3936ae1a data/create/recipes/crushing/compat/silentgems/ametrine_ore.json +ab7a6416f5133131b7fc0b364c3483254758d861 data/create/recipes/crushing/compat/silentgems/ammolite_ore.json +28f23e5e8100cdcfb7cfabd4e840df7928576b2f data/create/recipes/crushing/compat/silentgems/apatite_ore.json +7dc7e28ff192f7d5c6faefa4581e3c318d913ff2 data/create/recipes/crushing/compat/silentgems/aquamarine_ore.json +3ab31f2c32e04eeef9fc4b0055fe56ace7edeced data/create/recipes/crushing/compat/silentgems/beniotite_ore.json +9a70969d3abfb7bce8f74f8c6df1a533302ffe5f data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json +3709ee09ebc41d4c31180b05fae66fbd7eb8c846 data/create/recipes/crushing/compat/silentgems/carnelian_ore.json +959857eb0056a22b3ab5af949de6b9b4dbc5590c data/create/recipes/crushing/compat/silentgems/cats_eye_ore.json +9b0310d7044064394109e0ee621996d8f94b26e4 data/create/recipes/crushing/compat/silentgems/chrysoprase_ore.json +649d6f964edcd53bac6c011ea74b80ba15e7ebf4 data/create/recipes/crushing/compat/silentgems/citrine_ore.json +4ae7fc1503315e5e38d0edb55a32994fe2e7c153 data/create/recipes/crushing/compat/silentgems/coral_ore.json +ddb23226582d08b722bb9b6488a56cc746d650ff data/create/recipes/crushing/compat/silentgems/eculase_ore.json +308e498f75440250a5c1b956e87bfeffbd685deb data/create/recipes/crushing/compat/silentgems/flourite_ore.json +86ea8cf82b23108e94b84f561874eaaebac77088 data/create/recipes/crushing/compat/silentgems/garnet_ore.json +774a647657261f446acc8042b780329f0442d2d3 data/create/recipes/crushing/compat/silentgems/green_sapphire_ore.json +c2c71d8ff7dd61e561108923fe51392cea9942bb data/create/recipes/crushing/compat/silentgems/helidor_ore.json +d05b827862c05c49bcf84963503bf4a98d6d513e data/create/recipes/crushing/compat/silentgems/iolite_ore.json +a7dde49609b4020d69d351122931ebe47916bd07 data/create/recipes/crushing/compat/silentgems/jade_ore.json +76879709c3f91088b98ad08b95afd2d5339e11e7 data/create/recipes/crushing/compat/silentgems/jasper_ore.json +5e5354d50979504ec930a146a0d86f8663953c5c data/create/recipes/crushing/compat/silentgems/kunzite_ore.json +089f2b1837a398b8450fe56b153af1678c66e67c data/create/recipes/crushing/compat/silentgems/kyanite_ore.json +821a2022fd915b0177c253a078705c2d305a2fa6 data/create/recipes/crushing/compat/silentgems/lepidolite_ore.json +21d519c2e3f7e16137dd44b4e7f2e33c4be4361a data/create/recipes/crushing/compat/silentgems/malachite_ore.json +73e03af69d6fd3bdfc2dc1775b1c6e4b9fe502d6 data/create/recipes/crushing/compat/silentgems/moldavite_ore.json +5a4cf33eba73e72c1cc3973b1c798ffd0d4d8bc8 data/create/recipes/crushing/compat/silentgems/moonstone_ore.json +986adcb9882eceab534dc8a9dae584e0624a4d02 data/create/recipes/crushing/compat/silentgems/morganite_ore.json +a2e7a2ee8c9eb94b6606e681b7a0fa25124f272c data/create/recipes/crushing/compat/silentgems/onyx_ore.json +84d4c932ab898dd217b6f6599a4597996fd73c60 data/create/recipes/crushing/compat/silentgems/opal_ore.json +c4fe38af65273a4a726a05c3cb1cc78028365b5b data/create/recipes/crushing/compat/silentgems/pearl_ore.json +421dcba8a830d88985a462fc71e08555917331e7 data/create/recipes/crushing/compat/silentgems/peridot_ore.json +39b9e9954d0c60f782551b1c0d4fd778622641a6 data/create/recipes/crushing/compat/silentgems/phosphophyllite_ore.json +6ee5cda8482df7da344156be1e98bf1aeaf2c290 data/create/recipes/crushing/compat/silentgems/pyrope_ore.json +42cebdce2aed8dd5a9eb883a1600c9a216b25a51 data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json +bf3d4a83e5d01b707a1341fdc0fa9bb260a80ed9 data/create/recipes/crushing/compat/silentgems/ruby_ore.json +f9043183281196b0af8c6b48acaa82214cfaa3c9 data/create/recipes/crushing/compat/silentgems/sapphire_ore.json +0e2acbfa824b0ff4cc15d8c64eba9e83bd621c31 data/create/recipes/crushing/compat/silentgems/sodalite_ore.json +98e01eb91a461d4de1963095b8fb81b93fdde4ab data/create/recipes/crushing/compat/silentgems/spinel_ore.json +e1bb5f473366ef2ab07dbaf1803f776de07f85db data/create/recipes/crushing/compat/silentgems/sunstone_ore.json +40a772e9ff3adc9381a59aaf262e9ee94446c6d1 data/create/recipes/crushing/compat/silentgems/tanzite_ore.json +f15535780b90b65bc1b6cd8ee180cb4c46ad9897 data/create/recipes/crushing/compat/silentgems/tektite_ore.json +efd91d75e28950e671200716370824cfe84c6124 data/create/recipes/crushing/compat/silentgems/topaz_ore.json +d87d4f302df6ec1b7d3d808e4c783aa92480dfb4 data/create/recipes/crushing/compat/silentgems/turquoise_ore.json +6de3aff69a5bb0157c687ee51a31f989a5e8fd87 data/create/recipes/crushing/compat/silentgems/yellow_diamond_ore.json +80e7f8c5e89ee9435baa20519d9bd87315dddb53 data/create/recipes/crushing/compat/silentgems/zircon_ore.json a955cc17927888d6b62167130de0d77131267f54 data/create/recipes/crushing/compat/simplefarming/barley.json 6dd2ce54130f0f90da5cf19a3c9010ce340e4fb9 data/create/recipes/crushing/compat/simplefarming/oat.json c24a679170cc5f8d2453f2a6b1570574d00dd959 data/create/recipes/crushing/compat/simplefarming/rice.json 454463d58b2d13043f1d27e085e1f60d687f162a data/create/recipes/crushing/compat/simplefarming/rye.json -8dd14015f9756dfb2f64877cb0e99b14f3c3d663 data/create/recipes/crushing/compat/thermal/apatite_ore.json -e3c38df74e0a9925f253d5d5be0845a7a6b927ba data/create/recipes/crushing/compat/thermal/cinnabar_ore.json -235fae42c5a9ba1843c9f214173ec566a6209afc data/create/recipes/crushing/compat/thermal/niter_ore.json -fe6620822b1c90527c6b77ab6f6e25873d19487c data/create/recipes/crushing/compat/thermal/sulfur_ore.json +74e2ee44ca95a1ab0dbba16f038d689cbaa4bee9 data/create/recipes/crushing/compat/thermal/apatite_ore.json +ad4fe8a7b0e732cddd3db77cf59f45ecb45f3392 data/create/recipes/crushing/compat/thermal/cinnabar_ore.json +0b9cbd9e8624feb8f002115cf0eb9babdf7047fa data/create/recipes/crushing/compat/thermal/niter_ore.json +f13a7909d6e18656abe8eccfdd847383e8589496 data/create/recipes/crushing/compat/thermal/sulfur_ore.json 2670e2454e82fd7dc44e896e40771bce9c515285 data/create/recipes/crushing/copper_ore.json 4106006671af487158d165c8211553028585ebb3 data/create/recipes/crushing/crimsite.json b2ba06eb5bcc907f16e4605fc53f31aa35bc2cfd data/create/recipes/crushing/crimsite_recycling.json @@ -5012,7 +5031,7 @@ e6aa8895186358e9d069f5a99909132be49f3bf1 data/create/recipes/diorite_from_stone_ a90268d38f976327ff5e1b87ff1d72ca2d1ebad6 data/create/recipes/dripstone_block_from_stone_types_dripstone_stonecutting.json 27d9bf05a610447e90314e658dbbcd191f378fc9 data/create/recipes/dripstone_pillar_from_stone_types_dripstone_stonecutting.json d81ceba2946286d374801e698a4ca2116395cbad data/create/recipes/emptying/builders_tea.json -318ab703224ff1d6f7200675e1e0a4c138b28456 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json +d62f4682fe6cc61df5a1c0231a2004a4ee78a329 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json c26d003e921720308c05ad7b9f3cb57de94a10a8 data/create/recipes/emptying/compat/farmersdelight/milk_bottle.json 60c0edfb5b759e4f13427b631861f503f8552923 data/create/recipes/emptying/compat/neapolitan/milk_bottle.json 20b7c7c62fa2e33199e08188dd8836844a6d9cfd data/create/recipes/emptying/honey_bottle.json @@ -5409,6 +5428,9 @@ a1c129329271194b569a98499644aefd4cde2942 data/create/recipes/pressing/compat/bet 889d5225d41f60c3498a1c9a9379c48e6b9a99a4 data/create/recipes/pressing/compat/byg/lush_grass_path.json e5b5159c8b39ee3016c540b0a06a16cb18292ae4 data/create/recipes/pressing/compat/environmental/mycelium_path.json 2f3806c72b265781960fea6f72355ede26bcad97 data/create/recipes/pressing/compat/environmental/podzol_path.json +e81460562b3fa1f32c1346ef601c9265563c391c data/create/recipes/pressing/compat/infernalexp/crimson_nylium_path.json +bad2b432009dc2ed8f34ef307242eecd9d18d8e6 data/create/recipes/pressing/compat/infernalexp/soul_soil_path.json +7191227d8443fb6ba459121e75f122aea4cf17a2 data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json 3d5c154da126ad7ac0a6887ce1254f6f966ca2c3 data/create/recipes/pressing/copper_ingot.json 0fa8386648398724f6fd373178b706c6b11ddefc data/create/recipes/pressing/gold_ingot.json a104ef6eb8872a40ea7b2ef67ae54cec943162f0 data/create/recipes/pressing/iron_ingot.json @@ -5710,6 +5732,9 @@ ff5ba735be1bac40a44fad133d73650cfb1c6614 data/create/tags/items/stone_types/calc 947e4f5840da88568128ada8440679f9e3a7f8ec data/create/tags/items/stone_types/deepslate.json 0bf0d0ea18c4447b5116c5e12d29ce2f46693ec7 data/create/tags/items/stone_types/diorite.json f45a407fea1540257614550b458d191a7cf052d2 data/create/tags/items/stone_types/dripstone.json +16e7d5df863b2cf017e5ce78cf39cd1470d38f74 data/create/tags/items/stone_types/galosphere/allurite.json +be8b84671b6878af6413e58848c3e4e6cccef53c data/create/tags/items/stone_types/galosphere/amethyst.json +cd260ee7984072fc34022c9c71eccc15fe6c554b data/create/tags/items/stone_types/galosphere/lumiere.json 3ed6cfb9747a0ff5f7aa7cc46245fb1bdd69e6b2 data/create/tags/items/stone_types/granite.json 984363d17a9d11d29ce6d96ef7d9465bfc8858d2 data/create/tags/items/stone_types/limestone.json ba2e448d208997c8327df19fac39748184d49465 data/create/tags/items/stone_types/ochrum.json diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_end.json new file mode 100644 index 000000000..928632ca1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_end.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_coal_end" + } + ], + "results": [ + { + "item": "minecraft:coal" + }, + { + "item": "minecraft:coal", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_nether.json new file mode 100644 index 000000000..f2a163ab7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_nether.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_coal_nether" + } + ], + "results": [ + { + "item": "minecraft:coal" + }, + { + "item": "minecraft:coal", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_end.json new file mode 100644 index 000000000..a777714be --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_end.json @@ -0,0 +1,33 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_copper_end" + } + ], + "results": [ + { + "item": "create:crushed_raw_copper", + "count": 5 + }, + { + "item": "create:crushed_raw_copper", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_nether.json new file mode 100644 index 000000000..e5d275f9f --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_nether.json @@ -0,0 +1,33 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_copper_nether" + } + ], + "results": [ + { + "item": "create:crushed_raw_copper", + "count": 5 + }, + { + "item": "create:crushed_raw_copper", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_end.json new file mode 100644 index 000000000..45f844486 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_end.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_diamond_end" + } + ], + "results": [ + { + "item": "minecraft:diamond" + }, + { + "item": "minecraft:diamond", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_nether.json new file mode 100644 index 000000000..1f7830008 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_diamond_nether.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_diamond_nether" + } + ], + "results": [ + { + "item": "minecraft:diamond" + }, + { + "item": "minecraft:diamond", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_end.json new file mode 100644 index 000000000..f8bceb520 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_end.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_emerald_end" + } + ], + "results": [ + { + "item": "minecraft:emerald" + }, + { + "item": "minecraft:emerald", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_nether.json new file mode 100644 index 000000000..ef12e8369 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_emerald_nether.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_emerald_nether" + } + ], + "results": [ + { + "item": "minecraft:emerald" + }, + { + "item": "minecraft:emerald", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ender_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ender_end.json new file mode 100644 index 000000000..160ab56ab --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ender_end.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_ender_end" + } + ], + "results": [ + { + "item": "minecraft:ender_pearl" + }, + { + "item": "minecraft:ender_pearl", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ghast_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ghast_nether.json new file mode 100644 index 000000000..c504fd066 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_ghast_nether.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_ghast_nether" + } + ], + "results": [ + { + "item": "minecraft:ghast_tear" + }, + { + "item": "minecraft:ghast_tear", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_end.json new file mode 100644 index 000000000..1a7d32f75 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_end.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_iron_end" + } + ], + "results": [ + { + "item": "create:crushed_raw_iron" + }, + { + "item": "create:crushed_raw_iron", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_nether.json new file mode 100644 index 000000000..c17b5db9e --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_iron_nether.json @@ -0,0 +1,32 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_iron_nether" + } + ], + "results": [ + { + "item": "create:crushed_raw_iron" + }, + { + "item": "create:crushed_raw_iron", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_end.json new file mode 100644 index 000000000..590bc6445 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_end.json @@ -0,0 +1,33 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_lapis_end" + } + ], + "results": [ + { + "item": "minecraft:lapis_lazuli", + "count": 10 + }, + { + "item": "minecraft:lapis_lazuli", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json new file mode 100644 index 000000000..4d70b0e4a --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json @@ -0,0 +1,33 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_lapis_nether" + } + ], + "results": [ + { + "item": "minecraft:lapis_lazuli", + "count": 10 + }, + { + "item": "minecraft:lapis_lazuli", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json new file mode 100644 index 000000000..32c726142 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json @@ -0,0 +1,33 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_redstone_end" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 6 + }, + { + "item": "minecraft:redstone", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:end_stone", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json new file mode 100644 index 000000000..73bf79fc3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json @@ -0,0 +1,33 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "elementaryores:ore_redstone_nether" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 6 + }, + { + "item": "minecraft:redstone", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.12 + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "elementaryores", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/galosphere/allurite.json b/src/generated/resources/data/create/recipes/crushing/compat/galosphere/allurite.json new file mode 100644 index 000000000..422a1e8e2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/galosphere/allurite.json @@ -0,0 +1,22 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "create:stone_types/galosphere/allurite" + } + ], + "results": [ + { + "item": "galosphere:allurite_shard", + "count": 4, + "chance": 0.8 + } + ], + "processingTime": 300, + "conditions": [ + { + "modid": "galosphere", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/galosphere/amethyst.json b/src/generated/resources/data/create/recipes/crushing/compat/galosphere/amethyst.json new file mode 100644 index 000000000..86ef2160e --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/galosphere/amethyst.json @@ -0,0 +1,22 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "create:stone_types/galosphere/amethyst" + } + ], + "results": [ + { + "item": "minecraft:amethyst_shard", + "count": 4, + "chance": 0.8 + } + ], + "processingTime": 300, + "conditions": [ + { + "modid": "galosphere", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/galosphere/lumiere.json b/src/generated/resources/data/create/recipes/crushing/compat/galosphere/lumiere.json new file mode 100644 index 000000000..4eb20d843 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/galosphere/lumiere.json @@ -0,0 +1,22 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "tag": "create:stone_types/galosphere/lumiere" + } + ], + "results": [ + { + "item": "galosphere:lumiere_shard", + "count": 4, + "chance": 0.8 + } + ], + "processingTime": 300, + "conditions": [ + { + "modid": "galosphere", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/agate_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/agate_ore.json index ed71b1f13..535ba5e9b 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/agate_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/agate_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:agate", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json index f3517f936..d1628a85d 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/alexandrite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:alexandrite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amber_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amber_ore.json index 0695ccb04..0ba1bc1fe 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amber_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amber_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:amber", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amethyst_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amethyst_ore.json index e0f1b1911..3c5eadff0 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amethyst_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/amethyst_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:amethyst", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ametrine_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ametrine_ore.json index dca587325..70b5960fb 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ametrine_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ametrine_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:ametrine", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ammolite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ammolite_ore.json index ef3d5c3be..6020df5e9 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ammolite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ammolite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:ammolite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/apatite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/apatite_ore.json index eb7e91750..12ee14c29 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/apatite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/apatite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:apatite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/aquamarine_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/aquamarine_ore.json index 8590da6fc..bc22ed759 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/aquamarine_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/aquamarine_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:aquamarine", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/beniotite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/beniotite_ore.json index 5b7575886..51fd9bfe8 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/beniotite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/beniotite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:beniotite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json index a30f2bcd3..a2c97e413 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/black_diamond_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:black_diamond", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/carnelian_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/carnelian_ore.json index bd8c67e67..59ee7c8c3 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/carnelian_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/carnelian_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:carnelian", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/cats_eye_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/cats_eye_ore.json index 08eedff2f..33126e811 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/cats_eye_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/cats_eye_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:cats_eye", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/chrysoprase_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/chrysoprase_ore.json index 9b67d4646..4c58848ac 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/chrysoprase_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/chrysoprase_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:chrysoprase", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/citrine_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/citrine_ore.json index 0c9375adc..98007f806 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/citrine_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/citrine_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:citrine", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/coral_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/coral_ore.json index b2875b986..7f9fa9d79 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/coral_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/coral_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:coral", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/eculase_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/eculase_ore.json index 0314287e2..cbac3ea8b 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/eculase_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/eculase_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:eculase", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/flourite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/flourite_ore.json index 1b0df4594..f6c049906 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/flourite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/flourite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:flourite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/garnet_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/garnet_ore.json index 62eb9de87..289cf2e1b 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/garnet_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/garnet_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:garnet", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/green_sapphire_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/green_sapphire_ore.json index b33fa5241..2eb5dbc1b 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/green_sapphire_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/green_sapphire_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:green_sapphire", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/helidor_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/helidor_ore.json index 1f571a537..66dbce6e4 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/helidor_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/helidor_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:helidor", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/iolite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/iolite_ore.json index 1bc5f78cc..6753b7848 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/iolite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/iolite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:iolite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jade_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jade_ore.json index 801ff9de7..4173354c2 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jade_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jade_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:jade", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jasper_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jasper_ore.json index abaf63da4..3945f1002 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jasper_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/jasper_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:jasper", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kunzite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kunzite_ore.json index 43d5d7038..0e0d0232a 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kunzite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kunzite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:kunzite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kyanite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kyanite_ore.json index 7ce0a921e..2d58ef943 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kyanite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/kyanite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:kyanite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/lepidolite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/lepidolite_ore.json index 9c956366f..32fa6590c 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/lepidolite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/lepidolite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:lepidolite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/malachite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/malachite_ore.json index 46e41869d..321367159 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/malachite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/malachite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:malachite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moldavite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moldavite_ore.json index b855d4b4d..39420f11a 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moldavite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moldavite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:moldavite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moonstone_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moonstone_ore.json index f3753d4d2..302310c3c 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moonstone_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/moonstone_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:moonstone", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/morganite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/morganite_ore.json index 294afd80e..0cf3de529 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/morganite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/morganite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:morganite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/onyx_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/onyx_ore.json index fb3b714da..0808eea0a 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/onyx_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/onyx_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:onyx", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/opal_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/opal_ore.json index 2391b835f..9d229db43 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/opal_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/opal_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:opal", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pearl_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pearl_ore.json index 47894bd05..133730ce0 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pearl_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pearl_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:pearl", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/peridot_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/peridot_ore.json index 764fdd9ce..91f431a1a 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/peridot_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/peridot_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:peridot", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/phosphophyllite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/phosphophyllite_ore.json index d814d14dd..97e982ad9 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/phosphophyllite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/phosphophyllite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:phosphophyllite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pyrope_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pyrope_ore.json index 259b4f672..ec5c33279 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pyrope_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/pyrope_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:pyrope", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json index 6b34f2050..59ef24790 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/rose_quartz_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:rose_quartz", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ruby_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ruby_ore.json index 5e05cdecb..006b8b4d3 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ruby_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/ruby_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:ruby", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sapphire_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sapphire_ore.json index 82e850ec4..7be3ba406 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sapphire_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sapphire_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:sapphire", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sodalite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sodalite_ore.json index f73044729..7749e67f2 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sodalite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sodalite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:sodalite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/spinel_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/spinel_ore.json index a3b8e3c15..4f6e537ba 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/spinel_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/spinel_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:spinel", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sunstone_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sunstone_ore.json index 9d62a17a2..4e3224b02 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sunstone_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/sunstone_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:sunstone", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tanzite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tanzite_ore.json index e813b6880..3fd2d45fb 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tanzite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tanzite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:tanzite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tektite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tektite_ore.json index 4290dd189..e59d8e176 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tektite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/tektite_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:tektite", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/topaz_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/topaz_ore.json index 4e461ce6e..5e9eeca72 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/topaz_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/topaz_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:topaz", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:cobblestone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/turquoise_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/turquoise_ore.json index 7a4cddbd9..cdbbb93dc 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/turquoise_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/turquoise_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:turquoise", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/yellow_diamond_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/yellow_diamond_ore.json index 9cb635bb1..60bb32910 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/yellow_diamond_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/yellow_diamond_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:yellow_diamond", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:end_stone", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/zircon_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/zircon_ore.json index bcc97c3c9..375d854b2 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/silentgems/zircon_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/silentgems/zircon_ore.json @@ -14,6 +14,10 @@ "item": "silentgems:zircon", "chance": 0.25 }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, { "item": "minecraft:netherrack", "chance": 0.12 diff --git a/src/generated/resources/data/create/recipes/crushing/compat/thermal/apatite_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/thermal/apatite_ore.json index 187b0685b..6360c7a66 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/thermal/apatite_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/thermal/apatite_ore.json @@ -17,6 +17,10 @@ { "item": "minecraft:cobblestone", "chance": 0.12 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 } ], "processingTime": 350, diff --git a/src/generated/resources/data/create/recipes/crushing/compat/thermal/cinnabar_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/thermal/cinnabar_ore.json index f3b6364fa..fdecce39e 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/thermal/cinnabar_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/thermal/cinnabar_ore.json @@ -17,6 +17,10 @@ { "item": "minecraft:cobblestone", "chance": 0.12 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 } ], "processingTime": 350, diff --git a/src/generated/resources/data/create/recipes/crushing/compat/thermal/niter_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/thermal/niter_ore.json index a599ec46f..3511d29ce 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/thermal/niter_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/thermal/niter_ore.json @@ -17,6 +17,10 @@ { "item": "minecraft:cobblestone", "chance": 0.12 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 } ], "processingTime": 350, diff --git a/src/generated/resources/data/create/recipes/crushing/compat/thermal/sulfur_ore.json b/src/generated/resources/data/create/recipes/crushing/compat/thermal/sulfur_ore.json index c2074b2fe..cde72e2aa 100644 --- a/src/generated/resources/data/create/recipes/crushing/compat/thermal/sulfur_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/compat/thermal/sulfur_ore.json @@ -17,6 +17,10 @@ { "item": "minecraft:cobblestone", "chance": 0.12 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 } ], "processingTime": 350, diff --git a/src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json b/src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json index b9a1453cc..5840cfd98 100644 --- a/src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json +++ b/src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json @@ -16,7 +16,7 @@ ], "conditions": [ { - "modid": "atmospheric", + "modid": "alexsmobs", "type": "forge:mod_loaded" } ] diff --git a/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/crimson_nylium_path.json b/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/crimson_nylium_path.json new file mode 100644 index 000000000..dc085f16f --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/crimson_nylium_path.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "ingredients": [ + { + "item": "minecraft:crimson_nylium" + } + ], + "results": [ + { + "item": "infernalexp:crimson_nylium_path" + } + ], + "conditions": [ + { + "modid": "infernalexp", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/soul_soil_path.json b/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/soul_soil_path.json new file mode 100644 index 000000000..0ebd6ebf7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/soul_soil_path.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "ingredients": [ + { + "item": "minecraft:soul_soil" + } + ], + "results": [ + { + "item": "infernalexp:soul_soil_path" + } + ], + "conditions": [ + { + "modid": "infernalexp", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json b/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json new file mode 100644 index 000000000..3ea86bc0b --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "ingredients": [ + { + "item": "minecraft:warped_nylium" + } + ], + "results": [ + { + "item": "infernalexp:warped_nylium_path" + } + ], + "conditions": [ + { + "modid": "infernalexp", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json b/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json new file mode 100644 index 000000000..2bbe91cdc --- /dev/null +++ b/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json @@ -0,0 +1,45 @@ +{ + "replace": false, + "values": [ + { + "id": "galosphere:allurite_block", + "required": false + }, + { + "id": "galosphere:allurite_stairs", + "required": false + }, + { + "id": "galosphere:allurite_slab", + "required": false + }, + { + "id": "galosphere:smooth_allurite", + "required": false + }, + { + "id": "galosphere:smooth_allurite_stairs", + "required": false + }, + { + "id": "galosphere:smooth_allurite_slab", + "required": false + }, + { + "id": "galosphere:allurite_bricks", + "required": false + }, + { + "id": "galosphere:allurite_brick_stairs", + "required": false + }, + { + "id": "galosphere:allurite_brick_slab", + "required": false + }, + { + "id": "galosphere:chiseled_allurite", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json b/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json new file mode 100644 index 000000000..c15c61c83 --- /dev/null +++ b/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json @@ -0,0 +1,45 @@ +{ + "replace": false, + "values": [ + { + "id": "galosphere:amethyst_block", + "required": false + }, + { + "id": "galosphere:amethyst_stairs", + "required": false + }, + { + "id": "galosphere:amethyst_slab", + "required": false + }, + { + "id": "galosphere:smooth_amethyst", + "required": false + }, + { + "id": "galosphere:smooth_amethyst_stairs", + "required": false + }, + { + "id": "galosphere:smooth_amethyst_slab", + "required": false + }, + { + "id": "galosphere:amethyst_bricks", + "required": false + }, + { + "id": "galosphere:amethyst_brick_stairs", + "required": false + }, + { + "id": "galosphere:amethyst_brick_slab", + "required": false + }, + { + "id": "galosphere:chiseled_amethyst", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json b/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json new file mode 100644 index 000000000..d654a12ba --- /dev/null +++ b/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json @@ -0,0 +1,45 @@ +{ + "replace": false, + "values": [ + { + "id": "galosphere:lumiere_block", + "required": false + }, + { + "id": "galosphere:lumiere_stairs", + "required": false + }, + { + "id": "galosphere:lumiere_slab", + "required": false + }, + { + "id": "galosphere:smooth_lumiere", + "required": false + }, + { + "id": "galosphere:smooth_lumiere_stairs", + "required": false + }, + { + "id": "galosphere:smooth_lumiere_slab", + "required": false + }, + { + "id": "galosphere:lumiere_bricks", + "required": false + }, + { + "id": "galosphere:lumiere_brick_stairs", + "required": false + }, + { + "id": "galosphere:lumiere_brick_slab", + "required": false + }, + { + "id": "galosphere:chiseled_lumiere", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index 2ac66e197..0b178af27 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -1,6 +1,7 @@ package com.simibubi.create; import static com.simibubi.create.AllTags.NameSpace.FORGE; +import static com.simibubi.create.AllTags.NameSpace.GS; import static com.simibubi.create.AllTags.NameSpace.MOD; import static com.simibubi.create.AllTags.NameSpace.QUARK; import static com.simibubi.create.AllTags.NameSpace.TIC; @@ -57,7 +58,8 @@ public class AllTags { MOD(Create.ID, false, true), FORGE("forge"), TIC("tconstruct"), - QUARK("quark") + QUARK("quark"), + GS("galosphere") ; @@ -182,7 +184,11 @@ public class AllTags { STRIPPED_LOGS(FORGE), STRIPPED_WOOD(FORGE), PLATES(FORGE), - WRENCH(FORGE, "tools/wrench") + WRENCH(FORGE, "tools/wrench"), + + ALLURITE(MOD,"stone_types/galosphere/allurite"), + AMETHYST(MOD,"stone_types/galosphere/amethyst"), + LUMIERE(MOD, "stone_types/galosphere/lumiere"), ; diff --git a/src/main/java/com/simibubi/create/foundation/data/TagGen.java b/src/main/java/com/simibubi/create/foundation/data/TagGen.java index b8a0061e2..f5e3d4cea 100644 --- a/src/main/java/com/simibubi/create/foundation/data/TagGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/TagGen.java @@ -11,6 +11,8 @@ import net.minecraft.tags.BlockTags; import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.Block; +import java.util.List; + public class TagGen { public static NonNullFunction, BlockBuilder> axeOrPickaxe() { return b -> b.tag(BlockTags.MINEABLE_WITH_AXE) @@ -42,7 +44,7 @@ public class TagGen { return appender; } - public static > T addOptional(T appender, Mods mod, String... ids) { + public static > T addOptional(T appender, Mods mod, List ids) { for (String id : ids) { appender.addOptional(mod.asResource(id)); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index ee78cbec9..b6f4065f9 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -351,7 +351,42 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { // Thermal Expansion - TH = thOres("apatite", "cinnabar", "niter", "sulfur") + TH = thOres("apatite", "cinnabar", "niter", "sulfur"), + + //Galosphere + + GS_ALLURITE = create(Mods.GS.recipeId("allurite"), b -> b.duration(300) + .require(AllTags.AllItemTags.ALLURITE.tag) + .output(.8f, Mods.GS, "allurite_shard", 4) + .whenModLoaded(Mods.GS.getId())), + + GS_LUMIERE = create(Mods.GS.recipeId("lumiere"), b -> b.duration(300) + .require(AllTags.AllItemTags.LUMIERE.tag) + .output(.8f, Mods.GS, "lumiere_shard", 4) + .whenModLoaded(Mods.GS.getId())), + + GS_AMETHYST = create(Mods.GS.recipeId("amethyst"), b -> b.duration(300) + .require(AllTags.AllItemTags.AMETHYST.tag) + .output(.8f, Items.AMETHYST_SHARD, 4) + .whenModLoaded(Mods.GS.getId())), + + //Elementary Ores + EO_COAL_NETHER = eoNetherOre("coal", Items.COAL, 1), + EO_COPPER_NETHER = eoNetherOre("copper", AllItems.CRUSHED_COPPER.get(), 5), + EO_IRON_NETHER = eoNetherOre("iron", AllItems.CRUSHED_IRON.get(), 1), + EO_EMERALD_NETHER = eoNetherOre("emerald", Items.EMERALD, 1), + EO_LAPIS_NETHER = eoNetherOre("lapis", Items.LAPIS_LAZULI, 10), + EO_DIAMOND_NETHER = eoNetherOre("diamond", Items.DIAMOND, 1), + EO_REDSTONE_NETHER = eoNetherOre("redstone", Items.REDSTONE, 6), + EO_GHAST_NETHER = eoNetherOre("ghast", Items.GHAST_TEAR, 1), + EO_COAL_END = eoEndOre("coal", Items.COAL, 1), + EO_COPPER_END = eoEndOre("copper", AllItems.CRUSHED_COPPER.get(), 5), + EO_IRON_END = eoEndOre("iron", AllItems.CRUSHED_IRON.get(), 1), + EO_EMERALD_END = eoEndOre("emerald", Items.EMERALD, 1), + EO_LAPIS_END = eoEndOre("lapis", Items.LAPIS_LAZULI, 10), + EO_DIAMOND_END = eoEndOre("diamond", Items.DIAMOND, 1), + EO_REDSTONE_END = eoEndOre("redstone", Items.REDSTONE, 6), + EO_ENDER_END = eoEndOre("ender", Items.ENDER_PEARL, 1) ; @@ -423,7 +458,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .require(AllTags.forgeItemTag(prefix + name)) .output(result.get(), 1) .output(.75f, result.get(), 1) - .output(.75f, AllItems.EXP_NUGGET.get(), 1); + .output(.75f, AllItems.EXP_NUGGET.get()); }); } @@ -433,6 +468,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .require(Mods.SILENT_GEMS, type + "_ore") .output(1f, Mods.SILENT_GEMS, type, 2) .output(.25f, Mods.SILENT_GEMS, type, 1) + .output(.75f, AllItems.EXP_NUGGET.get()) .output(.12f, Items.COBBLESTONE) .whenModLoaded(Mods.SILENT_GEMS.getId())); } @@ -445,6 +481,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .require(Mods.SILENT_GEMS, type + "_ore") .output(1f, Mods.SILENT_GEMS, type, 2) .output(.25f, Mods.SILENT_GEMS, type, 1) + .output(.75f, AllItems.EXP_NUGGET.get()) .output(.12f, Items.NETHERRACK) .whenModLoaded(Mods.SILENT_GEMS.getId())); } @@ -457,6 +494,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .require(Mods.SILENT_GEMS, type + "_ore") .output(1f, Mods.SILENT_GEMS, type, 2) .output(.25f, Mods.SILENT_GEMS, type, 1) + .output(.75f, AllItems.EXP_NUGGET.get()) .output(.12f, Items.END_STONE) .whenModLoaded(Mods.SILENT_GEMS.getId())); } @@ -482,11 +520,34 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .output(1f, Mods.TH, type, 2) .output(.25f, Mods.TH, type, 1) .output(.12f, Items.COBBLESTONE) + .output(.75f, AllItems.EXP_NUGGET.get()) .whenModLoaded(Mods.TH.getId())); } return null; } + protected GeneratedRecipe eoNetherOre(String material, ItemLike result, int count){ + String oreName = "ore_" + material + "_nether"; + return create(Mods.EO.recipeId(oreName), b -> b.duration(350) + .require(Mods.EO, oreName) + .output(1f, result, count) + .output(.25f, result) + .output(.75f, AllItems.EXP_NUGGET.get()) + .output(.12f, Items.NETHERRACK) + .whenModLoaded(Mods.EO.getId())); + } + + protected GeneratedRecipe eoEndOre(String material, ItemLike result, int count){ + String oreName = "ore_" + material + "_end"; + return create(Mods.EO.recipeId(oreName), b -> b.duration(350) + .require(Mods.EO, oreName) + .output(1f, result, count) + .output(.25f, result) + .output(.75f, AllItems.EXP_NUGGET.get()) + .output(.12f, Items.END_STONE) + .whenModLoaded(Mods.EO.getId())); + } + public CrushingRecipeGen(DataGenerator dataGenerator) { super(dataGenerator); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java index ca13b6c2e..05257f972 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -51,6 +51,7 @@ public enum Mods { GOOD("goodending"), BMK("biomemakeover"), NE("nethers_exoticism"), + EO("elementaryores") ; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java index 4c303e179..ad2bd1d4e 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java @@ -44,7 +44,19 @@ public class PressingRecipeGen extends ProcessingRecipeGen { // Oh The Biomes You'll Go - BYG = moddedPaths(Mods.BYG, "lush_grass") + BYG = moddedPaths(Mods.BYG, "lush_grass"), + + //Infernal Expansion + IX_CRIMSON_PATH = create(Mods.IX.recipeId("crimson_nylium_path"), b -> b.require(Blocks.CRIMSON_NYLIUM) + .output(Mods.IX, "crimson_nylium_path") + .whenModLoaded(Mods.IX.getId())), + + IX_WARPED_PATH = create(Mods.IX.recipeId("warped_nylium_path"), b -> b.require(Blocks.WARPED_NYLIUM) + .output(Mods.IX, "warped_nylium_path") + .whenModLoaded(Mods.IX.getId())), + IX_SOUL_PATH = create(Mods.IX.recipeId("soul_soil_path"), b -> b.require(Blocks.SOUL_SOIL) + .output(Mods.IX, "soul_soil_path") + .whenModLoaded(Mods.IX.getId())) ; diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java index ac8c261c9..26aa5d8ed 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java @@ -22,6 +22,9 @@ import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; import net.minecraftforge.common.Tags; +import java.util.ArrayList; +import java.util.List; + public class CreateRegistrateTags { public static void addGenerators() { Create.REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, CreateRegistrateTags::genBlockTags); @@ -90,10 +93,10 @@ public class CreateRegistrateTags { // COMPAT - TagGen.addOptional(prov.tag(AllBlockTags.NON_MOVABLE.tag), Mods.IE, + TagGen.addOptional(prov.tag(AllBlockTags.NON_MOVABLE.tag), Mods.IE, List.of( "connector_lv", "connector_lv_relay", "connector_mv", "connector_mv_relay", "connector_hv", "connector_hv_relay", "connector_bundled", "connector_structural", - "connector_redstone", "connector_probe", "breaker_switch"); + "connector_redstone", "connector_probe", "breaker_switch")); // VALIDATE @@ -146,6 +149,12 @@ public class CreateRegistrateTags { genStrippedWoodItemTags(prov); + TagGen.addOptional(prov.tag(AllItemTags.ALLURITE.tag), Mods.GS, gsPalette("allurite")); + + TagGen.addOptional(prov.tag(AllItemTags.LUMIERE.tag), Mods.GS, gsPalette("lumiere")); + + TagGen.addOptional(prov.tag(AllItemTags.AMETHYST.tag), Mods.GS, gsPalette("amethyst")); + // VALIDATE for (AllItemTags tag : AllItemTags.values()) { @@ -155,6 +164,21 @@ public class CreateRegistrateTags { } } + private static ArrayList gsPalette(String material) { + ArrayList toReturn = new ArrayList<>(); + toReturn.add(material + "_block"); + toReturn.add(material + "_stairs"); + toReturn.add(material + "_slab"); + toReturn.add("smooth_" + material); + toReturn.add("smooth_" + material + "_stairs"); + toReturn.add("smooth_" + material + "_slab"); + toReturn.add(material + "_bricks"); + toReturn.add(material + "_brick_stairs"); + toReturn.add(material + "_brick_slab"); + toReturn.add("chiseled_" + material); + return toReturn; + } + private static void genStrippedWoodItemTags(RegistrateTagsProvider prov) { TagAppender logAppender = prov.tag(AllItemTags.MODDED_STRIPPED_LOGS.tag); TagAppender woodAppender = prov.tag(AllItemTags.MODDED_STRIPPED_WOOD.tag); From 79aea176f372e7efa77dc2e253e279361752aed2 Mon Sep 17 00:00:00 2001 From: attackeight Date: Mon, 15 Apr 2024 22:15:31 -0400 Subject: [PATCH 2/7] Ice and Fire Dragons Compat - Silver Ingots --- build.gradle | 2 ++ src/generated/resources/.cache/cache | 5 +++ .../silver_ingot_compat_iceandfire.json | 34 +++++++++++++++++++ .../silver_ingot_compat_iceandfire.json | 34 +++++++++++++++++++ .../silver_ingot_compat_iceandfire.json | 15 ++++++++ .../silver_ingot_compat_iceandfire.json | 15 ++++++++ .../iceandfire/crushed_raw_silver.json | 20 +++++++++++ .../foundation/data/recipe/CompatMetals.java | 3 +- .../create/foundation/data/recipe/Mods.java | 3 +- 9 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json create mode 100644 src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json create mode 100644 src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json create mode 100644 src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_iceandfire.json create mode 100644 src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_raw_silver.json diff --git a/build.gradle b/build.gradle index 67903fa11..f81785300 100644 --- a/build.gradle +++ b/build.gradle @@ -210,6 +210,8 @@ dependencies { // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge") //runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924") //runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212") + implementation fg.deobf("curse.maven:citadel-331936:3783096") + implementation fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index cc5939136..ac4708f7b 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2376,6 +2376,7 @@ fc0f45610d721610bd82dd94321c328f78b4e738 data/create/advancements/recipes/buildi 3966a483e4b029465562721ff1a5083419fbda1f data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json f3ddc569b3f5bd157e969b824ce7e17cdc2dc261 data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json 9625c88577ce9ca6d5e5b70db6265d4017709074 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_galosphere.json +70513cec70272509878bcafbe0bd7fe1856bfe97 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json 68ed4ede9b3cb2c65e3570b19f8c20c925d3c8ba data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_oreganized.json b6e924d2e542b958646e2f2b04120734d0367752 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json 345b9051fe78f0212f55a072641414ba27edae65 data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json @@ -2405,6 +2406,7 @@ fa9c6cc212b0f9f919c5880daef86ff38c480f4b data/create/advancements/recipes/buildi c33131fc04d89a6565209690035d54dae3760fc5 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json 9afbbb877bc24429c86f9667afdde9819aac26b3 data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json 07580b778d8e460fb3cdafe55a37512237876e43 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_galosphere.json +28179d097dc9abda3d4f13ef86d4eb991c570a02 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json 6c6a3aa0d79151573204b6900dc3cc3e299253b5 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_oreganized.json 0642ae7baaf393f14298c6aeaa83d9c53dae758f data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json fd9808206c0d576dd32d7038dedbef0fbd6ca798 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json @@ -3879,6 +3881,7 @@ cbc0e8b75baeedf026d38e1e5eec7d54c762c8b3 data/create/recipes/blasting/ingot_tin_ 6789be494dfa5aa9c7893e64e6e3b74652f08f0e data/create/recipes/blasting/lead_ingot_compat_thermal.json 26e7e53ca4aad067d7a3ca46ffec08f6bc5ff921 data/create/recipes/blasting/nickel_ingot_compat_thermal.json 49919977975eceeba0040904e6141b7f232346f2 data/create/recipes/blasting/silver_ingot_compat_galosphere.json +b18c99938660f690d0b4bd34baa50d9adca63533 data/create/recipes/blasting/silver_ingot_compat_iceandfire.json 352b2a1f360930944fac3d6c6bcab1df78525400 data/create/recipes/blasting/silver_ingot_compat_oreganized.json aef449162f48759aacc4ae2876c659812fb4c52f data/create/recipes/blasting/silver_ingot_compat_thermal.json c79ade249cc24fe0602c9a139497c07754f4d8e2 data/create/recipes/blasting/tin_ingot_compat_thermal.json @@ -5589,6 +5592,7 @@ ef641b9cb51b6782d0ac3b69e90d06d31f93971b data/create/recipes/smelting/ingot_uran 6e62cbe2af58aef632fe18ee812153a85e52bdd5 data/create/recipes/smelting/nickel_ingot_compat_thermal.json 2c230522bb0946bde6a51442cb15c5efeea99b15 data/create/recipes/smelting/scoria.json 9f3a21cf1f2beffe025e837d6e87d34eead1e0d0 data/create/recipes/smelting/silver_ingot_compat_galosphere.json +a939f3de18b029e8c6a2166d03b2191e3211707d data/create/recipes/smelting/silver_ingot_compat_iceandfire.json 73367e3ca4e767a03f13b26102b9f2fff25b5477 data/create/recipes/smelting/silver_ingot_compat_oreganized.json f1e87ad8bac9500058b92f1ed0de3ce36ceb854a data/create/recipes/smelting/silver_ingot_compat_thermal.json 84b18e8f2f5b1faac98d1d47a05fc43b52992d65 data/create/recipes/smelting/tin_ingot_compat_thermal.json @@ -5625,6 +5629,7 @@ f18f823c0274518a13da3be2850b916a6ece2900 data/create/recipes/splashing/ic2/crush 71b4e6a4d62ec437f02bd2029455eb7ba5bb3943 data/create/recipes/splashing/ic2/crushed_raw_tin.json 8da1397c440f27a5af4cbfc169bcf74f83bf3c8a data/create/recipes/splashing/ic2/crushed_raw_uranium.json 0a15fffe26190b78d2177c8302c92fc2232ce398 data/create/recipes/splashing/ice.json +cb302e339d15701fbc4515aeeffe3059905b25e4 data/create/recipes/splashing/iceandfire/crushed_raw_silver.json 9600bd69991140ceacb7d8440a84cba346856ecb data/create/recipes/splashing/immersiveengineering/crushed_raw_aluminum.json 004392e61f33b411d1e376ea336ed5ac8bdf4196 data/create/recipes/splashing/immersiveengineering/crushed_raw_lead.json 937d3343dfafb93297a10d5a5ef238056e4fd227 data/create/recipes/splashing/immersiveengineering/crushed_raw_nickel.json diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json new file mode 100644 index 000000000..1de079c85 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:blasting/silver_ingot_compat_iceandfire" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:crushed_raw_silver" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:blasting/silver_ingot_compat_iceandfire" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json new file mode 100644 index 000000000..ea4f6baff --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:smelting/silver_ingot_compat_iceandfire" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:crushed_raw_silver" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:smelting/silver_ingot_compat_iceandfire" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json b/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json new file mode 100644 index 000000000..4e57772f0 --- /dev/null +++ b/src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "create:crushed_raw_silver" + }, + "result": "iceandfire:silver_ingot", + "experience": 0.1, + "cookingtime": 100, + "conditions": [ + { + "modid": "iceandfire", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_iceandfire.json b/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_iceandfire.json new file mode 100644 index 000000000..e94ea309c --- /dev/null +++ b/src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_iceandfire.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:crushed_raw_silver" + }, + "result": "iceandfire:silver_ingot", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ + { + "modid": "iceandfire", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_raw_silver.json b/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_raw_silver.json new file mode 100644 index 000000000..e8129d1e6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_raw_silver.json @@ -0,0 +1,20 @@ +{ + "type": "create:splashing", + "ingredients": [ + { + "item": "create:crushed_raw_silver" + } + ], + "results": [ + { + "item": "iceandfire:silver_nugget", + "count": 9 + } + ], + "conditions": [ + { + "modid": "iceandfire", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java index 3a22fa9c6..5a87e23a5 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CompatMetals.java @@ -3,6 +3,7 @@ package com.simibubi.create.foundation.data.recipe; import static com.simibubi.create.foundation.data.recipe.Mods.GS; import static com.simibubi.create.foundation.data.recipe.Mods.IC2; import static com.simibubi.create.foundation.data.recipe.Mods.IE; +import static com.simibubi.create.foundation.data.recipe.Mods.IF; import static com.simibubi.create.foundation.data.recipe.Mods.MEK; import static com.simibubi.create.foundation.data.recipe.Mods.OREGANIZED; import static com.simibubi.create.foundation.data.recipe.Mods.TH; @@ -16,7 +17,7 @@ public enum CompatMetals { OSMIUM(MEK), PLATINUM(), QUICKSILVER(), - SILVER(TH, IE, IC2, OREGANIZED, GS), + SILVER(TH, IE, IC2, OREGANIZED, GS, IF), TIN(TH, MEK, IC2), URANIUM(MEK, IE, IC2); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java index 05257f972..08b03142a 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -51,7 +51,8 @@ public enum Mods { GOOD("goodending"), BMK("biomemakeover"), NE("nethers_exoticism"), - EO("elementaryores") + EO("elementaryores"), + IF("iceandfire") ; From 53a483dde237a2f2be969230974e4a2c730895e6 Mon Sep 17 00:00:00 2001 From: attackeight Date: Tue, 16 Apr 2024 21:04:01 -0400 Subject: [PATCH 3/7] Accidentally forgot to comment these out --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f81785300..b5d991b17 100644 --- a/build.gradle +++ b/build.gradle @@ -210,8 +210,8 @@ dependencies { // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge") //runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924") //runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212") - implementation fg.deobf("curse.maven:citadel-331936:3783096") - implementation fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") + //implementation fg.deobf("curse.maven:citadel-331936:3783096") + //implementation fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings From 776c41ca84dd3bafe0669600956e5232fa34ac20 Mon Sep 17 00:00:00 2001 From: attackeight Date: Fri, 26 Apr 2024 16:54:59 -0400 Subject: [PATCH 4/7] Add Ex Nihilo: Sequentia compat --- build.gradle | 5 ++- src/generated/resources/.cache/cache | 12 +++++- .../compat/exnihilosequentia/andesite.json | 20 +++++++++ .../exnihilosequentia/crushed_diorite.json | 21 +++++++++ .../exnihilosequentia/crushed_netherrack.json | 24 +++++++++++ .../compat/exnihilosequentia/diorite.json | 20 +++++++++ .../compat/exnihilosequentia/dust.json | 20 +++++++++ .../compat/exnihilosequentia/end_stone.json | 20 +++++++++ .../compat/exnihilosequentia/granite.json | 20 +++++++++ .../compat/exnihilosequentia/netherrack.json | 20 +++++++++ .../data/create/recipes/crushing/diorite.json | 11 ++++- .../create/recipes/crushing/netherrack.json | 11 ++++- .../data/recipe/CrushingRecipeGen.java | 43 +++++++++++++++++-- .../create/foundation/data/recipe/Mods.java | 3 +- 14 files changed, 240 insertions(+), 10 deletions(-) create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json diff --git a/build.gradle b/build.gradle index b5d991b17..195d06ae2 100644 --- a/build.gradle +++ b/build.gradle @@ -210,8 +210,9 @@ dependencies { // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge") //runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924") //runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212") - //implementation fg.deobf("curse.maven:citadel-331936:3783096") - //implementation fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") + // runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096") + // runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") + runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index ac4708f7b..0f8d79ddc 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -4209,6 +4209,14 @@ c4c835cb43f02ab9d3188a290d165cc331bbdb8c data/create/recipes/crushing/compat/ele 8513b0f046d3a4592fab6aa2c4d0d88857927873 data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json a18ff5eb6a8c11c866f159a207d61cd1373ef565 data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json 8b01607b11949fc6848826a5fc4bae9253b0134b data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json +9ff53cec277656f660254cbcf965fb6a9b208c0e data/create/recipes/crushing/compat/exnihilosequentia/andesite.json +9ece8cff78de549a25792714b488f969a921db08 data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json +a0f90d5271b97b24063f0dcbd8368625489f6f4c data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json +3413d360348f1dbd49375152939e8bdbd5f54e9b data/create/recipes/crushing/compat/exnihilosequentia/diorite.json +2c6f4781609a87130ca4b61f1856dec4d1e0b876 data/create/recipes/crushing/compat/exnihilosequentia/dust.json +5444110abe3dfe0c078a1acf39359f136c357c92 data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json +00ef13509bc8d0af41351c55bcf78a319c07c202 data/create/recipes/crushing/compat/exnihilosequentia/granite.json +8c6bf21c0f20ccc4de3b73fa793b7ded93524666 data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json b1db1983cfe1d9573cd00a59a5b3a4a57a470d4d data/create/recipes/crushing/compat/galosphere/allurite.json 7f324629c6285f52e168f8b55097c6e8d927811f data/create/recipes/crushing/compat/galosphere/amethyst.json c47ad0f5238b8c6a8019bafb09a880b939373ead data/create/recipes/crushing/compat/galosphere/lumiere.json @@ -4284,7 +4292,7 @@ b85ba487f2867564c10a0870b55ce213558156bf data/create/recipes/crushing/deepslate_ 1f4d8fae88e2589b21fe5a9558393e71199d0e22 data/create/recipes/crushing/deepslate_zinc_ore.json 4c482db5575b74b4111800602d7fce22b2e6d32a data/create/recipes/crushing/diamond_horse_armor.json c42d105c8567c0844fcd811349093c2d754ea7d0 data/create/recipes/crushing/diamond_ore.json -f2b1c52cde3ecd83f021eff5114375e2f6526d90 data/create/recipes/crushing/diorite.json +d0e969aabb7a3d6014638bb7166dff6c20a0f713 data/create/recipes/crushing/diorite.json 38e958ba2e12daeed2fb0bc65a9ab9e04c98b816 data/create/recipes/crushing/diorite_recycling.json 1327589e844cb587a02167e4428fd604350d60e1 data/create/recipes/crushing/emerald_ore.json b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json @@ -4299,7 +4307,7 @@ e870d049abc5cd5f389f70414c67e76ddc14060d data/create/recipes/crushing/leather_ho cab15acd2d62f1d70e0972b443f7987048d5183a data/create/recipes/crushing/nether_gold_ore.json 6cd97c6f12687790943db810f85036b02586c753 data/create/recipes/crushing/nether_quartz_ore.json 6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json -8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json +f79c7fd90fa54034da1f083ff860a80324534c28 data/create/recipes/crushing/netherrack.json db2930bd8b5c8ecacf53e63d22d32fe2c018867c data/create/recipes/crushing/nickel_ore.json dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json 0efffde66998ef5b3d050438b9f734de37958223 data/create/recipes/crushing/ochrum.json diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json new file mode 100644 index 000000000..1fc99378a --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:andesite" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_andesite" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json new file mode 100644 index 000000000..fb0e7c501 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "exnihilosequentia:crushed_diorite" + } + ], + "results": [ + { + "item": "minecraft:quartz", + "chance": 0.25 + } + ], + "processingTime": 100, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json new file mode 100644 index 000000000..7d53bbd97 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "exnihilosequentia:crushed_netherrack" + } + ], + "results": [ + { + "item": "create:cinder_flour" + }, + { + "item": "create:cinder_flour", + "chance": 0.5 + } + ], + "processingTime": 100, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json new file mode 100644 index 000000000..6483a15d3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:diorite" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_diorite" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json new file mode 100644 index 000000000..a4abc6835 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:sand" + } + ], + "results": [ + { + "item": "exnihilosequentia:dust" + } + ], + "processingTime": 200, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json new file mode 100644 index 000000000..6eba474f1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:end_stone" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_end_stone" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json new file mode 100644 index 000000000..34647501f --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:granite" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_granite" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json new file mode 100644 index 000000000..46146e939 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:netherrack" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_netherrack" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/diorite.json b/src/generated/resources/data/create/recipes/crushing/diorite.json index d24a98f38..88030ecc1 100644 --- a/src/generated/resources/data/create/recipes/crushing/diorite.json +++ b/src/generated/resources/data/create/recipes/crushing/diorite.json @@ -11,5 +11,14 @@ "chance": 0.25 } ], - "processingTime": 350 + "processingTime": 350, + "conditions": [ + { + "value": { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + }, + "type": "forge:not" + } + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/netherrack.json b/src/generated/resources/data/create/recipes/crushing/netherrack.json index ec9af51d6..527b64dc6 100644 --- a/src/generated/resources/data/create/recipes/crushing/netherrack.json +++ b/src/generated/resources/data/create/recipes/crushing/netherrack.json @@ -14,5 +14,14 @@ "chance": 0.5 } ], - "processingTime": 250 + "processingTime": 250, + "conditions": [ + { + "value": { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + }, + "type": "forge:not" + } + ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index b6f4065f9..cc448f4ad 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -55,7 +55,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .output(Items.STRING, 2) .output(.5f, Items.STRING)), - DIORITE = mineralRecycling(AllPaletteStoneTypes.DIORITE, b -> b.duration(350) + DIORITE = ensMineralRecycling(AllPaletteStoneTypes.DIORITE, b -> b.duration(350) .output(.25f, Items.QUARTZ, 1)), CRIMSITE = @@ -187,7 +187,8 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { NETHERRACK = create(() -> Blocks.NETHERRACK, b -> b.duration(250) .output(AllItems.CINDER_FLOUR.get()) - .output(.5f, AllItems.CINDER_FLOUR.get())), + .output(.5f, AllItems.CINDER_FLOUR.get()) + .whenModMissing(Mods.ENS.getId())), // AE2 AE2_DEEPSLATE_ORE = create(Mods.AE2.recipeId("deepslate_quartz_ore"), b -> b.duration(300) @@ -386,7 +387,26 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { EO_LAPIS_END = eoEndOre("lapis", Items.LAPIS_LAZULI, 10), EO_DIAMOND_END = eoEndOre("diamond", Items.DIAMOND, 1), EO_REDSTONE_END = eoEndOre("redstone", Items.REDSTONE, 6), - EO_ENDER_END = eoEndOre("ender", Items.ENDER_PEARL, 1) + EO_ENDER_END = eoEndOre("ender", Items.ENDER_PEARL, 1), + + // Ex Nihilo: Sequentia + + ENS_STONES = ensStones("andesite", "diorite", "end_stone", "granite", "netherrack"), + + ENS_DUST = create(Mods.ENS.recipeId("dust"), b -> b.duration(200) + .require(Blocks.SAND).output(Mods.ENS, "dust") + .whenModLoaded(Mods.ENS.getId())), + + ENS_NETHERRACK = create(Mods.ENS.recipeId("crushed_netherrack"), b -> b.duration(100) + .require(Mods.ENS, "crushed_netherrack") + .output(AllItems.CINDER_FLOUR.get()) + .output(.5f, AllItems.CINDER_FLOUR.get()) + .whenModLoaded(Mods.ENS.getId())), + + ENS_DIORITE = create(Mods.ENS.recipeId("crushed_diorite"), b -> b.duration(100) + .require(Mods.ENS, "crushed_diorite") + .output(.25f, Items.QUARTZ, 1) + .whenModLoaded(Mods.ENS.getId())) ; @@ -418,6 +438,12 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { return create(type.getBaseBlock()::get, transform); } + protected GeneratedRecipe ensMineralRecycling(AllPaletteStoneTypes type, + UnaryOperator>> transform) { + create(Lang.asId(type.name()) + "_recycling", b -> transform.apply(b.require(type.materialTag))); + return create(type.getBaseBlock()::get, b -> transform.apply(b.whenModMissing(Mods.ENS.getId()))); + } + protected GeneratedRecipe ore(ItemLike stoneType, Supplier ore, Supplier raw, float expectedAmount, int duration) { return create(ore, b -> { @@ -548,6 +574,17 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .whenModLoaded(Mods.EO.getId())); } + protected GeneratedRecipe ensStones(String... stones) { + for (String stone : stones) { + String crushed = "crushed_" + stone; + create(Mods.ENS.recipeId(stone), b -> b.duration(350) + .require(Mods.MC, stone) + .output(Mods.ENS, crushed) + .whenModLoaded(Mods.ENS.getId())); + } + return null; + } + public CrushingRecipeGen(DataGenerator dataGenerator) { super(dataGenerator); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java index 08b03142a..941b6fe92 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -52,7 +52,8 @@ public enum Mods { BMK("biomemakeover"), NE("nethers_exoticism"), EO("elementaryores"), - IF("iceandfire") + IF("iceandfire"), + ENS("exnihilosequentia") ; From 60c001696aaba2264b9b426119274018ddb02b6c Mon Sep 17 00:00:00 2001 From: attackeight Date: Fri, 26 Apr 2024 16:54:59 -0400 Subject: [PATCH 5/7] Add Ex Nihilo: Sequentia compat --- build.gradle | 5 ++- src/generated/resources/.cache/cache | 12 +++++- .../compat/exnihilosequentia/andesite.json | 20 +++++++++ .../exnihilosequentia/crushed_diorite.json | 21 +++++++++ .../exnihilosequentia/crushed_netherrack.json | 24 +++++++++++ .../compat/exnihilosequentia/diorite.json | 20 +++++++++ .../compat/exnihilosequentia/dust.json | 20 +++++++++ .../compat/exnihilosequentia/end_stone.json | 20 +++++++++ .../compat/exnihilosequentia/granite.json | 20 +++++++++ .../compat/exnihilosequentia/netherrack.json | 20 +++++++++ .../data/create/recipes/crushing/diorite.json | 11 ++++- .../create/recipes/crushing/netherrack.json | 11 ++++- .../data/recipe/CrushingRecipeGen.java | 43 +++++++++++++++++-- .../create/foundation/data/recipe/Mods.java | 3 +- 14 files changed, 240 insertions(+), 10 deletions(-) create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json diff --git a/build.gradle b/build.gradle index b5d991b17..d7c133b28 100644 --- a/build.gradle +++ b/build.gradle @@ -210,8 +210,9 @@ dependencies { // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge") //runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924") //runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212") - //implementation fg.deobf("curse.maven:citadel-331936:3783096") - //implementation fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") + // runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096") + // runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") + // runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index ac4708f7b..0f8d79ddc 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -4209,6 +4209,14 @@ c4c835cb43f02ab9d3188a290d165cc331bbdb8c data/create/recipes/crushing/compat/ele 8513b0f046d3a4592fab6aa2c4d0d88857927873 data/create/recipes/crushing/compat/elementaryores/ore_lapis_nether.json a18ff5eb6a8c11c866f159a207d61cd1373ef565 data/create/recipes/crushing/compat/elementaryores/ore_redstone_end.json 8b01607b11949fc6848826a5fc4bae9253b0134b data/create/recipes/crushing/compat/elementaryores/ore_redstone_nether.json +9ff53cec277656f660254cbcf965fb6a9b208c0e data/create/recipes/crushing/compat/exnihilosequentia/andesite.json +9ece8cff78de549a25792714b488f969a921db08 data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json +a0f90d5271b97b24063f0dcbd8368625489f6f4c data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json +3413d360348f1dbd49375152939e8bdbd5f54e9b data/create/recipes/crushing/compat/exnihilosequentia/diorite.json +2c6f4781609a87130ca4b61f1856dec4d1e0b876 data/create/recipes/crushing/compat/exnihilosequentia/dust.json +5444110abe3dfe0c078a1acf39359f136c357c92 data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json +00ef13509bc8d0af41351c55bcf78a319c07c202 data/create/recipes/crushing/compat/exnihilosequentia/granite.json +8c6bf21c0f20ccc4de3b73fa793b7ded93524666 data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json b1db1983cfe1d9573cd00a59a5b3a4a57a470d4d data/create/recipes/crushing/compat/galosphere/allurite.json 7f324629c6285f52e168f8b55097c6e8d927811f data/create/recipes/crushing/compat/galosphere/amethyst.json c47ad0f5238b8c6a8019bafb09a880b939373ead data/create/recipes/crushing/compat/galosphere/lumiere.json @@ -4284,7 +4292,7 @@ b85ba487f2867564c10a0870b55ce213558156bf data/create/recipes/crushing/deepslate_ 1f4d8fae88e2589b21fe5a9558393e71199d0e22 data/create/recipes/crushing/deepslate_zinc_ore.json 4c482db5575b74b4111800602d7fce22b2e6d32a data/create/recipes/crushing/diamond_horse_armor.json c42d105c8567c0844fcd811349093c2d754ea7d0 data/create/recipes/crushing/diamond_ore.json -f2b1c52cde3ecd83f021eff5114375e2f6526d90 data/create/recipes/crushing/diorite.json +d0e969aabb7a3d6014638bb7166dff6c20a0f713 data/create/recipes/crushing/diorite.json 38e958ba2e12daeed2fb0bc65a9ab9e04c98b816 data/create/recipes/crushing/diorite_recycling.json 1327589e844cb587a02167e4428fd604350d60e1 data/create/recipes/crushing/emerald_ore.json b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json @@ -4299,7 +4307,7 @@ e870d049abc5cd5f389f70414c67e76ddc14060d data/create/recipes/crushing/leather_ho cab15acd2d62f1d70e0972b443f7987048d5183a data/create/recipes/crushing/nether_gold_ore.json 6cd97c6f12687790943db810f85036b02586c753 data/create/recipes/crushing/nether_quartz_ore.json 6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json -8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json +f79c7fd90fa54034da1f083ff860a80324534c28 data/create/recipes/crushing/netherrack.json db2930bd8b5c8ecacf53e63d22d32fe2c018867c data/create/recipes/crushing/nickel_ore.json dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json 0efffde66998ef5b3d050438b9f734de37958223 data/create/recipes/crushing/ochrum.json diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json new file mode 100644 index 000000000..1fc99378a --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/andesite.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:andesite" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_andesite" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json new file mode 100644 index 000000000..fb0e7c501 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_diorite.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "exnihilosequentia:crushed_diorite" + } + ], + "results": [ + { + "item": "minecraft:quartz", + "chance": 0.25 + } + ], + "processingTime": 100, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json new file mode 100644 index 000000000..7d53bbd97 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/crushed_netherrack.json @@ -0,0 +1,24 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "exnihilosequentia:crushed_netherrack" + } + ], + "results": [ + { + "item": "create:cinder_flour" + }, + { + "item": "create:cinder_flour", + "chance": 0.5 + } + ], + "processingTime": 100, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json new file mode 100644 index 000000000..6483a15d3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/diorite.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:diorite" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_diorite" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json new file mode 100644 index 000000000..a4abc6835 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/dust.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:sand" + } + ], + "results": [ + { + "item": "exnihilosequentia:dust" + } + ], + "processingTime": 200, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json new file mode 100644 index 000000000..6eba474f1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/end_stone.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:end_stone" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_end_stone" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json new file mode 100644 index 000000000..34647501f --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/granite.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:granite" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_granite" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json new file mode 100644 index 000000000..46146e939 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/compat/exnihilosequentia/netherrack.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:netherrack" + } + ], + "results": [ + { + "item": "exnihilosequentia:crushed_netherrack" + } + ], + "processingTime": 350, + "conditions": [ + { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + } + ] +} diff --git a/src/generated/resources/data/create/recipes/crushing/diorite.json b/src/generated/resources/data/create/recipes/crushing/diorite.json index d24a98f38..88030ecc1 100644 --- a/src/generated/resources/data/create/recipes/crushing/diorite.json +++ b/src/generated/resources/data/create/recipes/crushing/diorite.json @@ -11,5 +11,14 @@ "chance": 0.25 } ], - "processingTime": 350 + "processingTime": 350, + "conditions": [ + { + "value": { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + }, + "type": "forge:not" + } + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/netherrack.json b/src/generated/resources/data/create/recipes/crushing/netherrack.json index ec9af51d6..527b64dc6 100644 --- a/src/generated/resources/data/create/recipes/crushing/netherrack.json +++ b/src/generated/resources/data/create/recipes/crushing/netherrack.json @@ -14,5 +14,14 @@ "chance": 0.5 } ], - "processingTime": 250 + "processingTime": 250, + "conditions": [ + { + "value": { + "modid": "exnihilosequentia", + "type": "forge:mod_loaded" + }, + "type": "forge:not" + } + ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index b6f4065f9..cc448f4ad 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -55,7 +55,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .output(Items.STRING, 2) .output(.5f, Items.STRING)), - DIORITE = mineralRecycling(AllPaletteStoneTypes.DIORITE, b -> b.duration(350) + DIORITE = ensMineralRecycling(AllPaletteStoneTypes.DIORITE, b -> b.duration(350) .output(.25f, Items.QUARTZ, 1)), CRIMSITE = @@ -187,7 +187,8 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { NETHERRACK = create(() -> Blocks.NETHERRACK, b -> b.duration(250) .output(AllItems.CINDER_FLOUR.get()) - .output(.5f, AllItems.CINDER_FLOUR.get())), + .output(.5f, AllItems.CINDER_FLOUR.get()) + .whenModMissing(Mods.ENS.getId())), // AE2 AE2_DEEPSLATE_ORE = create(Mods.AE2.recipeId("deepslate_quartz_ore"), b -> b.duration(300) @@ -386,7 +387,26 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { EO_LAPIS_END = eoEndOre("lapis", Items.LAPIS_LAZULI, 10), EO_DIAMOND_END = eoEndOre("diamond", Items.DIAMOND, 1), EO_REDSTONE_END = eoEndOre("redstone", Items.REDSTONE, 6), - EO_ENDER_END = eoEndOre("ender", Items.ENDER_PEARL, 1) + EO_ENDER_END = eoEndOre("ender", Items.ENDER_PEARL, 1), + + // Ex Nihilo: Sequentia + + ENS_STONES = ensStones("andesite", "diorite", "end_stone", "granite", "netherrack"), + + ENS_DUST = create(Mods.ENS.recipeId("dust"), b -> b.duration(200) + .require(Blocks.SAND).output(Mods.ENS, "dust") + .whenModLoaded(Mods.ENS.getId())), + + ENS_NETHERRACK = create(Mods.ENS.recipeId("crushed_netherrack"), b -> b.duration(100) + .require(Mods.ENS, "crushed_netherrack") + .output(AllItems.CINDER_FLOUR.get()) + .output(.5f, AllItems.CINDER_FLOUR.get()) + .whenModLoaded(Mods.ENS.getId())), + + ENS_DIORITE = create(Mods.ENS.recipeId("crushed_diorite"), b -> b.duration(100) + .require(Mods.ENS, "crushed_diorite") + .output(.25f, Items.QUARTZ, 1) + .whenModLoaded(Mods.ENS.getId())) ; @@ -418,6 +438,12 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { return create(type.getBaseBlock()::get, transform); } + protected GeneratedRecipe ensMineralRecycling(AllPaletteStoneTypes type, + UnaryOperator>> transform) { + create(Lang.asId(type.name()) + "_recycling", b -> transform.apply(b.require(type.materialTag))); + return create(type.getBaseBlock()::get, b -> transform.apply(b.whenModMissing(Mods.ENS.getId()))); + } + protected GeneratedRecipe ore(ItemLike stoneType, Supplier ore, Supplier raw, float expectedAmount, int duration) { return create(ore, b -> { @@ -548,6 +574,17 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .whenModLoaded(Mods.EO.getId())); } + protected GeneratedRecipe ensStones(String... stones) { + for (String stone : stones) { + String crushed = "crushed_" + stone; + create(Mods.ENS.recipeId(stone), b -> b.duration(350) + .require(Mods.MC, stone) + .output(Mods.ENS, crushed) + .whenModLoaded(Mods.ENS.getId())); + } + return null; + } + public CrushingRecipeGen(DataGenerator dataGenerator) { super(dataGenerator); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java index 08b03142a..941b6fe92 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -52,7 +52,8 @@ public enum Mods { BMK("biomemakeover"), NE("nethers_exoticism"), EO("elementaryores"), - IF("iceandfire") + IF("iceandfire"), + ENS("exnihilosequentia") ; From 7e512a37c75b9810ff8387e3d3c3098bfd171693 Mon Sep 17 00:00:00 2001 From: attackeight Date: Sat, 1 Jun 2024 07:54:57 -0400 Subject: [PATCH 6/7] Move curios tag and upgrade aquatic tree fertilizer recipes to datagen --- build.gradle | 2 + src/generated/resources/.cache/cache | 4 ++ .../create.base/crafting/tree_fertilizer.json | 34 +++++++++++ .../recipes/crafting/tree_fertilizer.json | 21 +++++++ .../tags/items/upgrade_aquatic/coral.json | 45 +++++++++++++++ .../data/curios/tags/items/head.json | 2 +- .../java/com/simibubi/create/AllTags.java | 7 ++- .../data/recipe/StandardRecipeGen.java | 7 ++- .../data/CreateRegistrateTags.java | 7 +++ .../crafting/tree_fertilizer.json | 56 ------------------- 10 files changed, 126 insertions(+), 59 deletions(-) create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json create mode 100644 src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json create mode 100644 src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json rename src/{main => generated}/resources/data/curios/tags/items/head.json (96%) delete mode 100644 src/main/resources/data/create/recipes/compat/upgrade_aquatic/crafting/tree_fertilizer.json diff --git a/build.gradle b/build.gradle index d7c133b28..2628391b1 100644 --- a/build.gradle +++ b/build.gradle @@ -213,6 +213,8 @@ dependencies { // runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096") // runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465") // runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676") + runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4365140") + runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478") // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 0f8d79ddc..fa14f86d4 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2587,6 +2587,7 @@ b13ffffe311c3e16c3577aeeca881a04aeed7ee6 data/create/advancements/recipes/create 453c39a149831f27b4c0069fae40cb1a8c87ed5e data/create/advancements/recipes/create.base/crafting/schematics/schematic_and_quill.json d5efcd206b74c5165cbd4c2f5bb7bf3cf3eeae34 data/create/advancements/recipes/create.base/crafting/schematics/schematic_table.json cd1f66066664ed58995f8a7988fb1aa22605650b data/create/advancements/recipes/create.base/crafting/schematics/schematicannon.json +a9219ad9757bd2212f1317e15faffbc5aba32f76 data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json 5f9967425d1b92a4e773deee93f6a5d6c971298d data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json 16e52ba04279bcf803c5f6be46550ba5d81be1a3 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_ore.json 88a8661167993de0f2897c95e398b6f77429d724 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json @@ -4166,6 +4167,7 @@ fe1d69b1e33d5748eb3c0ea732b8d67e2d612203 data/create/recipes/crafting/materials/ 5c47ac2e2b596439a684126fef7265f13de2379b data/create/recipes/crafting/schematics/schematic_and_quill.json 9fb943be76c51a24aa9d8a09de5b7bd17b44ab08 data/create/recipes/crafting/schematics/schematic_table.json c4a88166bb906a88b986c37a002057a86d2ece00 data/create/recipes/crafting/schematics/schematicannon.json +030d2ebb2c779e41ae0d046cfd82e82f4468510b data/create/recipes/crafting/tree_fertilizer.json f679837ce5851f683daee24ee00dd4c764b617c8 data/create/recipes/crimsite_from_stone_types_crimsite_stonecutting.json c60542c99008f7abecdd03c47137b51e20a4747b data/create/recipes/crimsite_pillar_from_stone_types_crimsite_stonecutting.json 4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json @@ -5757,11 +5759,13 @@ ba2e448d208997c8327df19fac39748184d49465 data/create/tags/items/stone_types/ochr 634faefc734062b869002bd38aa4e5a2b06d8b9a data/create/tags/items/stone_types/veridium.json d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/items/toolboxes.json ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/create/tags/items/tracks.json +2da3040e8affabe01b6e1ae730bc005b52fcd130 data/create/tags/items/upgrade_aquatic/coral.json 2f4044c2989b9a8aa394c88617d67a6a310e6b1b data/create/tags/items/upright_on_belt.json 50936b211d94167a35ec78c89954082a336b6269 data/create/tags/items/valve_handles.json f8d83f446d0a2071dca4481251339c4249b2fd3f data/create/tags/items/vanilla_stripped_logs.json f3e20d8b3ca5652d3975da680740cc36326fdfc9 data/create/tags/items/vanilla_stripped_wood.json 747204dc59a2198feb2bb579d586ea3975b6e0d1 data/create/tags/recipe_serializer/automation_ignore.json +e3b1332cad7924a7a54ea74171bff2e006c7ff00 data/curios/tags/items/head.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/blocks/glass/colorless.json 81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json 6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json new file mode 100644 index 000000000..e67e55551 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting///tree_fertilizer" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:bone_meal" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting///tree_fertilizer" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json b/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json new file mode 100644 index 000000000..677a99daa --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "minecraft:small_flowers" + }, + { + "tag": "minecraft:small_flowers" + }, + { + "tag": "create:upgrade_aquatic/coral" + }, + { + "item": "minecraft:bone_meal" + } + ], + "result": { + "item": "create:tree_fertilizer", + "count": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json b/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json new file mode 100644 index 000000000..2826d4255 --- /dev/null +++ b/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json @@ -0,0 +1,45 @@ +{ + "replace": false, + "values": [ + { + "id": "upgrade_aquatic:acan_coral", + "required": false + }, + { + "id": "upgrade_aquatic:finger_coral", + "required": false + }, + { + "id": "upgrade_aquatic:star_coral", + "required": false + }, + { + "id": "upgrade_aquatic:moss_coral", + "required": false + }, + { + "id": "upgrade_aquatic:petal_coral", + "required": false + }, + { + "id": "upgrade_aquatic:branch_coral", + "required": false + }, + { + "id": "upgrade_aquatic:rock_coral", + "required": false + }, + { + "id": "upgrade_aquatic:pillow_coral", + "required": false + }, + { + "id": "upgrade_aquatic:chrome_coral", + "required": false + }, + { + "id": "upgrade_aquatic:silk_coral", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/curios/tags/items/head.json b/src/generated/resources/data/curios/tags/items/head.json similarity index 96% rename from src/main/resources/data/curios/tags/items/head.json rename to src/generated/resources/data/curios/tags/items/head.json index 635bc6fe7..fa60b07ba 100644 --- a/src/main/resources/data/curios/tags/items/head.json +++ b/src/generated/resources/data/curios/tags/items/head.json @@ -3,4 +3,4 @@ "values": [ "create:goggles" ] -} +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index 0b178af27..bbd5d9c02 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -1,5 +1,6 @@ package com.simibubi.create; +import static com.simibubi.create.AllTags.NameSpace.CURIOS; import static com.simibubi.create.AllTags.NameSpace.FORGE; import static com.simibubi.create.AllTags.NameSpace.GS; import static com.simibubi.create.AllTags.NameSpace.MOD; @@ -59,7 +60,8 @@ public class AllTags { FORGE("forge"), TIC("tconstruct"), QUARK("quark"), - GS("galosphere") + GS("galosphere"), + CURIOS("curios") ; @@ -190,6 +192,9 @@ public class AllTags { AMETHYST(MOD,"stone_types/galosphere/amethyst"), LUMIERE(MOD, "stone_types/galosphere/lumiere"), + UA_CORAL(MOD, "upgrade_aquatic/coral"), + CURIOS_HEAD(CURIOS, "head") + ; public final TagKey tag; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 21743b82f..9922896b8 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -1174,7 +1174,12 @@ public class StandardRecipeGen extends CreateRecipeProvider { RAW_ZINC_ORE = create(AllItems.ZINC_INGOT::get).withSuffix("_from_raw_ore") .viaCooking(AllItems.RAW_ZINC::get) .rewardXP(.7f) - .inBlastFurnace() + .inBlastFurnace(), + + UA_TREE_FERTILIZER = create(AllItems.TREE_FERTILIZER::get).returns(2) + .whenModLoaded(Mods.UA.getId()).unlockedBy(() -> Items.BONE_MEAL) + .viaShapeless(b -> b.requires(Ingredient.of(ItemTags.SMALL_FLOWERS), 2) + .requires(AllItemTags.UA_CORAL.tag).requires(Items.BONE_MEAL)) ; diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java index 26aa5d8ed..14f60dd65 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java @@ -1,5 +1,6 @@ package com.simibubi.create.infrastructure.data; +import com.simibubi.create.AllItems; import com.simibubi.create.AllTags.AllBlockTags; import com.simibubi.create.AllTags.AllEntityTags; import com.simibubi.create.AllTags.AllFluidTags; @@ -149,12 +150,18 @@ public class CreateRegistrateTags { genStrippedWoodItemTags(prov); + prov.tag(AllItemTags.CURIOS_HEAD.tag).add(AllItems.GOGGLES.get()); + TagGen.addOptional(prov.tag(AllItemTags.ALLURITE.tag), Mods.GS, gsPalette("allurite")); TagGen.addOptional(prov.tag(AllItemTags.LUMIERE.tag), Mods.GS, gsPalette("lumiere")); TagGen.addOptional(prov.tag(AllItemTags.AMETHYST.tag), Mods.GS, gsPalette("amethyst")); + TagGen.addOptional(prov.tag(AllItemTags.UA_CORAL.tag), Mods.UA, List.of("acan_coral", + "finger_coral", "star_coral", "moss_coral", "petal_coral", "branch_coral", + "rock_coral", "pillow_coral", "chrome_coral", "silk_coral")); + // VALIDATE for (AllItemTags tag : AllItemTags.values()) { diff --git a/src/main/resources/data/create/recipes/compat/upgrade_aquatic/crafting/tree_fertilizer.json b/src/main/resources/data/create/recipes/compat/upgrade_aquatic/crafting/tree_fertilizer.json deleted file mode 100644 index a32cc822c..000000000 --- a/src/main/resources/data/create/recipes/compat/upgrade_aquatic/crafting/tree_fertilizer.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "upgrade_aquatic" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "minecraft:small_flowers" - }, - { - "tag": "minecraft:small_flowers" - }, - [ - { - "item": "upgrade_aquatic:acan_coral" - }, - { - "item": "upgrade_aquatic:finger_coral" - }, - { - "item": "upgrade_aquatic:star_coral" - }, - { - "item": "upgrade_aquatic:moss_coral" - }, - { - "item": "upgrade_aquatic:petal_coral" - }, - { - "item": "upgrade_aquatic:branch_coral" - }, - { - "item": "upgrade_aquatic:rock_coral" - }, - { - "item": "upgrade_aquatic:pillow_coral" - }, - { - "item": "upgrade_aquatic:chrome_coral" - }, - { - "item": "upgrade_aquatic:silk_coral" - } - ], - { - "item": "minecraft:bone_meal" - } - ], - "result": { - "item": "create:tree_fertilizer", - "count": 2 - } -} From 67f77cf0b5a91a81a6260ccb1a089f63a69697c5 Mon Sep 17 00:00:00 2001 From: attackeight Date: Wed, 3 Jul 2024 19:20:42 -0400 Subject: [PATCH 7/7] Change from item to tag for sturdy sheet production (closes Creators-of-Create#6655) --- src/generated/resources/.cache/cache | 3 ++- .../create/recipes/sequenced_assembly/sturdy_sheet.json | 2 +- .../resources/data/forge/tags/items/dusts/obsidian.json | 6 ++++++ src/main/java/com/simibubi/create/AllTags.java | 1 + .../foundation/data/recipe/SequencedAssemblyRecipeGen.java | 3 ++- .../create/infrastructure/data/CreateRegistrateTags.java | 2 ++ 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/forge/tags/items/dusts/obsidian.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index fa14f86d4..b0acba469 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5457,7 +5457,7 @@ b27348bd726e0d99d20104f2a66572bee8f82520 data/create/recipes/scorchia_from_stone afefabc59a37e792b78f4a6a2d437c100a64139d data/create/recipes/scoria_from_stone_types_scoria_stonecutting.json d6e16599de7424513e1457b07acb6370815d2bd7 data/create/recipes/scoria_pillar_from_stone_types_scoria_stonecutting.json 2f660f8cc0a9740ba7e7992d3d51f04b67d23871 data/create/recipes/sequenced_assembly/precision_mechanism.json -de17d82738a5e0242eb3109fd2a75337160fc843 data/create/recipes/sequenced_assembly/sturdy_sheet.json +b98fa962bdd63929416cb50b4df1130cf8bf067b data/create/recipes/sequenced_assembly/sturdy_sheet.json 7610e0be633b1ade7ae39db3dbbfe1bd14aa333a data/create/recipes/sequenced_assembly/track.json 5e7648d55555c263539a2696b8d1f8d352a71dc9 data/create/recipes/small_andesite_brick_slab.json 4734a4ed04708b841f530ea95f23214e3b5d0ea4 data/create/recipes/small_andesite_brick_slab_from_stone_types_andesite_stonecutting.json @@ -5787,6 +5787,7 @@ d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json 5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json +a3ea70dc4ecbf3beeded920313e2770dd4a2dd6a data/forge/tags/items/dusts/obsidian.json 25078dad07e8f75134a98c2dd0f0511c55146bd5 data/forge/tags/items/flour.json 25078dad07e8f75134a98c2dd0f0511c55146bd5 data/forge/tags/items/flour/wheat.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/items/glass/colorless.json diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json b/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json index e7bc7550f..58b38e5c7 100644 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json @@ -1,7 +1,7 @@ { "type": "create:sequenced_assembly", "ingredient": { - "item": "create:powdered_obsidian" + "tag": "forge:dusts/obsidian" }, "transitionalItem": { "item": "create:unprocessed_obsidian_sheet" diff --git a/src/generated/resources/data/forge/tags/items/dusts/obsidian.json b/src/generated/resources/data/forge/tags/items/dusts/obsidian.json new file mode 100644 index 000000000..547c14cad --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:powdered_obsidian" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index bbd5d9c02..0223d507d 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -186,6 +186,7 @@ public class AllTags { STRIPPED_LOGS(FORGE), STRIPPED_WOOD(FORGE), PLATES(FORGE), + OBSIDIAN_DUST(FORGE,"dusts/obsidian"), WRENCH(FORGE, "tools/wrench"), ALLURITE(MOD,"stone_types/galosphere/allurite"), diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java index fdfbae03d..b176a6831 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java @@ -5,6 +5,7 @@ import java.util.stream.Stream; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.AllTags; import com.simibubi.create.AllTags.AllItemTags; import com.simibubi.create.Create; import com.simibubi.create.content.fluids.transfer.FillingRecipe; @@ -51,7 +52,7 @@ public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.largeCog())) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.ironNugget()))), - REINFORCED_SHEET = create("sturdy_sheet", b -> b.require(AllItems.POWDERED_OBSIDIAN.get()) + REINFORCED_SHEET = create("sturdy_sheet", b -> b.require(AllItemTags.OBSIDIAN_DUST.tag) .transitionTo(AllItems.INCOMPLETE_REINFORCED_SHEET.get()) .addOutput(AllItems.STURDY_SHEET.get(), 1) .loops(1) diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java index 14f60dd65..29e9ffa07 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java @@ -146,6 +146,8 @@ public class CreateRegistrateTags { prov.tag(Tags.Items.INGOTS) .addTag(AllItemTags.CREATE_INGOTS.tag); + prov.tag(AllItemTags.OBSIDIAN_DUST.tag).add(AllItems.POWDERED_OBSIDIAN.get()); + // COMPAT genStrippedWoodItemTags(prov);