Skip to content

Commit

Permalink
updates + EMI + hoofprint. manually both-side everything.
Browse files Browse the repository at this point in the history
smoke tested
  • Loading branch information
sisby-folk committed Jul 7, 2024
1 parent 2bc6ff6 commit ae8acaa
Show file tree
Hide file tree
Showing 22 changed files with 162 additions and 35 deletions.
69 changes: 69 additions & 0 deletions pack/config/surveyor.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Zeroes out waypoint owner UUIDs to use the new 'host uuid' system, which mirrors vanilla behaviour
# Only occurs when loading into a singleplayer world - Will be removed in the next version
# default: true
migrateSingleplayerLandmarksFrom05to06 = true
# Terrain system - records layers of blocks and biomes for maps to render
# DISABLED prevents loading, FROZEN loads but prevents updates, DYNAMIC loads with addons or on servers, ENABLED always loads
# options: DISABLED, FROZEN, DYNAMIC, ENABLED
# default: DYNAMIC
terrain = "DYNAMIC"
# Structure system - records structure identifiers and piece data for specialized maps and utilities to render
# DISABLED prevents loading, FROZEN loads but prevents updates, DYNAMIC loads with addons or on servers, ENABLED always loads
# options: DISABLED, FROZEN, DYNAMIC, ENABLED
# default: DYNAMIC
structures = "DISABLED"
# Landmark system - a generic record of both player-owned waypoints and server-owned POIs, accessible via API
# DISABLED prevents loading, FROZEN loads but prevents updates, DYNAMIC loads with addons or on servers, ENABLED always loads
# options: DISABLED, FROZEN, DYNAMIC, ENABLED
# default: DYNAMIC
landmarks = "DYNAMIC"
# Whether to automatically add/remove nether portal landmarks
# default: true
netherPortalLandmarks = false
# Whether to automatically add player death waypoints
# default: true
playerDeathLandmarks = false
# Displays the following logs and messages:
# [Action Bar] Structure Discovery
# default: false
debugMode = false

[networking]
# [Server] Whether to place every player in a single share group
# Disables /surveyor share and /surveyor unshare
# default: false
globalSharing = true
# How much terrain data to send to clients
# SERVER sends server-known data, GROUP sends group-known data, SOLO sends player-known data, NONE sends no data
# options: NONE, SOLO, GROUP, SERVER
# default: GROUP
terrain = "NONE"
# How much structure data to send to clients
# SERVER sends server-known data, GROUP sends group-known data, SOLO sends player-known data, NONE sends no data
# When NONE, clients will never see structures
# options: NONE, SOLO, GROUP, SERVER
# default: GROUP
structures = "NONE"
# Which landmarks to sync between client and server
# SERVER sync server-known landmarks, GROUP sends group-known landmarks, SOLO sends player-known landmarks, NONE sends no landmarks
# options: NONE, SOLO, GROUP, SERVER
# default: GROUP
landmarks = "SERVER"
# Which waypoints (player-created landmarks) to sync between client and server
# When SERVER, players can see (but not edit) all waypoints, including potentially offensive names
# When GROUP, players can see (but not edit) waypoints created by players in their share group
# When SOLO, player-created waypoints will be stored on the server as a backup
# When NONE, waypoint data will never be synced (e.g. for privacy)
# options: NONE, SOLO, GROUP, SERVER
# default: SOLO
waypoints = "NONE"
# [Server] How much player position data to send to clients
# SERVER sends all players positions, GROUP sends just group players, SOLO sends nothing, NONE sends nothing
# options: NONE, SOLO, GROUP, SERVER
# default: GROUP
positions = "SERVER"
# [Server] Ticks per position update - lower is more frequent
# range: 1 - 200
# default: 1
positionTicks = 1

45 changes: 32 additions & 13 deletions pack/index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,10 @@ hash = "f35b59e73c2d8940976818ff69aadb8a6d0f4748ab95084946e47bdd02be6222"
file = "config/styledplayerlist/styles/default_spl.json"
hash = "aaee1a878058037fd8770e2611f7425e8b2c38922ab2ab533c71c935796b923f"

[[files]]
file = "config/surveyor.toml"
hash = "bcc38c298ceba5ea6ddb74a7209cfe0bb57c00b4e84769e168b01a1844a292bc"

