From fa881ad2aa6426a8020ba37d098f604e49d5b8eb Mon Sep 17 00:00:00 2001 From: Una Thompson Date: Wed, 2 Aug 2023 18:19:31 -0700 Subject: [PATCH] Use Theora PictureSign fork, configure EBE to fix PictureSign --- config/enhanced_bes.properties | 19 +++++++++++++++++++ config/picturesign.json | 17 +++++++++++++++++ config/yosbr/config/enhanced_bes.properties | 5 ----- enable_hooks.sh | 0 git/hooks/pre-commit | 0 git/hooks/pre-merge-commit | 0 index.toml | 19 +++++++++---------- mods/picturesign.pw.toml | 13 ++++--------- mods/videolib.pw.toml | 7 ------- pack.toml | 2 +- 10 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 config/enhanced_bes.properties create mode 100644 config/picturesign.json delete mode 100644 config/yosbr/config/enhanced_bes.properties mode change 100644 => 100755 enable_hooks.sh mode change 100644 => 100755 git/hooks/pre-commit mode change 100644 => 100755 git/hooks/pre-merge-commit delete mode 100644 mods/videolib.pw.toml diff --git a/config/enhanced_bes.properties b/config/enhanced_bes.properties new file mode 100644 index 0000000..2a7141d --- /dev/null +++ b/config/enhanced_bes.properties @@ -0,0 +1,19 @@ +#Configuration file for Enhanced Block Entities +decorated_pot_ao=false +sign_ao=false +render_enhanced_signs=false +bell_ao=true +shulker_box_ao=true +experimental_signs=false +chest_ao=true +sign_text_rendering=smart +render_enhanced_decorated_pots=true +experimental_chests=true +christmas_chests=allowed +bed_ao=true +render_enhanced_chests=true +render_enhanced_beds=true +render_enhanced_shulker_boxes=true +experimental_beds=true +render_enhanced_bells=true +force_resource_pack_compat=false diff --git a/config/picturesign.json b/config/picturesign.json new file mode 100644 index 0000000..0a19d1e --- /dev/null +++ b/config/picturesign.json @@ -0,0 +1,17 @@ +{ + "enabled": true, + "enableVideoSigns": true, + "translucency": true, + "fullBrightPicture": false, + "helperUi": true, + "exceedVanillaLineLength": true, + "debug": false, + "maxThreads": 4, + "signRenderDistance": 64, + "safeMode": true, + "safeProviders": [ + "https://blanketcon.b-cdn.net/" + ], + "missingImageMode": "BLACK", + "pictureShader": "PosColTexLight" +} diff --git a/config/yosbr/config/enhanced_bes.properties b/config/yosbr/config/enhanced_bes.properties deleted file mode 100644 index bf4f06b..0000000 --- a/config/yosbr/config/enhanced_bes.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration file for Enhanced Block Entities -sign_ao=true -shulker_box_ao=true -chest_ao=true -bed_ao=true diff --git a/enable_hooks.sh b/enable_hooks.sh old mode 100644 new mode 100755 diff --git a/git/hooks/pre-commit b/git/hooks/pre-commit old mode 100644 new mode 100755 diff --git a/git/hooks/pre-merge-commit b/git/hooks/pre-merge-commit old mode 100644 new mode 100755 diff --git a/index.toml b/index.toml index ca5f537..2278faf 100644 --- a/index.toml +++ b/index.toml @@ -4,6 +4,14 @@ hash-format = "sha256" file = "config/enchancement.json" hash = "552967d81e4f24af805d75fcea6e8ae892cfe05296eaf8f5a6c136ab7e58cd1e" +[[files]] +file = "config/enhanced_bes.properties" +hash = "8d0668e5f2a7842fad4bcce42af9ee7ce8e2e89f8656bddace4a642354fa251f" + +[[files]] +file = "config/picturesign.json" +hash = "2b867088202c1732c66974ca34f560e21704ef4791771c74ae98479434308434" + [[files]] file = "config/polymer/common.json" hash = "9234ce3572bad32e9aab8626c4936069efde934a6d3bd4ff20f2cdbbff0c836c" @@ -32,10 +40,6 @@ hash = "8eac230e722a59915fa26ed453d780cd2034b65ec39a7ffe88135d16840c9692" file = "config/yosbr/config/emogg.json" hash = "c524bd7e0e27258dcb0122f15303ac80723a1b6d0bb872e63b203d87bdc62136" -[[files]] -file = "config/yosbr/config/enhanced_bes.properties" -hash = "84825744a3386b5194422e99eba7a3f49f0b29d4a9eb74a11921fd558d4571e8" - [[files]] file = "config/yosbr/config/entityculling.json" hash = "bd5d8eaf56e9ddb5196a85a5713db7e213ed88c8895958f33c01464a1cb0a1d3" @@ -599,7 +603,7 @@ metafile = true [[files]] file = "mods/picturesign.pw.toml" -hash = "e92af2c675908488122ea9986c8178b4cad01ab9704de449023de618cb2c3de9" +hash = "8492f074a8e446e59da21750b0a97cb9bce059b24faf3733a73898af0d763bea" metafile = true [[files]] @@ -937,11 +941,6 @@ file = "mods/utility-belt.pw.toml" hash = "9a7b6e75bb50f4582625d1aaf535e1cb9dd0dd85522e08074bc192844366b115" metafile = true -[[files]] -file = "mods/videolib.pw.toml" -hash = "c1e62d7cd7b7751f20ba8be03498024cd32b35d8ca63a810c494cad2b77ef982" -metafile = true - [[files]] file = "mods/visiblebarriers.pw.toml" hash = "d695c1fcc3c6df535d86d39e98605bff7bdc6a978c40e6b4274ba7ec2544471d" diff --git a/mods/picturesign.pw.toml b/mods/picturesign.pw.toml index c7433fe..30f8880 100644 --- a/mods/picturesign.pw.toml +++ b/mods/picturesign.pw.toml @@ -1,13 +1,8 @@ name = "PictureSign" -filename = "picturesign-2.0.0-beta.1.jar" +filename = "picturesign-2.0.0-beta.1+unascribedtheora.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/9WP2dmkk/versions/r5SZsNRg/picturesign-2.0.0-beta.1.jar" -hash-format = "sha1" -hash = "3d34a7648f8bcc4bf1c268969d1d65e09931b3ab" - -[update] -[update.modrinth] -mod-id = "9WP2dmkk" -version = "r5SZsNRg" +url = "https://unascribed.b-cdn.net/picturesign-2.0.0-beta.1%2Bunascribedtheora.jar" +hash-format = "sha256" +hash = "e2923fdc1722eacaef14cc4960e634777b93cbaa9edb9d58179fd2e63d9a972d" diff --git a/mods/videolib.pw.toml b/mods/videolib.pw.toml deleted file mode 100644 index b5e352a..0000000 --- a/mods/videolib.pw.toml +++ /dev/null @@ -1,7 +0,0 @@ -name = "videolib" -filename = "videolib-0.2.2-mnd.jar" - -[download] -url = "https://github.com/Motschen/VideoLib/releases/download/v0.2.2-mnd/videolib-0.2.2-mnd.jar" -hash-format = "sha256" -hash = "6ef6ccba27d4b07ba2d39e008323b1facc7925924e3ec58fe0b436c2b3e858bf" diff --git a/pack.toml b/pack.toml index 0f0cfd5..086bc84 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 = "f6314ca2424786baa2551efa5865b667b32ff51bcea48dc7c389ac3cec720310" +hash = "586f209e75472cd1f05d21fc57d3e8e52aa26a69c0051349845e0cc6c37b4b58" [versions] minecraft = "1.20.1"