From 94b03355e51c252b1aad1a917a783bfc242d370c Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 3 Nov 2023 19:16:10 -0400
Subject: [PATCH 1/7] Remove keybind fix

---
 index.toml               |  5 -----
 mods/keybind-fix.pw.toml | 13 -------------
 pack.toml                |  2 +-
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 mods/keybind-fix.pw.toml

diff --git a/index.toml b/index.toml
index 3b0f337..93b3d09 100644
--- a/index.toml
+++ b/index.toml
@@ -261,11 +261,6 @@ file = "mods/jei.pw.toml"
 hash = "3851cfa6f95cac87314de473dd4179271c8dab6c639652dc83ac688169c00124"
 metafile = true
 
-[[files]]
-file = "mods/keybind-fix.pw.toml"
-hash = "48777d535f2dbe76ec2adb6a001ab4442e40e0e403570eb5dc9a49e6957e40a1"
-metafile = true
-
 [[files]]
 file = "mods/krypton.pw.toml"
 hash = "71ef7cc16632c0039fe194183b5885968c6d740aaa67a58000653ae0cb40b882"
diff --git a/mods/keybind-fix.pw.toml b/mods/keybind-fix.pw.toml
deleted file mode 100644
index 79578c2..0000000
--- a/mods/keybind-fix.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Keybind Fix"
-filename = "keybind_fix-1.0.0.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/vuWNr14n/versions/4VeEKlR8/keybind_fix-1.0.0.jar"
-hash-format = "sha1"
-hash = "d99355fe589dfb41b2d7d7e2c20b733ca3a086d8"
-
-[update]
-[update.modrinth]
-mod-id = "vuWNr14n"
-version = "4VeEKlR8"
diff --git a/pack.toml b/pack.toml
index 09803a2..f76a771 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 = "c113ec09d1e34bf66f59994a24a0b924b2b5283404a9de7a849fd479df68b275"
+hash = "a82c3d8599b3096cec9e4d9ead07cb94ffc2c6e1a19793c190c40c33c4ed266e"
 
 [versions]
 minecraft = "1.20.1"

From ffa80ee603e05f1daaf0641271633429de07f94e Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 3 Nov 2023 19:16:35 -0400
Subject: [PATCH 2/7] Add Amecs (alternative to many keyboard mods)

- replaces keyboard-fix
- has functionality from controlling
- add key combinations
- add keybinds for toggling auto jump and skin layers
---
 index.toml         |  5 +++++
 mods/amecs.pw.toml | 13 +++++++++++++
 pack.toml          |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 mods/amecs.pw.toml

diff --git a/index.toml b/index.toml
index 93b3d09..1ecf1b7 100644
--- a/index.toml
+++ b/index.toml
@@ -56,6 +56,11 @@ hash = "6f5bf766cebabca0bcfa339eeb119956c48c40eba03c5aa39d7685eab67c56b5"
 file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt"
 hash = "6e7b02f11cb6feb7f08d1088d042518d1a04cb6b71a7b2b109cf997173510e3c"
 
+[[files]]
+file = "mods/amecs.pw.toml"
+hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc"
+metafile = true
+
 [[files]]
 file = "mods/appleskin.pw.toml"
 hash = "e3dfb2478e6bb096667d4ec89b0ddfef627747939373bdefee02f358d6e3dee1"
diff --git a/mods/amecs.pw.toml b/mods/amecs.pw.toml
new file mode 100644
index 0000000..d5013df
--- /dev/null
+++ b/mods/amecs.pw.toml
@@ -0,0 +1,13 @@
+name = "Amecs"
+filename = "amecs-1.3.10+mc.1.20.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/rcLriA4v/versions/HuXAp0GB/amecs-1.3.10%2Bmc.1.20.1.jar"
+hash-format = "sha1"
+hash = "1eff33308da62b47e5767875b28cdd436da77e2c"
+
+[update]
+[update.modrinth]
+mod-id = "rcLriA4v"
+version = "HuXAp0GB"
diff --git a/pack.toml b/pack.toml
index f76a771..2a64c60 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 = "a82c3d8599b3096cec9e4d9ead07cb94ffc2c6e1a19793c190c40c33c4ed266e"
+hash = "3146a25355cbc88458b4229e892ab0fd4faf359ec457267703fbd8b7dbd0627d"
 
 [versions]
 minecraft = "1.20.1"

