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 1/3] 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 2/3] 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 3/3] 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