[[files]]
file = "config/teabridge.json"
hash = "cbbe48bc1c540422f2dde290736bca59b4497e6c63f7c33f4f86706a66a75767"
Expand All @@ -416,7 +420,7 @@ metafile = true

[[files]]
file = "mods/armorstandeditor.pw.toml"
hash = "5732254c42451afa123a6d9a0be40373e8cbc5e7bdc0584dd6140cee9229777c"
hash = "834b61193f4e49e342b5ebc9d67da615313c0eaa9a221aaa7a1025ec4211d309"
metafile = true

[[files]]
Expand Down Expand Up @@ -456,7 +460,7 @@ metafile = true

[[files]]
file = "mods/bonzi-buddy.pw.toml"
hash = "eec31fe289a55b765e426dbbbcdaaee3e358fe8ee9a278dcd4ab38b2afa38ec6"
hash = "0bc78793708cc66d57c28d04f383a0ecc73b4dada4d31471a95641167bc54045"
metafile = true

[[files]]
Expand All @@ -466,7 +470,7 @@ metafile = true

[[files]]
file = "mods/cardinal-components-api.pw.toml"
hash = "1d2685e2cdf18f0a0fe57ae1c4bfc4d14ca1a1b924822f5940e1b34434e6ce0e"
hash = "ccab33cb420e850a0a3003632a2a7bc9e00b07d167d4f8a4c84dc2575611acad"
metafile = true

[[files]]
Expand Down Expand Up @@ -541,7 +545,7 @@ metafile = true

[[files]]
file = "mods/drogstyle.pw.toml"
hash = "97fc1444b43be54ec322842276173c3fb58707bb5e14e9699f7241301f730ff9"
hash = "69902339e256f70905e8942ec34f10ec260020c830411ca3b5417c9745b6b740"
metafile = true

[[files]]
Expand All @@ -551,14 +555,19 @@ metafile = true

[[files]]
file = "mods/dusty.pw.toml"
hash = "10cae0a33fe0dddabac78259d980752b56d392526d7c80306cd53f64b5ffd268"
hash = "89d80157d73fca87a594f890e0edb52089262de405919f3f17466e1686e3e1f6"
metafile = true

[[files]]
file = "mods/ears.pw.toml"
hash = "5cfdebf79480f71e84191358887f49eb8cc59b7d937f2e5be73fb8267606da2b"
metafile = true

[[files]]
file = "mods/emi.pw.toml"
hash = "f0ab69070fefbc85039133adf4015dc0a403a45d5c00713d6200b0943a310398"
metafile = true

[[files]]
file = "mods/extravaganza.pw.toml"
hash = "a1735a7633e198acedc1a598126a498a144991488f96d985d2f93507e5f9ca00"
Expand All @@ -576,7 +585,7 @@ metafile = true

[[files]]
file = "mods/fabrictailor.pw.toml"
hash = "8f796f3d24fcf3c041e7fd4631e2c536018e027778bbf2fe36ddacdca5220cf4"
hash = "150ab30d44b948aa3db99063f2169c08d785f604b062bd34b0d594136962b916"
metafile = true

[[files]]
Expand All @@ -599,6 +608,11 @@ file = "mods/honque.pw.toml"
hash = "7d3c9440bba46dedfc6c881e8f49929399e52e933f4ba7e77a5926bf1bec8d15"
metafile = true

[[files]]
file = "mods/hoofprint.pw.toml"
hash = "16cf1b1e4850ba8b0c198afc413854d1fd461e4460f1f953f769a1baf7765258"
metafile = true

[[files]]
file = "mods/hookaduck.pw.toml"
hash = "785eae3708346c03d556d13e90a129da25c83b993cfe896398c93c25773297c5"
Expand Down Expand Up @@ -686,7 +700,7 @@ metafile = true

[[files]]
file = "mods/ouch.pw.toml"
hash = "504bcc6720a8a1ce47f5e0622a5692a4f97ea8d0484df3519169accf2319880f"
hash = "c1aad936565211a5032dc790d0ca89022526eece55d3c056eec6960621615483"
metafile = true

[[files]]
Expand All @@ -706,7 +720,7 @@ metafile = true

[[files]]
file = "mods/player-roles.pw.toml"
hash = "c9e1101c6562ace7c256616e99f8ae17ef3f592a718e9f130e62c39bc3248178"
hash = "d809bef412a365d2ac0c8fc404235b88eec6b4e58a2a154a34d41c05c17dea72"
metafile = true

