From b86e2598587484942d808f27a4e2b2e70193c400 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 19 Jun 2022 19:23:28 +0200 Subject: [PATCH] Replace Mouse Wheelie with Mouse Tweaks deduplicate functions sorting is now fully dedicated to Inventory Profiles Next --- config/MouseTweaks.cfg | 8 ++ .../inventoryprofiles.json | 5 + config/mousewheelie.hjson | 118 ------------------ config/yosbr/options.txt | 5 - index.toml | 16 +-- mods/mouse-tweaks.pw.toml | 13 ++ mods/mouse-wheelie.pw.toml | 13 -- pack.toml | 2 +- 8 files changed, 35 insertions(+), 145 deletions(-) create mode 100644 config/MouseTweaks.cfg delete mode 100644 config/mousewheelie.hjson create mode 100644 mods/mouse-tweaks.pw.toml delete mode 100644 mods/mouse-wheelie.pw.toml diff --git a/config/MouseTweaks.cfg b/config/MouseTweaks.cfg new file mode 100644 index 0000000..5dc1c5b --- /dev/null +++ b/config/MouseTweaks.cfg @@ -0,0 +1,8 @@ +RMBTweak=0 +LMBTweakWithItem=1 +LMBTweakWithoutItem=1 +WheelTweak=1 +WheelSearchOrder=1 +WheelScrollDirection=0 +ScrollItemScaling=0 +Debug=0 diff --git a/config/inventoryprofilesnext/inventoryprofiles.json b/config/inventoryprofilesnext/inventoryprofiles.json index fb94321..20fb3ae 100644 --- a/config/inventoryprofilesnext/inventoryprofiles.json +++ b/config/inventoryprofilesnext/inventoryprofiles.json @@ -21,6 +21,11 @@ "main": { "keys": "" } + }, + "sort_inventory": { + "main": { + "keys": "BUTTON_3" + } } } } \ No newline at end of file diff --git a/config/mousewheelie.hjson b/config/mousewheelie.hjson deleted file mode 100644 index 0b4eac6..0000000 --- a/config/mousewheelie.hjson +++ /dev/null @@ -1,118 +0,0 @@ -{ - // General settings - general: { - // Sets the interval in milliseconds in which certain packets are fired. - // Lower numbers increase the speed but might be rejected by servers. - // default: 10 - // Must be greater or equal to 1 - interaction-rate: 10 - // Enables right-clicking in recipe books/villager trading to swiftly craft/trade. - // default: true - enable-quick-craft: true - // This option will treat the hotbar as a separate scope. - // This means that pushing the inventory or sorting the main inventory will not affect the hotbar and vice-versa. - // default: true - hotbar-scope: true - // Enables using armor/elytra items to swap them with the currently equipped item. - // default: true - enable-quick-armor-swapping: true - // Enables dropping items when pressing alt and clicking on them. - // default: true - enable-alt-dropping: true - // This helps when you regularly move your mouse faster than the game can pick up. - // This will impact performance though. - // default: false - better-fast-dragging: false - // Sets the interval in milliseconds for singleplayer and local multiplayer. - // default: 1 - // Must be greater or equal to 1 - integrated-interaction-rate: 1 - } - scrolling: { - // Enables scrolling of stacks - // default: true - enable: true - // Invert the scroll direction when scrolling items - // default: false - invert: false - // If enabled items will be moved according to whether your scrolling up or down. - // If disabled you will scroll to change the amount of items present (up will increase - down will decrease - // default: true - directional-scrolling: true - // Sets whether to by default scroll items - // out of the creative menu. - // default: true - scroll-creative-menu-items: true - // Sets whether creative mode tabs can - // be switched by scrolling over them. - // default: true - scroll-creative-menu-tabs: true - } - // Change sort modes. Existing sort modes are ALPHABET, RAW_ID and QUANTITY - sort: { - // Sets the sort mode for normal sorting. - // default: raw_id - primary-sort: raw_id - // Sets the sort mode for sorting whilst pressing shift. - // default: quantity - shift-sort: quantity - // Sets the sort mode for sorting whilst pressing control. - // default: alphabet - control-sort: alphabet - } - // Configure refill related stuff here. - refill: { - // Refills stacks in the off hand - // default: true - off-hand: true - // Refill when eating items - // default: true - eat: true - // Refill when dropping items - // default: true - drop: true - // Refill when using up items - // default: true - use: true - // Refill on other occasions - // default: true - other: true - // Enable/Disable specific rules for how to refill items - rules: { - // Tries to find any block items - // default: false - any-block: false - // Find items of the same item group - // default: false - itemgroup: false - // Try to find similar items through the item type hierarchy - // default: false - item-hierarchy: false - // Try to find similar block items through the block type hierarchy - // default: false - block-hierarchy: false - // Try to find other food items - // default: false - food: false - // Try to find equal items (no nbt matching) - // default: true - equal-items: true - // Try to find equal stacks (nbt matching - // default: true - equal-stacks: true - } - } - // Configure picking the correct tool for the currently faced block. - tool-picking: { - // Pick correct tool when middle clicking whilst holding a tool. - // default: true - hold-tool: true - // Pick correct tool when middle clicking whilst holding the same block as faced. - // default: false - hold-block: false - // Allows picking tools from the inventory. - // If disabled picking will only happen from the hotbar. - // default: true - pick-from-inventory: true - } -} \ No newline at end of file diff --git a/config/yosbr/options.txt b/config/yosbr/options.txt index 2210ea9..82b79b3 100644 --- a/config/yosbr/options.txt +++ b/config/yosbr/options.txt @@ -114,11 +114,6 @@ key_key.hotbar.9:key.keyboard.9 key_key.worldeditcui.toggle:key.keyboard.n key_key.worldeditcui.clear:key.keyboard.j key_key.worldeditcui.chunk:key.keyboard.unknown -key_key.mousewheelie.open_config_screen:key.keyboard.unknown -key_key.mousewheelie.sort_inventory:key.mouse.middle -key_key.mousewheelie.scroll_up:key.amecsapi.mouse.scroll.up -key_key.mousewheelie.scroll_down:key.amecsapi.mouse.scroll.down -key_key.mousewheelie.pick_tool:key.keyboard.unknown key_key.amecs.alternative_escape:key.keyboard.unknown key_key.amecs.toggle_auto_jump:key.keyboard.unknown key_key.amecs.toggle_cape:key.keyboard.unknown diff --git a/index.toml b/index.toml index f4c4d66..5b4dce1 100644 --- a/index.toml +++ b/index.toml @@ -1,5 +1,9 @@ hash-format = "sha256" +[[files]] +file = "config/MouseTweaks.cfg" +hash = "11ba09a6771da982f9bdc906cb50b803804ab4d627566c85fc5ce9a7c4a72d68" + [[files]] file = "config/craftpresence.properties" hash = "66dea440cdcf45bcfad5346d65b17751a36ca64f98b85b96d13f8b2353d42cf8" @@ -26,11 +30,7 @@ hash = "3c94c0003a7616bea1a38887fafbe1c8a3e35f0ef0d0f4d5aad974ac73801b1a" [[files]] file = "config/inventoryprofilesnext/inventoryprofiles.json" -hash = "7817c58d7d83c19b764bcc7b261340ee18a1aaf36883c7f4b514c4b3a4eba13e" - -[[files]] -file = "config/mousewheelie.hjson" -hash = "e0d25973400d429e5bae4abaf5474e8d5e8fab5a2e9f362d683bd46a3698e725" +hash = "d9bde194129d278d3cbc9cdc4fa4cb180dab19a51d510e79c68d258bb9263871" [[files]] file = "config/openloader/advanced_options.json" @@ -82,7 +82,7 @@ hash = "d21233a7086fb4388fa446fe090c9cc3262942fc9273275ccd6a0c1d0a412a16" [[files]] file = "config/yosbr/options.txt" -hash = "ee373e1c3b6db566fe45ab90776bbb55143cb4c82ea7a3b59fd8b45d100521ec" +hash = "d3e6a381b4d432a66f793eb66e363e2e5a2a7eec8dbc9284ef6f91476ad69c3b" [[files]] file = "mods/accurate-block-placement.pw.toml" @@ -164,8 +164,8 @@ hash = "f0a7c49ae4417a753722da78046a7513e059e5964e21154f4aef50df6a1d6ed0" metafile = true [[files]] -file = "mods/mouse-wheelie.pw.toml" -hash = "a83db6f7f755d1a3eb8452f88d1871586dce2b1bca6c7a39d2fb0109ea55420d" +file = "mods/mouse-tweaks.pw.toml" +hash = "8f554f10f3ca26505c1f51871263a7d75fca1e07a288c60c1a96b18f830beede" metafile = true [[files]] diff --git a/mods/mouse-tweaks.pw.toml b/mods/mouse-tweaks.pw.toml new file mode 100644 index 0000000..491eb66 --- /dev/null +++ b/mods/mouse-tweaks.pw.toml @@ -0,0 +1,13 @@ +name = "Mouse Tweaks" +filename = "MouseTweaks-fabric-mc1.19-2.22.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/aC3cM3Vq/versions/1.19-2.22-fabric/MouseTweaks-fabric-mc1.19-2.22.jar" +hash-format = "sha1" +hash = "6004ccf55a3013c54fdbef3b28613c3326231d2c" + +[update] +[update.modrinth] +mod-id = "aC3cM3Vq" +version = "pmMCbsN3" diff --git a/mods/mouse-wheelie.pw.toml b/mods/mouse-wheelie.pw.toml deleted file mode 100644 index b6beaa8..0000000 --- a/mods/mouse-wheelie.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Mouse Wheelie" -filename = "mousewheelie-1.9.1+mc1.19-pre1.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/u5Ic2U1u/versions/1.9.1+mc1.19-pre1/mousewheelie-1.9.1%2Bmc1.19-pre1.jar" -hash-format = "sha1" -hash = "f0e8c101301d3584e0aa9ae1ca6678a6de25d4c2" - -[update] -[update.modrinth] -mod-id = "u5Ic2U1u" -version = "rvkjp7nF" diff --git a/pack.toml b/pack.toml index c183a82..53d9f4c 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 = "1413813af184740203ea5ae5e092a195542f85793a2c05b147994fc98fdc7586" +hash = "dbb9a900a084f61fcd40c843fe5ae5b1e49549ff83e45650e16118c42fdf017b" [versions] minecraft = "1.19"