From d4e85b21dd52fafe4defa0fa7c20013c17bc3502 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 3 Nov 2023 19:18:04 -0400
Subject: [PATCH 3/7] Add No More Useless Keys

This mod adds the ability to set multiple keybinds for actions
---
 index.toml        |  5 +++++
 mods/nmuk.pw.toml | 13 +++++++++++++
 pack.toml         |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 mods/nmuk.pw.toml

diff --git a/index.toml b/index.toml
index 1ecf1b7..5b18c34 100644
--- a/index.toml
+++ b/index.toml
@@ -321,6 +321,11 @@ file = "mods/mouse-tweaks.pw.toml"
 hash = "669008dbd2508a67f8c409096cf2357de450f26a69494289e5852045ade7d358"
 metafile = true
 
+[[files]]
+file = "mods/nmuk.pw.toml"
+hash = "c5c79054c0fe0b73e75f871f003fef87ed3be204cabd77c5df6cf6bb149f379c"
+metafile = true
+
 [[files]]
 file = "mods/no-chat-reports.pw.toml"
 hash = "7ca62a9da5c2ec9f0a8bed5394021c959e90077db16b313be44f4c8736f7fbf5"
diff --git a/mods/nmuk.pw.toml b/mods/nmuk.pw.toml
new file mode 100644
index 0000000..6df4ca6
--- /dev/null
+++ b/mods/nmuk.pw.toml
@@ -0,0 +1,13 @@
+name = "No More Useless Keys - NMUK"
+filename = "nmuk-1.1.0+mc1.20.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/YCcdA1Lp/versions/Skc8LGrP/nmuk-1.1.0%2Bmc1.20.1.jar"
+hash-format = "sha1"
+hash = "671a20ee5ae80dc979d2028fbc9a227d5e6e19fd"
+
+[update]
+[update.modrinth]
+mod-id = "YCcdA1Lp"
+version = "Skc8LGrP"
diff --git a/pack.toml b/pack.toml
index 2a64c60..bd1ebac 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 = "3146a25355cbc88458b4229e892ab0fd4faf359ec457267703fbd8b7dbd0627d"
+hash = "dec462436c4fd44d1e4fabb19dc0f4c5f650be2e77b0b44f70c8dd8f8f8d9d91"
 
 [versions]
 minecraft = "1.20.1"

From e5e12b96dc159ce4f6efb2464a4c2b4f14e67f9a Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 3 Nov 2023 20:17:07 -0400
Subject: [PATCH 4/7] Change some keybinds

Includes keybinds for some mods that are only in NotLite; I'd rather
only mess with one upstream settings file instead of having yet anoter
file to solve merge conflicts for. Hopefully Minecraft doesn't freak out
about nonexistent keybinds.
---
 config/yosbr/options.txt | 10 +++++++++-
 index.toml               |  2 +-
 pack.toml                |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config/yosbr/options.txt b/config/yosbr/options.txt
index 8519de8..a86ebb0 100644
--- a/config/yosbr/options.txt
+++ b/config/yosbr/options.txt
@@ -12,5 +12,13 @@ joinedFirstServer:true
 onboardAccessibility:false
 resourcePacks:["vanilla","fabric","continuity/default","continuity/glass_pane_culling_fix","betterbeds/connectedbeds","midnightcontrols/bedrock","continuity:default","continuity:glass_pane_culling_fix","betterbeds:connectedbeds","midnightcontrols:bedrock","file/VanillaTweaks_r265009.zip","file/enhanced-boss-bars.zip"]
 incompatibleResourcePacks:["betterbeds:connectedbeds","midnightcontrols:bedrock"]