[[files]]
Expand Down Expand Up @@ -781,22 +795,27 @@ metafile = true

[[files]]
file = "mods/styled-chat.pw.toml"
hash = "64b58a742f766fba51fdf1db8942d7810c71a2ea57e73b5919ae24f531e779a8"
hash = "7d87d7de16a25973902fa27e494bf6d9dd5dadb22f7d35021f8d80a1e0621dfb"
metafile = true

[[files]]
file = "mods/styled-nicknames.pw.toml"
hash = "7a6a28c769f83459b44ec908f01a479c4c22d932b06c9e7cf38aa664270ac861"
hash = "da4d9d0e5257127a4b12ac746a1762db374ba19712abf891da0d76fa06288eff"
metafile = true

[[files]]
file = "mods/styledplayerlist.pw.toml"
hash = "a4fc712afb566a3964468c0df86eabce031ec9b844d7f42abf79e05de73b4591"
hash = "615cc195f32f56bf0b038a782bcd157fa01be5dd11b16627de11c3c7932577d7"
metafile = true

[[files]]
file = "mods/surveyor.pw.toml"
hash = "9cdb05e709e849ffa5d2c708c9e109b06f333520093eff6372f03f30f89ea9c6"
metafile = true

[[files]]
file = "mods/teabridge.pw.toml"
hash = "bec62b64e255b592feb9b7d1e88e4eb535836a37f22a6ae97fe40842275a3814"
hash = "61a49e52c546cc840a9c601f6d6f47f112e9e0d059c6b0e75bbb5f9988c750eb"
metafile = true

[[files]]
Expand Down Expand Up @@ -846,7 +865,7 @@ metafile = true

[[files]]
file = "mods/worldedit.pw.toml"
hash = "9e2582acfe6725f2e933eacad0cb78467ce12dd2274d86418bb0b61c5da7410c"
hash = "34fe1ed3169ec00dbb9d6b8c9e4c1cc504888d195c3a2dd43975b2d10c69c370"
metafile = true

[[files]]
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/armorstandeditor.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Armor Stand Editor"
filename = "armor-stand-editor-2.5.0+1.21-rc1.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/Ef9ZREBZ/versions/lp2JxZ4N/armor-stand-editor-2.5.0%2B1.21-rc1.jar"
Expand Down
8 changes: 4 additions & 4 deletions pack/mods/bonzi-buddy.pw.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "Bonzi Buddy"
filename = "bonzibuddy-1.0.2.jar"
filename = "bonzibuddy-1.0.3.jar"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/PqolNfCr/versions/VLsUOrcr/bonzibuddy-1.0.2.jar"
url = "https://cdn.modrinth.com/data/PqolNfCr/versions/weN8wwT5/bonzibuddy-1.0.3.jar"
hash-format = "sha1"
hash = "547b7bd49acef618b1408c88cd3f40111225319b"
hash = "0cd0a9363b286db8a8250028cab3379a2636dac4"

[update]
[update.modrinth]
mod-id = "PqolNfCr"
version = "VLsUOrcr"
version = "weN8wwT5"
2 changes: 1 addition & 1 deletion pack/mods/cardinal-components-api.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Cardinal Components API"
filename = "cardinal-components-api-6.1.0.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/K01OU20C/versions/quTFtjka/cardinal-components-api-6.1.0.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/drogstyle.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Drogstyle"
filename = "drogstyle-1.3.4+1.21.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/MAmi6HBa/versions/By1RwoDW/drogstyle-1.3.4%2B1.21.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/dusty.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Dust"
filename = "dust-1.0.2+1.21.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/Dzn1XCbd/versions/Y1NNo7M2/dust-1.0.2%2B1.21.jar"
Expand Down
13 changes: 13 additions & 0 deletions pack/mods/emi.pw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name = "EMI"
filename = "emi-1.1.10+1.21+fabric.jar"
side = "client"

[download]
url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/KRp4lW7A/emi-1.1.10%2B1.21%2Bfabric.jar"
hash-format = "sha1"
hash = "6593057c4d327bc520e60a761c62cf1c41692d82"

