implement configureddefaults

Reviewed-on: TheVeryModelOfAModernMinecraftModpack/VanillaPlusPlus#4

README.md

@@ -1,2 +1,2 @@
-# DHTest
+# VANILLA PLUS PLUS
 

configureddefaults/config/MiniMOTD/main.conf

@@ -0,0 +1,96 @@
+# MiniMOTD Main Configuration
+
+# Enable server list icon related features
+icon-enabled=true
+# Enable MOTD-related features
+motd-enabled=true
+# The list of MOTDs to display
+# 
+# - Supported placeholders: <online_players>, <max_players>
+# - Putting more than one will cause one to be randomly chosen each refresh
+motds=[
+    {
+        # Set the icon to use with this MOTD
+        #  Either use 'random' to randomly choose an icon, or use the name
+        #  of a file in the icons folder (excluding the '.png' extension)
+        #    ex: icon="myIconFile"
+        icon=random
+        line1="<rainbow><bold>Vanilla++"
+        line2="<gradient:blue:red>Server! Just a week away. The server is in a week!"
+    },
+    {
+        # Set the icon to use with this MOTD
+        #  Either use 'random' to randomly choose an icon, or use the name
+        #  of a file in the icons folder (excluding the '.png' extension)
+        #    ex: icon="myIconFile"
+        icon=random
+        line1="<rainbow>||||||||<bold><yellow>The server!!!</yellow></bold>||||||||"
+        line2="<italic>crazy"
+    },
+    {
+        # Set the icon to use with this MOTD
+        #  Either use 'random' to randomly choose an icon, or use the name
+        #  of a file in the icons folder (excluding the '.png' extension)
+        #    ex: icon="myIconFile"
+        icon=random
+        line1="<rainbow>Casey has pneumonia"
+        line2="pray for him..."
+    },
+    {
+        # Set the icon to use with this MOTD
+        #  Either use 'random' to randomly choose an icon, or use the name
+        #  of a file in the icons folder (excluding the '.png' extension)
+        #    ex: icon="myIconFile"
+        icon=random
+        line1="sorry it took so long 💀"
+        line2=kinda
+    },
+    {
+        # Set the icon to use with this MOTD
+        #  Either use 'random' to randomly choose an icon, or use the name
+        #  of a file in the icons folder (excluding the '.png' extension)
+        #    ex: icon="myIconFile"
+        icon=random
+        line1="Server fund running total: <rainbow>$6"
+        line2="so close!"
+    }
+]
+player-count-settings {
+    # Should the displayed online player count be allowed to exceed the displayed maximum player count?
+    # If false, the online player count will be capped at the maximum player count
+    allow-exceeding-maximum=false
+    # Setting this to true will disable the hover text showing online player usernames
+    disable-player-list-hover=false
+    # Settings for the fake player count feature
+    fake-players {
+        # Modes: add, constant, minimum, random, percent
+        # 
+        # - add: This many fake players will be added
+        #     ex: fake-players="3"
+        # - constant: A constant value for the player count
+        #     ex: fake-players="=42"
+        # - minimum: The minimum bound of the player count
+        #     ex: fake-players="7+"
+        # - random: A random number of fake players in this range will be added
+        #     ex: fake-players="3:6"
+        # - percent: The player count will be inflated by this much, rounding up
+        #     ex: fake-players="25%"
+        fake-players="25%"
+        # Enable fake player count feature
+        fake-players-enabled=false
+    }
+    # Setting this to true will disable the player list hover (same as 'disable-player-list-hover'),
+    # but will also cause the player count to appear as '???'
+    hide-player-count=false
+    # Changes the Max Players to be X more than the online players
+    # ex: x=3 -> 16/19 players online.
+    just-x-more-settings {
+        # Enable this feature
+        just-x-more-enabled=false
+        x-value=3
+    }
+    # Changes the Max Players value
+    max-players=69
+    # Enable modification of the max player count
+    max-players-enabled=true
+}

configureddefaults/config/bclib/client.json

