diff --git a/Vanilla Plus Plus-1.0.0.mrpack b/Vanilla Plus Plus-1.0.0.mrpack index af90023..9504ea8 100644 Binary files a/Vanilla Plus Plus-1.0.0.mrpack and b/Vanilla Plus Plus-1.0.0.mrpack differ diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json index c15ddb7..d4522e6 100644 --- a/config/almostunified/unify.json +++ b/config/almostunified/unify.json @@ -83,14 +83,21 @@ "zinc" ], "priorityOverrides": {}, - "customTags": {}, + "customTags": { + "vpp:rope": [ + "dustydecorations:rope", + "beautify:rope", + "farmersdelight:rope", + "supplementaries:rope" + ] + }, "tagOwnerships": {}, "itemTagInheritanceMode": "ALLOW", "itemTagInheritance": {}, "blockTagInheritanceMode": "ALLOW", "blockTagInheritance": {}, "ignoredTags": [], - "ignoredItems": ["minecraft:iron_ingot", "betternether:cincinnasite_ingot", "betterend:thallasium_ingot"], + "ignoredItems": [".*thallasium.*", ".*cincinnasite.*"], "ignoredRecipeTypes": [ "cucumber:shaped_tag" ], diff --git a/index.toml b/index.toml index b273bdb..e8d2add 100644 --- a/index.toml +++ b/index.toml @@ -14,7 +14,7 @@ hash = "0acf51cddc16eacd4ff54239f6413f7ff651129bec6fd8c50c8c1836e5702a79" [[files]] file = "config/almostunified/unify.json" -hash = "7d000a22f50e90a06c61fe71c14578bcaef04f91b6f8fdabd081a44e0993ca95" +hash = "80f6483d21144ddf2adfdde9f6b1ed4732fd6b0cffbc5ef2040dfd766efb4879" [[files]] file = "config/betterarcheology_structures/structure_settings.json5" @@ -530,6 +530,11 @@ file = "mods/craftify.pw.toml" hash = "800fa9bd83d47d78dddd57854d8ca95fe4b71a0a1cfdf6996544e1e6591d9470" metafile = true +[[files]] +file = "mods/crafttweaker.pw.toml" +hash = "c4364e472a41bc080f991089d883328794c29ca85b284549075e5c6c5332294b" +metafile = true + [[files]] file = "mods/crate-delight.pw.toml" hash = "ecb15182468c40f833164c8975bf85e7d913266412f8da1ff031ae664703b076" @@ -820,6 +825,11 @@ file = "mods/faster-random.pw.toml" hash = "605fe60f2ada4333e88ec2fa66cb57d0635292d83eee8d1ad40f2485d72ef013" metafile = true +[[files]] +file = "mods/faux-custom-entity-data.pw.toml" +hash = "00f2e8c9f900b119fc5931bce91d7c00845a8e494db8910c3a4e7d69bde2bc75" +metafile = true + [[files]] file = "mods/fence_on_slab.pw.toml" hash = "92432e5680b01ffc3194e43afff3c02d38e2d9a6b085ecae4325c052f4b42970" @@ -1664,3 +1674,11 @@ metafile = true file = "mods/zoomify.pw.toml" hash = "548772ed4c11f15dfac400681ba5893e73956b6daa9762ed57f5ad4bee05e041" metafile = true + +[[files]] +file = "scripts/newrecipes.zs" +hash = "2f3a02e0741021a447fee5c806386423fd0e7ba05da5772bbf8a8e33be110f88" + +[[files]] +file = "scripts/rope.zs" +hash = "fbf7f33bad8903774191e9e99e21a4ad0b8d965e34f6080e06a3401605fdb247" diff --git a/mods/crafttweaker.pw.toml b/mods/crafttweaker.pw.toml new file mode 100644 index 0000000..06e6751 --- /dev/null +++ b/mods/crafttweaker.pw.toml @@ -0,0 +1,13 @@ +name = "CraftTweaker" +filename = "CraftTweaker-fabric-1.20.1-14.0.46.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/evkNBecn/CraftTweaker-fabric-1.20.1-14.0.46.jar" +hash-format = "sha512" +hash = "099e1ceb1fe756f395b1bda8eee1085a9786c83652a549f977c591a647bb202c555ee6998865e70772bd997e7a9f51bf8765906dd110eada3629495b91135de0" + +[update] +[update.modrinth] +mod-id = "Xg35A4rS" +version = "evkNBecn" diff --git a/mods/faux-custom-entity-data.pw.toml b/mods/faux-custom-entity-data.pw.toml new file mode 100644 index 0000000..dedea9e --- /dev/null +++ b/mods/faux-custom-entity-data.pw.toml @@ -0,0 +1,13 @@ +name = "Faux Custom Entity Data" +filename = "FauxCustomEntityData-fabric-1.20.1-6.0.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/E7ZFR7qk/versions/11wR6r8x/FauxCustomEntityData-fabric-1.20.1-6.0.1.jar" +hash-format = "sha512" +hash = "db9599b6bbbf236ee48712052731cccae0b2431f959d047e51c94b4a4ce9ad48710da48ae699d06b275e9ebb74ddb5b5ccf7678efee9a1ecafc2a04456ed9105" + +[update] +[update.modrinth] +mod-id = "E7ZFR7qk" +version = "11wR6r8x" diff --git a/pack.toml b/pack.toml index 777663b..42d5cb4 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 = "f1a7b17862c9eea9b2bf8eed5fa66bcd836d27e536a784072a30e98b5b49dce1" +hash = "d43e51eb5f64af4449e4945a9f3fa7f363c380d2f327ce582d10e53da245355a" [versions] minecraft = "1.20.1" diff --git a/scripts/newrecipes.zs b/scripts/newrecipes.zs new file mode 100644 index 0000000..19c2385 --- /dev/null +++ b/scripts/newrecipes.zs @@ -0,0 +1,47 @@ +import crafttweaker.api.recipe.CraftingTableRecipeManager; + +// Tide Fishing Line +craftingTable.remove(); +craftingTable.addShaped("vpp_tide_fishing_line_from_string", , [[], []]); + +// Jewelry (RPG Series) Rings / CreateDeco Support recipe conflict +craftingTable.removeByRegex("createdeco:[a-z,_]*_support"); +craftingTable.addShaped("vpp_createdeco_andesite_support", , [ + [, , ], + [, , ], + [, , ] +]); + +craftingTable.addShaped("vpp_createdeco_brass_support", , [ + [, , ], + [, , ], + [, , ] +]); + +craftingTable.addShaped("vpp_createdeco_iron_support", , [ + [, , ], + [, , ], + [, , ] +]); + +craftingTable.addShaped("vpp_createdeco_copper_support", , [ + [, , ], + [, , ], + [, , ] +]); + +craftingTable.addShaped("vpp_createdeco_industrial_iron_support", , [ + [, , ], + [, , ], + [, , ] +]); + +craftingTable.addShaped("vpp_createdeco_zinc_support", , [ + [, , ], + [, , ], + [, , ] +]); + +// Handcrafted Plate and Supplementaries Item Shelves recipe conflict +craftingTable.remove(); +craftingTable.addShaped("vpp_handcrafted_wood_plate", , [[, ]]); diff --git a/scripts/rope.zs b/scripts/rope.zs new file mode 100644 index 0000000..972eb0e --- /dev/null +++ b/scripts/rope.zs @@ -0,0 +1,15 @@ +import crafttweaker.api.recipe.replacement.Replacer; +import crafttweaker.api.predicate.TagPredicate; +import crafttweaker.api.tag.type.KnownTag; +import crafttweaker.api.item.ItemDefinition; +import crafttweaker.api.ingredient.IIngredient; + +var ropeTag as KnownTag; +ropeTag = ; + +Replacer.create() + .replace(, , ropeTag.asIIngredient()) + .replace(, , ropeTag.asIIngredient()) + .replace(, , ropeTag.asIIngredient()) + .replace(, , ropeTag.asIIngredient()) + .execute();