[update]
[update.modrinth]
mod-id = "fRiHVvU7"
version = "KRp4lW7A"
2 changes: 1 addition & 1 deletion pack/mods/fabrictailor.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Fabric Tailor"
filename = "fabrictailor-2.5.0.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/g8w1NapE/versions/UDZdkBPN/fabrictailor-2.5.0.jar"
Expand Down
7 changes: 7 additions & 0 deletions pack/mods/hoofprint.pw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name = "hoofprint"
filename = "hoofprint-0.2.0+1.21.jar"

[download]
url = "https://github.com/HestiMae/hoofprint/releases/download/v0.2.0/hoofprint-0.2.0+1.21.jar"
hash-format = "sha256"
hash = "cfd7f983b524f5e1418da6c97035f8e6b5aefec5de572c8d46922fb20f584df7"
2 changes: 1 addition & 1 deletion pack/mods/ouch.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Ouch!"
filename = "ouch-1.1.0+1.21.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/nbxqFJCy/versions/rq1lty2d/ouch-1.1.0%2B1.21.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/player-roles.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Player Roles"
filename = "player-roles-1.6.11.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/Rt1mrUHm/versions/WSx6SItb/player-roles-1.6.11.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/styled-chat.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Styled Chat"
filename = "styled-chat-2.6.0+1.21.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/doqSKB0e/versions/EoTTJkqS/styled-chat-2.6.0%2B1.21.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/styled-nicknames.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Styled Nicknames"
filename = "styled-nicknames-1.6.0+1.21.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/DOk6Gcdi/versions/U9pXTyh2/styled-nicknames-1.6.0%2B1.21.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/styledplayerlist.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Styled Player List"
filename = "styledplayerlist-3.5.1+1.21.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/DQIfKUHf/versions/Ui7MOgqG/styledplayerlist-3.5.1%2B1.21.jar"
Expand Down
13 changes: 13 additions & 0 deletions pack/mods/surveyor.pw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name = "Surveyor Map Framework"
filename = "surveyor-0.6.3+1.21.jar"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/4KjqhPc9/versions/cy2Eg49E/surveyor-0.6.3%2B1.21.jar"
hash-format = "sha1"
hash = "6099a83e380fbea72a6fb7237a18b683404eebaa"

[update]
[update.modrinth]
mod-id = "4KjqhPc9"
version = "cy2Eg49E"
2 changes: 1 addition & 1 deletion pack/mods/teabridge.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "TeaBridge"
filename = "teabridge-1.3.0-mc1.21-rev.613bc37.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/fhtWl3kP/versions/XsgKhe8p/teabridge-1.3.0-mc1.21-rev.613bc37.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/mods/worldedit.pw.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "WorldEdit"
filename = "worldedit-mod-7.3.4.jar"
side = "server"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/1u6JkXh5/versions/EjobaxpK/worldedit-mod-7.3.4.jar"
Expand Down
2 changes: 1 addition & 1 deletion pack/pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "68faa6d7f0dc3241385fcc3cc698c01f4335c3fe5093f956de9f38b307070961"
hash = "38fc09338f410c3edc019e075561575271c97dab2306daa51e3cde84429a7eef"

[versions]
fabric = "0.15.11"
Expand Down
6 changes: 4 additions & 2 deletions scripts/override_add.json5
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
{"project_id": "emi"}, // core/util
// {"project_id": "open-loader"}, // core/util
// {"project_id": "ballotbox"}, // core/util
// {"project_id": "glowcase"}, // core/build
{"project_id": "glowcase"}, // core/build
{"project_id": "scattered-shards"}, // core/build
// {"project_id": "worldedit-cui"}, // core/build
{"project_id": "worldedit"}, // core/build
{"project_id": "teabridge"}, // core/chat
Expand All @@ -18,10 +19,11 @@
{"project_id": "crunchy-crunchy-advancements"}, // nice/perf
{"project_id": "reeses-sodium-options"}, // nice/util
{"project_id": "wthit"}, // nice/util
{"project_id": "surveyor"}, // nice/util
// {"project_id": "resetting"}, // nice/build
{"project_id": "no-fun-allowed"}, // nice/build
{"project_id": "armorstandeditor"}, // nice/build
// {"project_id": "picturesign"}, // nice/build
{"project_id": "picturesign"}, // nice/build
{"project_id": "axiom"}, // nice/build
{"project_id": "ears"}, // nice/chat
{"project_id": "styled-chat"}, // nice/chat
Expand Down
Loading

0 comments on commit ae8acaa

Please sign in to comment.