diff --git a/config/almostunified/duplicates.json b/config/almostunified/duplicates.json new file mode 100644 index 0000000..2d0a3be --- /dev/null +++ b/config/almostunified/duplicates.json @@ -0,0 +1,35 @@ +{ + "ignored_recipe_types": [ + "cucumber:shaped_tag" + ], + "ignored_recipe_ids": [], + "default_duplicate_rules": { + "ignored_fields": [ + "neoforge:conditions", + "show_notification", + "category", + "group" + ], + "rules": { + "cookingtime": "HigherRule", + "energy": "HigherRule", + "experience": "HigherRule" + }, + "handle_implicit_counts": false + }, + "override_duplicate_rules": { + "minecraft:crafting_shaped": { + "ignored_fields": [ + "neoforge:conditions", + "pattern", + "show_notification", + "category", + "key", + "group" + ], + "rules": {}, + "handle_implicit_counts": false + } + }, + "compare_all": false +} \ No newline at end of file diff --git a/config/almostunified/placeholders.json b/config/almostunified/placeholders.json new file mode 100644 index 0000000..679510c --- /dev/null +++ b/config/almostunified/placeholders.json @@ -0,0 +1,49 @@ +{ + "material": [ + "aeternium", + "aluminum", + "amber", + "apatite", + "bitumen", + "brass", + "bronze", + "chrome", + "cinnabar", + "cobalt", + "constantan", + "copper", + "diamond", + "electrum", + "elementium", + "emerald", + "enderium", + "fluorite", + "gold", + "graphite", + "invar", + "iridium", + "iron", + "lapis", + "lead", + "lumium", + "mithril", + "netherite", + "nickel", + "obsidian", + "osmium", + "peridot", + "platinum", + "potassium_nitrate", + "ruby", + "salt", + "sapphire", + "signalum", + "silver", + "steel", + "sulfur", + "tin", + "tungsten", + "uranium", + "zinc" + ] +} \ No newline at end of file diff --git a/config/almostunified/tags.json b/config/almostunified/tags.json new file mode 100644 index 0000000..f4ebd78 --- /dev/null +++ b/config/almostunified/tags.json @@ -0,0 +1,18 @@ +{ + "custom_tags": { + "c:butter": ["farmersexpanse:butter"], + "c:butter_compat": ["farmersexpanse:butter"], + "c:frosting_ingredients": ["farmersexpanse:butter"], + + "c:salt": ["farmersexpanse:salt", "expandeddelight:salt"], + "c:salt_compat": ["vegandelight:salt", "farmersexpanse:salt", "expandeddelight:salt"], + "c:dusts": ["farmersexpanse:salt", "createfood:salt", "vegandelight:salt"], + "c:dusts/salt": ["farmersexpanse:salt", "createfood:salt", "vegandelight:salt"] + }, + "tag_substitutions": {}, + "item_tag_inheritance_mode": "ALLOW", + "item_tag_inheritance": {}, + "block_tag_inheritance_mode": "ALLOW", + "block_tag_inheritance": {}, + "emi_strict_hiding": true +} \ No newline at end of file diff --git a/config/almostunified/unification/materials.json b/config/almostunified/unification/materials.json new file mode 100644 index 0000000..2574a3d --- /dev/null +++ b/config/almostunified/unification/materials.json @@ -0,0 +1,40 @@ +{ + "mod_priorities": [ + "minecraft", + "create" + ], + "priority_overrides": {}, + "stone_variants": [ + "stone", + "andesite", + "deepslate", + "diorite", + "granite", + "netherrack", + "end_stone" + ], + "tags": [ + "butter", + "c:dusts/{material}", + "c:gears/{material}", + "c:gems/{material}", + "c:ingots/{material}", + "c:nuggets/{material}", + "c:ores/{material}", + "c:plates/{material}", + "c:raw_materials/{material}", + "c:rods/{material}", + "c:storage_blocks/raw_{material}", + "c:storage_blocks/{material}", + "c:wires/{material}" + ], + "ignored_tags": [], + "ignored_items": [], + "ignored_recipe_types": [ + "cucumber:shaped_tag" + ], + "ignored_recipe_ids": [], + "recipe_viewer_hiding": true, + "loot_unification": false, + "ignored_loot_tables": [] +} \ No newline at end of file diff --git a/config/kubejs/server_scripts/replace_tagless_items.js b/config/kubejs/server_scripts/replace_tagless_items.js new file mode 100644 index 0000000..07c3ab9 --- /dev/null +++ b/config/kubejs/server_scripts/replace_tagless_items.js @@ -0,0 +1,4 @@ +ServerEvents.recipes((event) => { + event.replaceInput({}, "farmersexpanse:butter", "#c:butter") + event.replaceInput({}, "vegandelight:salt", "#c:dusts/salt") +}) \ No newline at end of file diff --git a/index.toml b/index.toml index f8d51d6..fa364db 100644 --- a/index.toml +++ b/index.toml @@ -4,6 +4,22 @@ hash-format = "sha256" file = "config/Weather2/Storm.toml" hash = "8ffa08df2edc6b9c07a6e4be8fec9672a400ea48d0e9e48b9fccc5fad07652fc" +[[files]] +file = "config/almostunified/duplicates.json" +hash = "b70f57eadf6eec0ce43acd4c441f08feac1432826e04cb8e2736a73997c20c08" + +[[files]] +file = "config/almostunified/placeholders.json" +hash = "ebd5cd74dd9d019970c29ad55f0b90273421337a73d8aabda3c37fc77f012254" + +[[files]] +file = "config/almostunified/tags.json" +hash = "e9a2c86905c73ddff82455e2ce692f1d06ef25e7d4ddd2f7cd054c07677282ca" + +[[files]] +file = "config/almostunified/unification/materials.json" +hash = "cd0cb2efd813a5c157a3530984bdaab2a77f0044de85ed6e3425fcd455677e91" + [[files]] file = "config/default_files/config/MouseTweaks.cfg" hash = "438de2af36bf905993252e5015ad3b2f907473f0ad2722d6c79185728bb9b20b" @@ -36,6 +52,10 @@ hash = "be81cfec6bcf77e1d00f85db8d1a8d922badda79a71363d67ed964fdd2cc7702" file = "config/item_obliterator.json5" hash = "5abb022e28280a09fa10b46ca5a07c5e7d7183452d797917cee6fac8de869e47" +[[files]] +file = "config/kubejs/server_scripts/replace_tagless_items.js" +hash = "983025e310ab4dd00f475ae16a1c891fc0f50b1a30d8287be8e7ad712982c0d4" + [[files]] file = "config/paxi/datapacks/weather2-craftables/data/weather2/recipe/weather_deflector.json" hash = "1c757ce7f6037417dfdfdaec80a21a9bfa26aeb39fa483688f918e11d98e9387" @@ -608,6 +628,11 @@ file = "mods/guideme.pw.toml" hash = "4b65bc889b87002a5afe4c236a54cf8c1dab11788df1807fa29abd74004cf696" metafile = true +[[files]] +file = "mods/ibo.pw.toml" +hash = "1250166dde2aa42b1eb1ef837811c1ebe8cd86d3550cfdb1e36969247321db96" +metafile = true + [[files]] file = "mods/ichunutil.pw.toml" hash = "4dcfc94168c8681f207b0124d574a970472601cd1b5e9b215a37265c753b7b47" @@ -688,6 +713,11 @@ file = "mods/ksyxis.pw.toml" hash = "7c6239fe970cd45a1f680493b9fceef6870afcfd2de72086bfef3f765bd3c4c6" metafile = true +[[files]] +file = "mods/kubejs.pw.toml" +hash = "eba62fcfbe8678c035ef239481af4f01b21b33d198f8bf7467726e02bf37f845" +metafile = true + [[files]] file = "mods/l_enders-cataclysm-delight.pw.toml" hash = "1584f5cf54a629f1111a0bb6373313aab12dde00d9c6940fcd3bac9d75cf95bc" @@ -918,6 +948,11 @@ file = "mods/resourceful-config.pw.toml" hash = "27721caca5a03b743bf25888e1d984142948069dace31453f103f94f7f24d2ce" metafile = true +[[files]] +file = "mods/rhino.pw.toml" +hash = "4c4185186dccb224e20da04103e40c32cfe11b8c6884b83e8d6ac60857daf969" +metafile = true + [[files]] file = "mods/rogues-and-warriors.pw.toml" hash = "6c61c7609a15f81a318efa48cbdd0572a63ab049da9d1cad7a0973966cac91c6" @@ -1108,6 +1143,11 @@ file = "mods/toadlib.pw.toml" hash = "fb3f7aff0e776639951d7e8efbf88224fdd2b65426667d59a531164794f78463" metafile = true +[[files]] +file = "mods/too-fast.pw.toml" +hash = "63da0a2850babdf37f9511b17d2962fbaa9ce980d4c8478299767954df4efc19" +metafile = true + [[files]] file = "mods/tough-as-nails.pw.toml" hash = "f615375185613c362892ab32d5359e9da1552345e92993feecb48853fa876711" diff --git a/mods/ibo.pw.toml b/mods/ibo.pw.toml new file mode 100644 index 0000000..f9b3b9f --- /dev/null +++ b/mods/ibo.pw.toml @@ -0,0 +1,13 @@ +name = "Incendium Biomes Only" +filename = "ibo-3.0.0-neoforge-1.21.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/gmUU3UdW/versions/3Ug3M05E/ibo-3.0.0-neoforge-1.21.jar" +hash-format = "sha512" +hash = "6c9131e2950bbf1226ff1d4b9e3bc5e422699b2fac8495ec722de6b99c52023311fdfc9c1713cf4a693ec53a0fb4b70d9d2798c5a92d814e13234ced78ca65f8" + +[update] +[update.modrinth] +mod-id = "gmUU3UdW" +version = "3Ug3M05E" diff --git a/mods/kubejs.pw.toml b/mods/kubejs.pw.toml new file mode 100644 index 0000000..fed51ac --- /dev/null +++ b/mods/kubejs.pw.toml @@ -0,0 +1,13 @@ +name = "KubeJS" +filename = "kubejs-neoforge-2101.7.1-build.181.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/umyGl7zF/versions/3w2ufpfQ/kubejs-neoforge-2101.7.1-build.181.jar" +hash-format = "sha512" +hash = "25531dc40cee02012384c6cf645829db27816c5d107baa9aa118885fbd418237ff43974451a52f1671be6cd075dbf33cbeb20df5eaf33cd31421ef5f66413726" + +[update] +[update.modrinth] +mod-id = "umyGl7zF" +version = "3w2ufpfQ" diff --git a/mods/rhino.pw.toml b/mods/rhino.pw.toml new file mode 100644 index 0000000..9572487 --- /dev/null +++ b/mods/rhino.pw.toml @@ -0,0 +1,13 @@ +name = "Rhino" +filename = "rhino-2101.2.7-build.74.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/sk9knFPE/versions/6ClRsUNJ/rhino-2101.2.7-build.74.jar" +hash-format = "sha512" +hash = "891c755e1a55fceae6b3c321ba0e84d403ebb4a4de6058890b5ac1a5c937057230df2bcc2c1096f6c3d52337763f5f7485ceca1869c8a34e6d01e10602b9ffa8" + +[update] +[update.modrinth] +mod-id = "sk9knFPE" +version = "6ClRsUNJ" diff --git a/mods/too-fast.pw.toml b/mods/too-fast.pw.toml new file mode 100644 index 0000000..d285089 --- /dev/null +++ b/mods/too-fast.pw.toml @@ -0,0 +1,13 @@ +name = "Too Fast" +filename = "toofast-1.21.0-0.4.3.5.jar" +side = "server" + +[download] +url = "https://cdn.modrinth.com/data/w6JSkKSH/versions/pDkjMI8q/toofast-1.21.0-0.4.3.5.jar" +hash-format = "sha512" +hash = "4108ff7d3ca21c4392f99df510bdcc5ca968def79ed0a855c8e77be91b583b4f435ee643b952a8238369db3bdcda3725c2efc84ca105fd0978b76c803ea250ec" + +[update] +[update.modrinth] +mod-id = "w6JSkKSH" +version = "pDkjMI8q" diff --git a/pack.toml b/pack.toml index a7c772a..f9cc3bd 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "4217f20467aaee1f1631916192abc0bbd2785383b1e185026ef5a0b52dc93a1c" +hash = "158b5457f536b8b7b47337fb64518d2ce17f463a3704c6fc9765c9fa9d2ca305" [versions] minecraft = "1.21.1"