-key_key.saveToolbarActivator:key.keyboard.v
 key_iris.keybind.reload:key.keyboard.unknown
+key_key.replaymod.marker:key.keyboard.comma
+key_key.presencefootsteps.settings:key.keyboard.unknown
+key_key.identity:key.keyboard.backslash
+key_key.identity_ability:key.keyboard.y
+key_key.optigui.inspect:key.keyboard.unknown
+key_key.fabricskyboxes.toggle.debug_hud:key.keyboard.unknown
+key_key.ae2.guide:key.keyboard.w
+key_gui.xaero_open_settings:key.keyboard.unknown
+key_gui.xaero_minimap_settings:key.keyboard.unknown
diff --git a/index.toml b/index.toml
index 5b18c34..aff7de9 100644
--- a/index.toml
+++ b/index.toml
@@ -42,7 +42,7 @@ hash = "29e8afe5258e9f0cbeb96d3e8ab0cbdb4eadacf48621a6df06a6dece25410547"
 
 [[files]]
 file = "config/yosbr/options.txt"
-hash = "f34523709dbae8f3b48196c4331ab6da7d6c6d70bbd5f0c4f6d2b7196021ec70"
+hash = "14303032dc114706dd212b473599d7c504cd1ec59ad3023e4214eab7859ed7ef"
 
 [[files]]
 file = "config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt"
diff --git a/pack.toml b/pack.toml
index bd1ebac..7c71007 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 = "dec462436c4fd44d1e4fabb19dc0f4c5f650be2e77b0b44f70c8dd8f8f8d9d91"
+hash = "36a5c68658c1937faa2045cdd44a691957d795119321495f8349678a07b157b2"
 
 [versions]
 minecraft = "1.20.1"

From 4a37481c6118743d446602218950c395f0aa99fe Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 3 Nov 2023 23:22:01 -0400
Subject: [PATCH 5/7] Add Carpet Extra

This is for accurateBlockPlacement compatibility
---
 index.toml                |  5 +++++
 mods/carpet-extra.pw.toml | 13 +++++++++++++
 pack.toml                 |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 mods/carpet-extra.pw.toml

diff --git a/index.toml b/index.toml
index aff7de9..2684af1 100644
--- a/index.toml
+++ b/index.toml
@@ -116,6 +116,11 @@ file = "mods/capes.pw.toml"
 hash = "4c712d7ad6d2ddb130b845c3b2c660be7cb7795db21be00b130443730719305e"
 metafile = true
 
+[[files]]
+file = "mods/carpet-extra.pw.toml"
+hash = "5aa266498f131bf7b9d764d608b6416f36555c228110c0d5126bcd7c8bec9f9c"
+metafile = true
+
 [[files]]
 file = "mods/carpet-fixes.pw.toml"
 hash = "d7c6555b666ff113894f6dd6dba7e6cc95c041542d06a39fd6f67421341711b9"
diff --git a/mods/carpet-extra.pw.toml b/mods/carpet-extra.pw.toml
new file mode 100644
index 0000000..a75f1a1
--- /dev/null
+++ b/mods/carpet-extra.pw.toml
@@ -0,0 +1,13 @@
+name = "Carpet Extra"
+filename = "carpet-extra-1.20-1.4.115.jar"
+side = "server"
+
+[download]
+url = "https://cdn.modrinth.com/data/VX3TgwQh/versions/gPJoJ3mr/carpet-extra-1.20-1.4.115.jar"
+hash-format = "sha1"
+hash = "09f1aeb870393d9ee07d895b5a60c7594a0bddd5"
+
+[update]
+[update.modrinth]
+mod-id = "VX3TgwQh"
+version = "gPJoJ3mr"
diff --git a/pack.toml b/pack.toml
index 7c71007..990f375 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 = "36a5c68658c1937faa2045cdd44a691957d795119321495f8349678a07b157b2"
+hash = "d0261521b0f9817dc079fd2b0c00f7624afe1fe91aeef4581bb091eb56b5241f"
 
 [versions]
 minecraft = "1.20.1"