@@ -11,7 +11,7 @@
     "notTheDonorType [default: true]": true
   },
   "auto_sync": {
-    "enabled [default: true]": true,
+    "enabled [default: true]": false,
     "acceptConfigs [default: true]": true,
     "acceptFiles [default: true]": true,
     "acceptMods [default: true]": true,

configureddefaults/config/bclib/server.json

@@ -1,9 +1,9 @@
 {
   "auto_sync": {
     "enabled [default: true]": false,
-    "offerConfigs [default: true]": true,
-    "offerFiles [default: true]": true,
-    "offerMods [default: true]": true,
+    "offerConfigs [default: true]": false,
+    "offerFiles [default: true]": false,
+    "offerMods [default: true]": false,
     "offerAllMods [default: false]": false,
     "sendAllModInfo [default: false]": false,
     "additionalMods": [],

index.toml

@@ -2,77 +2,125 @@ hash-format = "sha256"
 
 [[files]]
 file = "README.md"
-hash = "cd3ae2905b00991d369bc681be56fe2a6c132731eccee3f79fd5f05f8bd4e511"
+hash = "5ce6e50fd29658a5e612978c86a555ec7f1260089ec221d0594b37714612901c"
 
 [[files]]
-file = "config/DistantHorizons.toml"
+file = "configureddefaults/config/DistantHorizons.toml"
 hash = "da2034687d2a8a2ecfb0c1ca07f756e02b3b2266b1f11a5566d9dcaa5af3118a"
 
 [[files]]
-file = "config/NoChatReports/NCR-Client.json"
+file = "configureddefaults/config/MiniMOTD/icons/img0.png"
+hash = "ce2f7b160573cc7d9ec5635a5e929adc20a98875e8bce36a3b46f9a7a8f40713"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img1.png"
+hash = "9ebf06198626067d99260ab8ee72ef2715199711fc8596531bcf516236a74c96"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img2.png"
+hash = "809b9ef7acd2ca57b36983741b6aaf2873ff402ee99df5e1a6dd8742545389ed"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img3.png"
+hash = "2ac61a1f0afc32b2ec4f294089842d992b8dbb58098e2fc17e9db0fa4f4faad8"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img4.png"
+hash = "91a1863e89e428e2c0badfedad8f6d26d96bdef353a121b9b5a7490ce86b2a6c"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img5.png"
+hash = "14f697f6a68b18eefd1d760ecab9734fd9f20424971edc549348e8f2212ec839"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img6.png"
+hash = "85a66dcf30e99990bf133210e1e6f6a1907760e3f071fdce0f2b11e1646c2c92"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img7.png"
+hash = "5c45f00e71634c9f6018b0a1f86e55042248db7df18a703df86c309626c845ab"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/icons/img8.png"
+hash = "3b908e9fb7222bcc7039a3a7fee653745a7bf995f993fa0c0998a0f6651a4d8e"
+
+[[files]]
+file = "configureddefaults/config/MiniMOTD/main.conf"
+hash = "90c4a938ff039f5cf5acae9ed06b532d4e07f1f53c6f0e102859823f360db254"
+
+[[files]]
+file = "configureddefaults/config/NoChatReports/NCR-Client.json"
 hash = "be88d44466fd4d68eeead41352fecd920243858ee4ca18dcd6b5f9a728108412"
 
 [[files]]
-file = "config/aileron.json"
+file = "configureddefaults/config/aileron.json"
 hash = "0acf51cddc16eacd4ff54239f6413f7ff651129bec6fd8c50c8c1836e5702a79"
 
 [[files]]
-file = "config/almostunified/unify.json"
+file = "configureddefaults/config/almostunified/unify.json"
 hash = "7d000a22f50e90a06c61fe71c14578bcaef04f91b6f8fdabd081a44e0993ca95"
 
 [[files]]
-file = "config/ambientsounds-client.json"
+file = "configureddefaults/config/ambientsounds-client.json"
 hash = "a5a48d2e3b9e851be1a0e7b99a518b34fbb2b47ecff4ee06a4261d84ab50655e"
 
 [[files]]
-file = "config/bclib/client.json"
-hash = "51ea41bb630e8879457254ffc4967e3942dc75a9643b689373a745d1f47f3bb2"
+file = "configureddefaults/config/bclib/client.json"
+hash = "dc83e158808a3dafbf9602aba6506d98e64b60ceee204623a2f6a38e37711f33"
 
 [[files]]
-file = "config/bclib/server.json"
-hash = "8f1e50ca92cb89ef5aa06f35bcf89c5ff67b20b14bee08bdf7a59282b9ec22dd"
+file = "configureddefaults/config/bclib/server.json"
+hash = "08c500c5920acffef2fe2eee5672f06670d4624f39f9920101f2b74ef405ebb5"
 
 [[files]]
-file = "config/itemswapper.json"
+file = "configureddefaults/config/itemswapper.json"
 hash = "f4800ff252692c27fef48552f202466b09a452226871bbccc77b5c73ca557eaa"
 
 [[files]]
-file = "config/openloader/resources/pixel-twemoji-9x.pw.toml"
+file = "configureddefaults/config/openloader/resources/pixel-twemoji-9x.pw.toml"
 hash = "51a5764db61a0378ef2e36ae214a99aaa6ce0ac920c4b603f75201f97fb0a388"
 metafile = true
 
 [[files]]
-file = "config/openloader/resources/what.zip"
+file = "configureddefaults/config/openloader/resources/what.zip"
 hash = "7f995abd928962f16f4a90030d128c6965358e5b2044944858fdd48441a55d06"
 
 [[files]]
-file = "config/rolling_down_in_the_deep-client.json"
+file = "configureddefaults/config/rolling_down_in_the_deep-client.json"
 hash = "ea32ed173ef2e077b8c93bba37b168b675b379279b0380f1ac7223ae4d489aee"
 
 [[files]]
-file = "config/sound_physics_remastered/soundphysics.properties"
+file = "configureddefaults/config/sound_physics_remastered/soundphysics.properties"
 hash = "b5d28290c541cbefb299864d6081715d82611b996649c2630140efd9db11d609"
 
 [[files]]
-file = "config/tectonic.json"
+file = "configureddefaults/config/tectonic.json"
 hash = "218ea6c228b0df801483570b610481acdb9591037cad7cc074e41c839e4020c9"
 
 [[files]]
-file = "config/tips.json"
+file = "configureddefaults/config/tips.json"
 hash = "af85f2909fde8c0dbea201fb6fb4afc5070be875c24266b47887f33f03c19321"
 
 [[files]]
-file = "config/treechop-client.toml"
+file = "configureddefaults/config/treechop-client.toml"
 hash = "1ff3f0e2ce95ea1561eb80b69b1a18599adffd262566fb9befa2a49c9c33efbe"
 
 [[files]]
-file = "config/treechop-common.toml"
+file = "configureddefaults/config/treechop-common.toml"
 hash = "eed9b2f6253d3adfee6feab7ef50d7ffca2237279c8e419d5b1e6ecb3a4c78f1"
 
 [[files]]
-file = "config/voicechat/voicechat-client.properties"
+file = "configureddefaults/config/voicechat/voicechat-client.properties"
 hash = "72fb8efcf83899e98a113ac72a95d9580ba59a9b923ab0c511b598afc37a1f88"
 
+[[files]]
+file = "configureddefaults/options.txt"
+hash = "cc684d40decbe635909c8c613acbbfca2b3a5675618e68149611f6cca5978e6e"
+
+[[files]]
+file = "configureddefaults/servers.dat"
+hash = "dc0f2377ee8fe27c1df8272094a97f0f48e9e8848a3eeb201a51857e02c059d7"
+
 [[files]]
 file = "mods/advancement-frames.pw.toml"
 hash = "7ce890cee57c2c46044b9b999bdf786ade69e26a08ef820fdd6e9d4eef5eecc1"
@@ -328,6 +376,11 @@ file = "mods/comforts.pw.toml"
 hash = "8c933ef723f868cef57b91da98e8eae4f394a6e51defc2b1fdd706f23b945549"
 metafile = true
 
+[[files]]
+file = "mods/configured-defaults.pw.toml"
+hash = "ebade5f42b8331e3d0aa30da371f69aa937881ae903e2549eda3a7e13020f75e"
+metafile = true
+
 [[files]]
 file = "mods/continuity.pw.toml"
 hash = "ca80c5f6b0faca95bbc06192a3da36446ff396b5e6e0304f6779269b60bbdd9d"
@@ -863,11 +916,6 @@ file = "mods/mavm.pw.toml"
 hash = "38647b64ad7940709a693965b08a5a3e783e9aab1824ad99ec1c70ee597580c9"
 metafile = true
 
-[[files]]
-file = "mods/mc-dungeons-enchanting.pw.toml"
-hash = "dc71f076aa85ac34035d4f504d65344478d90c01e1468186c3eacb6a07701152"
-metafile = true
-
 [[files]]
 file = "mods/mclo-gs.pw.toml"
 hash = "4d24538c96ff7e6dcd8c3e32a334dabcac3dc35b8cb8291908addc83475989c9"
@@ -1378,6 +1426,11 @@ file = "mods/ubes-delight.pw.toml"
 hash = "df33cf433b05d1a409bb912befd8f19f220e33d80fa9c5eda66ded335f625717"
 metafile = true
 
+[[files]]
+file = "mods/unilib.pw.toml"
+hash = "42bf389ffe30b07b5d27bc02f7fdf08fadd8c40d0cbeb319a9bffbe1024e87c6"
+metafile = true
+
 [[files]]
 file = "mods/village-healthcare.pw.toml"
 hash = "549a1870f9d6f7f3180e380ef27ae0711cdd47d65be4c364c6f4c344711caf94"
@@ -1487,11 +1540,3 @@ metafile = true
 file = "mods/zoomify.pw.toml"
 hash = "548772ed4c11f15dfac400681ba5893e73956b6daa9762ed57f5ad4bee05e041"
 metafile = true
-
-[[files]]
-file = "options.txt"
-hash = "cc684d40decbe635909c8c613acbbfca2b3a5675618e68149611f6cca5978e6e"
-
-[[files]]
-file = "servers.dat"
-hash = "dc0f2377ee8fe27c1df8272094a97f0f48e9e8848a3eeb201a51857e02c059d7"

mods/configured-defaults.pw.toml

@@ -0,0 +1,13 @@
+name = "Configured Defaults"
+filename = "ConfiguredDefaults-v8.0.2-1.20.1-Fabric.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/SISoSFPP/versions/skzobhC5/ConfiguredDefaults-v8.0.2-1.20.1-Fabric.jar"
+hash-format = "sha512"
+hash = "a7ef661e970e06a2c1656ccf9c2f159ec84b866516eff0804eb9dcbb942ede4ed6007da2e7765ae3cf30faa3c8ee9c4f48066c904b23387d1e35e557eac2a5aa"
+
+[update]
+[update.modrinth]
+mod-id = "SISoSFPP"
+version = "skzobhC5"

mods/mc-dungeons-enchanting.pw.toml

@@ -1,13 +0,0 @@
-name = "MC Dungeons Enchanting"
-filename = "mcde-1.6.4-1.20.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/iwkcspV8/versions/qHV2Ufmn/mcde-1.6.4-1.20.jar"
-hash-format = "sha512"
-hash = "1a64e1077be6ed3c656e46871fdd710b4396fd1bb47c2eb16c9ddb09bf119bb93324dfaceca8f09fcebaef9164f6759b0c973cfce48fd638b5a074605c6e195c"
-
-[update]
-[update.modrinth]
-mod-id = "iwkcspV8"
-version = "qHV2Ufmn"

mods/unilib.pw.toml

@@ -0,0 +1,13 @@
+name = "UniLib"
+filename = "UniLib-1.0.4+1.20.1-quilt.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/nT86WUER/versions/kUcVh5jW/UniLib-1.0.4%2B1.20.1-quilt.jar"
+hash-format = "sha512"
+hash = "8d823af38a01b0bcb04f47311663e415756d9d6f10ef4f32922f9e13fa5072c6dfd12b803d134db08b54c15718e51629ec424f4e5dcb8c5598fc6504231921ae"
+
+[update]
+[update.modrinth]
+mod-id = "nT86WUER"
+version = "kUcVh5jW"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "963f1c39a48e665ca5cd12ba416b169870ecb7c0bfeb82231cc9864a029ca806"
+hash = "c113f853b55adedd4bfb3829051ab1e2b886d157e1677c2bc494528bfc6f94fb"
 
 [versions]
 minecraft = "1.20.1"