From 0fc29124fbb8f7e945bebfe1e233589e33032c64 Mon Sep 17 00:00:00 2001 From: Chikage0o0 Date: Fri, 9 Dec 2022 23:15:29 +0800 Subject: [PATCH] fix: replace emi to rei --- build.sh | 1 + client-overrides/config/yosbr/config/emi.css | 249 ------------------- index.toml | 50 ++-- mods/emi.pw.toml | 13 - mods/emicompat.pw.toml | 13 - mods/emitrades.pw.toml | 13 - mods/roughly-enough-items.pw.toml | 13 + mods/roughly-enough-resources.pw.toml | 13 + mods/roughly-enough-trades.pw.toml | 13 + pack.toml | 2 +- 10 files changed, 66 insertions(+), 314 deletions(-) delete mode 100644 client-overrides/config/yosbr/config/emi.css delete mode 100644 mods/emi.pw.toml delete mode 100644 mods/emicompat.pw.toml delete mode 100644 mods/emitrades.pw.toml create mode 100644 mods/roughly-enough-items.pw.toml create mode 100644 mods/roughly-enough-resources.pw.toml create mode 100644 mods/roughly-enough-trades.pw.toml diff --git a/build.sh b/build.sh index ea6a40a..91845db 100644 --- a/build.sh +++ b/build.sh @@ -29,6 +29,7 @@ echo >&2 "Creating mrpack archive for: ${pack_name} ${pack_version}" rm -f ~/.cache/packwiz/cache/import/* downloadLinks=( "https://mediafilez.forgecdn.net/files/4139/885/inmisaddon-1.0.3.jar" + "https://mediafilez.forgecdn.net/files/3963/321/RoughlyEnoughTrades-1.19-1.0.jar" ) for downloadLink in ${downloadLinks[@]} do diff --git a/client-overrides/config/yosbr/config/emi.css b/client-overrides/config/yosbr/config/emi.css deleted file mode 100644 index c9100d1..0000000 --- a/client-overrides/config/yosbr/config/emi.css +++ /dev/null @@ -1,249 +0,0 @@ -/** EMI Config */ - -#general { - /** - * Whether EMI is enabled and visible. - */ - enabled: true; - - /** - * Whether cheating in items is enabled. - */ - cheat-mode: false; -} - -#ui { - /** - * Whether to move status effects to the - * left of the screen. - */ - move-effects: true; - - /** - * Whether to have the search bar in the - * center of the screen, instead of to the side. - */ - center-search-bar: true; - - /** - * Whether to display a gray overlay when - * hovering over a stack. - */ - show-hover-overlay: false; - - /** - * Whether to add mod name to item tooltips - */ - append-item-mod-id: false; - - /** - * Whether an empty search should display - * craftable recipes, instead of the index. - */ - empty-search-craftable: false; - - /** - * The amount of columns to display - * on the favorites sidebar. - * A value of zero will disable it. - */ - max-favorite-columns: 999; - - /** - * The amount of columns to display - * on the index sidebar. - * A value of zero will disable it. - */ - max-index-columns: 999; - - /** - * The amount of vertical margin to - * give in the recipe screen. - */ - vertical-margin: 20; - - /** - * Prevents recipes being quick crafted - * from shifting around under the cursor. - */ - miscraft-prevention: true; - - /** - * The unit to display fluids as. - */ - fluid-unit: liters; - - /** - * Display cost per batch when hovering - * a recipe output - */ - show-cost-per-batch: true; - - /** - * Whether recipes should have a button to - * set as default. - */ - recipe-default-button: true; - - /** - * Whether recipes should have a button to - * show the recipe tree. - */ - recipe-tree-button: true; - - /** - * Whether recipes should have a button to - * fill the ingredients in a handler. - */ - recipe-fill-button: true; - - /** - * Whether to use the batched render system. - * Batching is faster, but may have incompatibilities - * with shaders or other mods. - */ - use-batched-renderer: true; -} - -#binds { - /** - * Toggle the visibility of EMI. - */ - toggle-visibility: "ctrl key.keyboard.o"; - - /** - * Focuse the search bar. - */ - focus-search: "ctrl key.keyboard.f"; - - /** - * Display the recipes for creating an item. - */ - view-recipes: "key.keyboard.r"; - view-recipes: "key.mouse.left"; - - /** - * Display the recipes that can be created - * using an item. - */ - view-uses: "key.keyboard.u"; - view-uses: "key.mouse.right"; - - /** - * Favorite the item to display on the - * side of the screen opposite of - * recipies for quick access. - */ - favorite: "key.keyboard.a"; - - /** - * Display the recipe tree for a given item. - */ - view-stack-tree: "key.keyboard.unknown"; - - /** - * Display the recipe tree. - */ - view-tree: "key.keyboard.unknown"; - - /** - * Return to the previous page in EMI. - */ - back: "key.keyboard.backspace"; - - /** - * Toggle between index and craftable - * search modes. - */ - toggle-craftable: "key.keyboard.unknown"; - - /** - * Toggle craftable filter between - * all recipes and current workstation. - */ - toggle-local-craftable: "key.keyboard.unknown"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for a single result. - */ - craft-one: "key.mouse.left"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for as many results as possible. - */ - craft-all: "shift key.mouse.left"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for a single result - * and put in inventory if possible. - */ - craft-one-to-inventory: "key.keyboard.unknown"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for as many results as possible - * and put in inventory if possible. - */ - craft-all-to-inventory: "key.keyboard.unknown"; - - /** - * When on a stack with an associated recipe: - * Move ingredients for a single result - * and put in cursor if possible. - */ - craft-one-to-cursor: "ctrl key.mouse.left"; - - /** - * Cheat in one of an item into the inventory. - */ - cheat-one-to-inventory: "ctrl key.mouse.right"; - - /** - * Cheat in a stack of an item into the inventory. - */ - cheat-stack-to-inventory: "ctrl key.mouse.left"; - - /** - * Cheat in one of an item into the cursor. - */ - cheat-one-to-cursor: "ctrl key.mouse.middle"; - - /** - * Cheat in a stack of an item into the cursor. - */ - cheat-stack-to-cursor: "key.keyboard.unknown"; -} - -#dev { - /** - * Whether certain development functions should be enabled. - * Not recommended for general play. - */ - dev-mode: false; - - /** - * Whether to log untranslated tags as warnings. - */ - log-untranslated-tags: false; - - /** - * Whether hovering the output of a recipe should show - * the recipe's EMI ID. - */ - show-recipe-ids: false; - - /** - * Whether stacks in the index should display a highlight - * if they have a recipe default. - */ - highlight-defaulted: false; -} - -#persistent { - craftable: false; - - local-craftable: true; -} diff --git a/index.toml b/index.toml index 55202d1..4bfcd05 100644 --- a/index.toml +++ b/index.toml @@ -67,7 +67,7 @@ metafile = true [[files]] file = "mods/architectury-api.pw.toml" -hash = "08ac0b6bdf14a0460a1cbd73eee1ecac0494b60a717eb8cbc3e9f97b9a23b2bf" +hash = "808c30194a90fce3a57ba82e92333518f3a14a5fdb69c84b5fac247e46557632" metafile = true [[files]] @@ -157,7 +157,7 @@ metafile = true [[files]] file = "mods/bookshelf.pw.toml" -hash = "37031b97299b444d87cebb4c40091fca6130cc1ffd5d5eac7bd56ff1406cfa10" +hash = "c19d5ad0b3b30fc4d9f1a712b0686f267bbd08b825e5439817b585195f7d0797" metafile = true [[files]] @@ -345,21 +345,6 @@ file = "mods/elytra-slot-fabric.pw.toml" hash = "0e47b1328fabc6872c409910a090ec24051381f23e289efd6d0507d63013adbc" metafile = true -[[files]] -file = "mods/emi.pw.toml" -hash = "f8a11078f1d7f960612efacc95c1ddc2c8f29b8ade91fa248917659d4a767537" -metafile = true - -[[files]] -file = "mods/emicompat.pw.toml" -hash = "c607c7f81a931c158807ce6625af6b3d6c2c2d8f13f0fd5d95aa8494e4b4d4d0" -metafile = true - -[[files]] -file = "mods/emitrades.pw.toml" -hash = "cfcfcb3c97190708fe47074148d803d339713bdaa908b98d57a6ef4e40e053b5" -metafile = true - [[files]] file = "mods/enchantment-descriptions.pw.toml" hash = "34937c108a74455347f53276aedc8a670dac3c430ef23392487a75868a6e6091" @@ -412,7 +397,7 @@ metafile = true [[files]] file = "mods/forge-config-api-port.pw.toml" -hash = "4d7ecd93d92bab7af57de8b71aa52676dc93df2b92991702af582b026f256448" +hash = "63abc798591351fddc8069cf92991ffe6e058f939e259a27d284270e835e9530" metafile = true [[files]] @@ -472,7 +457,7 @@ metafile = true [[files]] file = "mods/inmisaddon.pw.toml" -hash = "68aae324d7a920d9bb76a146ad50673c86aa4b60373b9d31f446a4a05b47912d" +hash = "de1c6321991e538bae09a89a3e890b4e1117d075c8b16f3766e22af42044522e" metafile = true [[files]] @@ -482,7 +467,7 @@ metafile = true [[files]] file = "mods/inventory-hud-forge.pw.toml" -hash = "ea6db77eedf358ad059f0d57a9eff50d6c7719e4267a836c08e247b08a9d43fc" +hash = "7fffcce3f4ed60a994d0acc0c18ebcf87fa10778a13913ba23340847acbea581" metafile = true [[files]] @@ -492,7 +477,7 @@ metafile = true [[files]] file = "mods/iris.pw.toml" -hash = "b27773505b8fcfb4dd88dbc5b3cea9c5dfb3d9fac0cb4d91f4b8ccbde7a275ad" +hash = "b6567c077d73ed0956dcd849e5875ada50435322cddc1b7db9595a6884ef5a08" metafile = true [[files]] @@ -552,7 +537,7 @@ metafile = true [[files]] file = "mods/lithium.pw.toml" -hash = "d2a65b42dcefbda9ac5c170ff5bf59b4a56ba192993a13d0b0da9b1f0678b4b3" +hash = "77e9a02e09ec5a0d6682e5f448953048d99e36da299d92627044aff0828798e3" metafile = true [[files]] @@ -562,7 +547,7 @@ metafile = true [[files]] file = "mods/lootr-fabric.pw.toml" -hash = "2a53a57537b1e0cd973a4147ef80610a90533b788148d96f967335c43558104f" +hash = "056d867e226a65d47a019541865ca85a2123979c042faa6f63f9d4d5efa8799b" metafile = true [[files]] @@ -612,7 +597,7 @@ metafile = true [[files]] file = "mods/modmenu.pw.toml" -hash = "7358029830c4246e9039d12156bb5a0b7aecd128155330783ca8bdb57a12333c" +hash = "09eb7db3ca7778d91ad66845e41b6b4814655fe375a05d4a69528c74b4f1c8af" metafile = true [[files]] @@ -725,6 +710,21 @@ file = "mods/rightclickharvest.pw.toml" hash = "58895127695d12757a124219ae3f0ca7286d518179368fe3f6d7753604673cb8" metafile = true +[[files]] +file = "mods/roughly-enough-items.pw.toml" +hash = "b80d2c3e7f014940b9eb8c1db7f854d5d361f1a3b6b36ce5e6496c9b8d1b11fb" +metafile = true + +[[files]] +file = "mods/roughly-enough-resources.pw.toml" +hash = "6f46cfcca55777b06ce0bf646a815aed4fbc4eb19e21e055a8e6528e41397278" +metafile = true + +[[files]] +file = "mods/roughly-enough-trades.pw.toml" +hash = "8475c32e2c1bbee5dd0b21e67ef7968499e2c5d57d0864591d8f8f3c9cc31e83" +metafile = true + [[files]] file = "mods/screenshot-to-clipboard.pw.toml" hash = "672f3809a2053eef01aea4015ca4b0d4be6c507622172c091c17833b8d2ffb39" @@ -772,7 +772,7 @@ metafile = true [[files]] file = "mods/starter-kit.pw.toml" -hash = "2bc9743c3786e66b5de8c237c350b6b7cd046e7845f2a44c617d92342caf7cfd" +hash = "6d59181ee1d152519a201bb34b0215648ca17807a6764b12518f4ae3ece9a765" metafile = true [[files]] diff --git a/mods/emi.pw.toml b/mods/emi.pw.toml deleted file mode 100644 index b689619..0000000 --- a/mods/emi.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "EMI" -filename = "emi-0.5.0+1.19.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/p9jbOqyn/emi-0.5.0%2B1.19.2.jar" -hash-format = "sha1" -hash = "989b2b9d02b239bbe88264f5077d1acaac789cf9" - -[update] -[update.modrinth] -mod-id = "fRiHVvU7" -version = "p9jbOqyn" diff --git a/mods/emicompat.pw.toml b/mods/emicompat.pw.toml deleted file mode 100644 index a633e73..0000000 --- a/mods/emicompat.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "EMICompat" -filename = "emicompat-2.0.2.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/cK0i8gTV/versions/3HInkaQT/emicompat-2.0.2.jar" -hash-format = "sha1" -hash = "c2a449e5b9dd46064685070d9c685c418c7cd39e" - -[update] -[update.modrinth] -mod-id = "cK0i8gTV" -version = "3HInkaQT" diff --git a/mods/emitrades.pw.toml b/mods/emitrades.pw.toml deleted file mode 100644 index 099f937..0000000 --- a/mods/emitrades.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "EMI Trades" -filename = "EMITrades-fabric-1.0.2+mc1.19.2.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/j2HhbEE7/versions/YnCegFtP/EMITrades-fabric-1.0.2%2Bmc1.19.2.jar" -hash-format = "sha1" -hash = "1343aeee6535f0131e44f9a0365f7420bb5bde91" - -[update] -[update.modrinth] -mod-id = "j2HhbEE7" -version = "YnCegFtP" diff --git a/mods/roughly-enough-items.pw.toml b/mods/roughly-enough-items.pw.toml new file mode 100644 index 0000000..cccfc1d --- /dev/null +++ b/mods/roughly-enough-items.pw.toml @@ -0,0 +1,13 @@ +name = "Roughly Enough Items (REI)" +filename = "RoughlyEnoughItems-9.1.577.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/nfn13YXA/versions/KZADcrcr/RoughlyEnoughItems-9.1.577.jar" +hash-format = "sha1" +hash = "114fd2bd103700db6b598fb6aaf5aa06a5f258fa" + +[update] +[update.modrinth] +mod-id = "nfn13YXA" +version = "KZADcrcr" diff --git a/mods/roughly-enough-resources.pw.toml b/mods/roughly-enough-resources.pw.toml new file mode 100644 index 0000000..d05cd1b --- /dev/null +++ b/mods/roughly-enough-resources.pw.toml @@ -0,0 +1,13 @@ +name = "Roughly Enough Resources" +filename = "rer-2.6.0.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "4d7df7f6b4f838c8646e4fa7b86388e974e86f98" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3837336 +project-id = 325625 diff --git a/mods/roughly-enough-trades.pw.toml b/mods/roughly-enough-trades.pw.toml new file mode 100644 index 0000000..b4d8da4 --- /dev/null +++ b/mods/roughly-enough-trades.pw.toml @@ -0,0 +1,13 @@ +name = "Roughly Enough Trades" +filename = "RoughlyEnoughTrades-1.19-1.0.jar" +side = "client" + +[download] +hash-format = "sha1" +hash = "48b9b7086431d1de129b4e3c180a97edd91a646b" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3963321 +project-id = 664356 diff --git a/pack.toml b/pack.toml index 2b5b779..033cc5d 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 = "c60e203a3a5158e511468a42f51b6026ddec990d6cbec38347baf9babb278879" +hash = "01d3738ef6937d63b0c309b446dff30e3c56db218c4d5ec9b34e59c00bcacaba" [versions] fabric = "0.14.11"