From c9de1777576f12b028c1575edcbfa74ba3b09f50 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sat, 4 Nov 2023 00:56:17 -0400
Subject: [PATCH 6/7] Set default options for Carpet

- accurateBlockPlacement true (this allows Tweakeroo flexible block
  placement)
---
 config/yosbr/config/default_carpet.conf | 1 +
 config/yosbr/world/carpet.conf          | 1 +
 index.toml                              | 8 ++++++++
 pack.toml                               | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 config/yosbr/config/default_carpet.conf
 create mode 120000 config/yosbr/world/carpet.conf

diff --git a/config/yosbr/config/default_carpet.conf b/config/yosbr/config/default_carpet.conf
new file mode 100644
index 0000000..c88ff5a
--- /dev/null
+++ b/config/yosbr/config/default_carpet.conf
@@ -0,0 +1 @@
+accurateBlockPlacement true
diff --git a/config/yosbr/world/carpet.conf b/config/yosbr/world/carpet.conf
new file mode 120000
index 0000000..bc0b664
--- /dev/null
+++ b/config/yosbr/world/carpet.conf
@@ -0,0 +1 @@
+../config/default_carpet.conf
\ No newline at end of file
diff --git a/index.toml b/index.toml
index 2684af1..1207803 100644
--- a/index.toml
+++ b/index.toml
@@ -8,6 +8,10 @@ hash = "5c6f2a474736301aa66e13b9fe3bb9044cef658bae57e6b3507785554743a75c"
 file = "config/yosbr/config/capes.json5"
 hash = "b0e11760190870b23a50e68018a3792e6ad3929302bb2917db21268a20f858af"
 
+[[files]]
+file = "config/yosbr/config/default_carpet.conf"
+hash = "7e5cdd9f750de73a3962a551a54ac01aaae9411f84c8b8f2519b3ce1c138fff5"
+
 [[files]]
 file = "config/yosbr/config/figura.json"
 hash = "783c458bf3501796a8f07e396a5bb0d623c7f694c82974fefc228eb921bb82f3"
@@ -56,6 +60,10 @@ hash = "6f5bf766cebabca0bcfa339eeb119956c48c40eba03c5aa39d7685eab67c56b5"
 file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt"
 hash = "6e7b02f11cb6feb7f08d1088d042518d1a04cb6b71a7b2b109cf997173510e3c"
 
+[[files]]
+file = "config/yosbr/world/carpet.conf"
+hash = "7e5cdd9f750de73a3962a551a54ac01aaae9411f84c8b8f2519b3ce1c138fff5"
+
 [[files]]
 file = "mods/amecs.pw.toml"
 hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc"
diff --git a/pack.toml b/pack.toml
index 990f375..9df5e14 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 = "d0261521b0f9817dc079fd2b0c00f7624afe1fe91aeef4581bb091eb56b5241f"
+hash = "11faa26d7869f38403cdfd2d52188dd1b07d75da477d7aeaf84e0b48fa6ac095"
 
 [versions]
 minecraft = "1.20.1"

From 0a294253c359a68f29c70a3f1a7254a8bd7e9643 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sat, 4 Nov 2023 01:00:51 -0400
Subject: [PATCH 7/7] grrr gitea doesn't serve symlinks properly

---
 config/yosbr/world/carpet.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 120000 => 100644 config/yosbr/world/carpet.conf

diff --git a/config/yosbr/world/carpet.conf b/config/yosbr/world/carpet.conf
deleted file mode 120000
index bc0b664..0000000
--- a/config/yosbr/world/carpet.conf
+++ /dev/null
@@ -1 +0,0 @@
-../config/default_carpet.conf
\ No newline at end of file
diff --git a/config/yosbr/world/carpet.conf b/config/yosbr/world/carpet.conf
new file mode 100644
index 0000000..c88ff5a
--- /dev/null
+++ b/config/yosbr/world/carpet.conf
@@ -0,0 +1 @@
+accurateBlockPlacement true