Merge pull request #2 from mantal/main

Fix mod conflicts + add SOL

config/universal-graves/config.json

@@ -0,0 +1,319 @@
+{
+  "_comment": "Before changing anything, see https://github.com/Patbox/UniversalGraves#configuration",
+  "config_version": 3,
+  "protection": {
+    "non_owner_protection_time": 900,
+    "self_destruction_time": -1,
+    "drop_items_on_expiration": true,
+    "attackers_bypass_protection": false,
+    "use_real_time": false
+  },
+  "interactions": {
+    "unlocking_cost": {
+      "type": "free",
+      "count": 0
+    },
+    "give_death_compass": false,
+    "enable_use_death_compass_to_open_gui": true,
+    "enable_click_to_open_gui": true,
+    "shift_and_use_quick_pickup": true,
+    "allow_remote_protection_removal": true,
+    "allow_remote_breaking": true,
+    "allow_remote_unlocking": false
+  },
+  "storage": {
+    "experience_type": "vanilla",
+    "experience_percent:setting_value": 100.0,
+    "can_store_only_xp": false,
+    "alternative_experience_entity": false,
+    "blocked_enchantments": []
+  },
+  "placement": {
+    "player_grave_limit": -1,
+    "replace_any_block": false,
+    "max_distance_from_source_location": 8,
+    "shift_location_on_failure": true,
+    "max_shift_tries": 5,
+    "max_shift_distance": 40,
+    "generate_on_top_of_fluids": true,
+    "generate_on_ground": false,
+    "create_gravestone_after_emptying": false,
+    "restore_replaced_block_after_player_breaking": true,
+    "cancel_creation_for_damage_types": {},
+    "cancel_creation_for_ignored_attacker_types": {},
+    "blocking_predicates": [],
+    "block_in_protected_area": {},
+    "blacklisted_worlds": [],
+    "blacklisted_areas": {},
+    "creation_default_failure_text": "<red><lang:'text.graves.creation_failed':'<gold>${position}':'<yellow>${world}'>",
+    "creation_claim_failure_text": "<red><lang:'text.graves.creation_failed_claim':'<gold>${position}':'<yellow>${world}'>"
+  },
+  "teleportation": {
+    "cost": {
+      "type": "creative",
+      "count": 1
+    },
+    "required_time": 5,
+    "y_offset": 1.0,
+    "invincibility_time": 2,
+    "allow_movement_while_waiting": false,
+    "text": {
+      "timer": "<lang:'text.graves.teleport.teleport_timer':'${time}'>",
+      "timer_allow_moving": "<lang:'text.graves.teleport.teleport_timer_moving':'${time}'>",
+      "location": "<lang:'text.graves.teleport.teleport_location':'${position}'>",
+      "canceled": "<red><lang:'text.graves.teleport.teleport_cancelled'>"
+    }
+  },
+  "model": {
+    "default": "default",
+    "alternative": [],
+    "enable_geyser_workaround": true,
+    "gravestone_item_base": "minecraft:skeleton_skull",
+    "gravestone_item_nbt": {}
+  },
+  "ui": {
+    "title": "<lang:'text.graves.players_grave':'${player}'>",
+    "admin_title": "<lang:'text.graves.admin_graves'>",
+    "list_grave_icon": {
+      "base": {
+        "icon": "minecraft:chest",
+        "text": [
+          "${position} <gray>(${world})",
+          "<yellow>${death_cause}",
+          "<gray><lang:'text.graves.items_xp':'<white>${item_count}':'<white>${xp}'>",
+          "<blue><lang:'text.graves.protected_time':'<white>${protection_time}'>",
+          "<red><lang:'text.graves.break_time':'<white>${break_time}'>"
+        ]
+      },
+      "alt": {
+        "icon": "minecraft:trapped_chest",
+        "text": [
+          "${position} <gray>(${world})",
+          "<yellow>${death_cause}",
+          "<gray><lang:'text.graves.items_xp':'<white>${item_count}':'<white>${xp}'>",
+          "<blue><lang:'text.graves.not_protected'>",
+          "<red><lang:'text.graves.break_time':'<white>${break_time}'>"
+        ]
+      }
+    },
+    "admin_list_grave_icon": {
+      "base": {
+        "icon": "minecraft:chest",
+        "text": [
+          "<dark_gray>[<white>${player}</>]</> ${position} <gray>(${world})",
+          "<yellow>${death_cause}",
+          "<gray><lang:'text.graves.items_xp':'<white>${item_count}':'<white>${xp}'>",
+          "<blue><lang:'text.graves.protected_time':'<white>${protection_time}'>",
+          "<red><lang:'text.graves.break_time':'<white>${break_time}'>"
+        ]
+      },
+      "alt": {
+        "icon": "minecraft:trapped_chest",
+        "text": [
+          "<dark_gray>[<white>${player}</>]</> ${position} <gray>(${world})",
+          "<yellow>${death_cause}",
+          "<gray><lang:'text.graves.items_xp':'<white>${item_count}':'<white>${xp}'>",
+          "<blue><lang:'text.graves.not_protected'>",
+          "<red><lang:'text.graves.break_time':'<white>${break_time}'>"
+        ]
+      }
+    },
+    "grave_info": {
+      "base": {
+        "icon": "minecraft:oak_sign",
+        "text": [
+          "${position} <gray>(${world})",
+          "<yellow>${death_cause}",
+          "<gray><lang:'text.graves.items_xp':'<white>${item_count}':'<white>${xp}'>",
+          "<blue><lang:'text.graves.protected_time':'<white>${protection_time}'>",
+          "<red><lang:'text.graves.break_time':'<white>${break_time}'>"
+        ]
+      },
+      "alt": {
+        "icon": "minecraft:oak_sign",
+        "text": [
+          "${position} <gray>(${world})",
+          "<yellow>${death_cause}",
+          "<gray><lang:'text.graves.items_xp':'<white>${item_count}':'<white>${xp}'>",
+          "<blue><lang:'text.graves.not_protected'>",
+          "<red><lang:'text.graves.break_time':'<white>${break_time}'>"
+        ]
+      }
+    },
+    "unlock_grave": {
+      "base": {
+        "icon": "minecraft:gold_ingot",
+        "text": [
+          "<#ffd257><lang:'text.graves.gui.unlock_grave'>",
+          "<white><lang:'text.graves.gui.cost'> <#cfcfcf>${cost}"
+        ]
+      },
+      "alt": {
+        "icon": "minecraft:gold_ingot",
+        "text": [
+          "<dark_gray><lang:'text.graves.gui.unlock_grave'>",
+          "<white><lang:'text.graves.gui.cost'> <#cfcfcf>${cost} <gray>(<red><lang:'text.graves.gui.cost.not_enough'></red>)"
+        ]
+      }
+    },
+    "previous_button": {
+      "base": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "previous_page"
+          }
+        },
+        "text": "<lang:'text.graves.gui.previous_page'>"
+      },
+      "alt": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "previous_page_blocked"
+          }
+        },
+        "text": "<dark_gray><lang:'text.graves.gui.previous_page'>"
+      }
+    },
+    "next_button": {
+      "base": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "next_page"
+          }
+        },
+        "text": "<lang:'text.graves.gui.next_page'>"
+      },
+      "alt": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "next_page_blocked"
+          }
+        },
+        "text": "<dark_gray><lang:'text.graves.gui.next_page'>"
+      }
+    },
+    "remove_protection_button": {
+      "base": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "remove_protection"
+          }
+        },
+        "text": "<red><lang:'text.graves.gui.remove_protection'>"
+      },
+      "alt": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "remove_protection"
+          }
+        },
+        "text": [
+          "<red><lang:'text.graves.gui.remove_protection'>",
+          "<dark_red><bold><lang:'text.graves.gui.cant_reverse'>",
+          "",
+          "<white><lang:'text.graves.gui.click_to_confirm'>"
+        ]
+      }
+    },
+    "break_grave_button": {
+      "base": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "break_grave"
+          }
+        },
+        "text": "<red><lang:'text.graves.gui.break_grave'>"
+      },
+      "alt": {
+        "icon": {
+          "id": "universal_graves:icon",
+          "Count": 1,
+          "tag": {
+            "Texture": "break_grave"
+          }
+        },
+        "text": [
+          "<red><lang:'text.graves.gui.break_grave'>",
+          "<dark_red><bold><lang:'text.graves.gui.cant_reverse'>",
+          "",
+          "<white><lang:'text.graves.gui.click_to_confirm'>"
+        ]
+      }
+    },
+    "quick_pickup_button": {
+      "icon": {
+        "id": "universal_graves:icon",
+        "Count": 1,
+        "tag": {
+          "Texture": "quick_pickup"
+        }
+      },
+      "text": "<red><lang:'text.graves.gui.quick_pickup'>"
+    },
+    "fetch_button": {
+      "base": {
+        "icon": "minecraft:lead",
+        "text": "<yellow><lang:'text.graves.gui.fetch'>"
+      },
+      "alt": {
+        "icon": "minecraft:lead",
+        "text": "<yellow><lang:'text.graves.gui.fetch'>"
+      }
+    },
+    "teleport_button": {
+      "base": {
+        "icon": "minecraft:ender_pearl",
+        "text": [
+          "<#a52dfa><lang:'text.graves.gui.teleport'>",
+          "<white><lang:'text.graves.gui.cost'> <#cfcfcf>${cost}"
+        ]
+      },
+      "alt": {
+        "icon": "minecraft:ender_pearl",
+        "text": [
+          "<dark_gray><lang:'text.graves.gui.teleport'>",
+          "<white><lang:'text.graves.gui.cost'> <#cfcfcf>${cost} <gray>(<red><lang:'text.graves.gui.cost.not_enough'></red>)"
+        ]
+      }
+    },
+    "back_button": {
+      "icon": "minecraft:structure_void",
+      "text": "<red><lang:'text.graves.gui.quick_pickup'>"
+    },
+    "bar": {
+      "icon": "minecraft:white_stained_glass_pane",
+      "text": ""
+    }
+  },
+  "text": {
+    "grave_created": "<white><lang:'text.graves.created_at_expire':'<yellow>${position}':'<gray>${world}':'<red>${break_time}'>",
+    "protection_ended": "<red><lang:'text.graves.no_longer_protected':'<gold>${position}':'<white>${world}':'<yellow>${item_count}'>",
+    "grave_expired": "<red><lang:'text.graves.expired':'<gold>${position}':'<white>${world}':'<yellow>${item_count}'>",
+    "grave_broken": "<gray><lang:'text.graves.somebody_broke':'<white>${position}':'<white>${world}':'<white>${item_count}'>",
+    "grave_access_payment_no_access": "<red><lang:'text.graves.grave_unlock_payment.no_access'>",
+    "grave_payment_accepted": "<white><lang:'text.graves.grave_unlock_payment.accepted'>",
+    "grave_payment_failed": "<red><lang:'text.graves.grave_unlock_payment.failed':'<yellow>${cost}'>",
+    "years_suffix": "y",
+    "days_suffix": "d",
+    "hours_suffix": "h",
+    "minutes_suffix": "m",
+    "seconds_suffix": "s",
+    "infinity": "∞",
+    "date_format": "dd.MM.yyyy, HH:mm",
+    "world_names": {}
+  }
+}

index.toml

@@ -1,5 +1,9 @@
 hash-format = "sha256"
 
+[[files]]
+file = "config/universal-graves/config.json"
+hash = "e697a0f6fa393594b9c27f963f02930f3b7a00d212603b82c7f7b6466c649ce1"
+
 [[files]]
 file = "mods/another-furniture.pw.toml"
 hash = "525c8448074c4402b411c2b904eff4dae542834c649d13dc00475bd2546fe286"
@@ -60,11 +64,6 @@ file = "mods/clumps.pw.toml"
 hash = "524505b468ca28db75538936dbaea65fc42d13d07e821ed8c054fe7146044535"
 metafile = true
 
-[[files]]
-file = "mods/comforts.pw.toml"
-hash = "ae3c8677a574757a519780f8c4f461763ebc19c590a42f3af0f9447bf7ef4a94"
-metafile = true
-
 [[files]]
 file = "mods/controlling.pw.toml"
 hash = "0360f47c1afd7385518db9df5d809344e1bcdc163e940a8744ee61b6d745b6ce"
@@ -156,13 +155,13 @@ hash = "e3272db811c06088fee691b5338e922681073fbc4f0e55a7d3865abb8b62eb0e"
 metafile = true
 
 [[files]]
-file = "mods/ferrite-core.pw.toml"
+file = "mods/fabric-language-kotlin.pw.toml"
-hash = "39a6a39433b1b104bfafafcd60a8171f866daa2ebefffd64df822d0e69288e3a"
+hash = "d74850aaf1ed5a53805d523aa2b624f58c43813446be0b6c066a599c80d704e6"
 metafile = true
 
 [[files]]
-file = "mods/gravestones.pw.toml"
+file = "mods/ferrite-core.pw.toml"
-hash = "ace9dbdca93d66c486a4474081fc91219640e506b62679bce01318c34af51e13"
+hash = "39a6a39433b1b104bfafafcd60a8171f866daa2ebefffd64df822d0e69288e3a"
 metafile = true
 
 [[files]]
@@ -200,6 +199,11 @@ file = "mods/indium.pw.toml"
 hash = "0c5e71addef34c8dcd1c81dfc2ad851a3e274b9d8d3a7d388e1113d4139bf8d8"
 metafile = true
 
+[[files]]
+file = "mods/inventory-profiles-next.pw.toml"
+hash = "dd8dadd99d99c0535beb51accbb85be19bd2d26944c2836f816f9709f51bb59d"
+metafile = true
+
 [[files]]
 file = "mods/iris.pw.toml"
 hash = "41a3116f5642d40ed54efda3f863373fa4d3c0c3a24a447a38c8a106e9fbb079"
@@ -225,6 +229,11 @@ file = "mods/just-enough-resources-jer.pw.toml"
 hash = "f3a2939a893321067f5700c2e25c0c48fc1f9d39dd925449865c90597d65df1b"
 metafile = true
 
+[[files]]
+file = "mods/libipn.pw.toml"
+hash = "6332607e5399b318c9b39b14a9c6e36428cd52dd96b65f592fff9eb15117fc3f"
+metafile = true
+
 [[files]]
 file = "mods/lithium.pw.toml"
 hash = "c239c951796882b9c93e649a0dba4f2d95804441faaed707b686381b7a5c67da"
@@ -270,6 +279,11 @@ file = "mods/sodium.pw.toml"
 hash = "9a927c3e0830ba32e1b8a2e543597781724462595b8cce58f676962b442bb52b"
 metafile = true
 
+[[files]]
+file = "mods/spiritofthelands.pw.toml"
+hash = "470487beeb693522fe70e976b53cb9cac8110be152424a4270c4b25c172ede54"
+metafile = true
+
 [[files]]
 file = "mods/terrestria.pw.toml"
 hash = "d88f78d490fbfe15149a92f5aa1c66f3349cbb35c9599cbf9c4bba88e5ffb53a"
@@ -290,6 +304,11 @@ file = "mods/trinkets.pw.toml"
 hash = "07619668821f2aad9dbd40084ad80f25595d8715a9ef204a4a9629225729a7d9"
 metafile = true
 
+[[files]]
+file = "mods/universal-graves.pw.toml"
+hash = "dd2c937594cfd9064d4698bb0ea1d16cd405c232c1864737ca3b0c31fa5bb5d3"
+metafile = true
+
 [[files]]
 file = "mods/waystones.pw.toml"
 hash = "086f56d0a3c8f1a7b289b9949d7de08362f717295d89f0db0d13421ec860a453"

mods/comforts.pw.toml

@@ -1,13 +0,0 @@
-name = "Comforts"
-filename = "comforts-fabric-6.3.5+1.20.1.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/SaCpeal4/versions/D2F8i5te/comforts-fabric-6.3.5%2B1.20.1.jar"
-hash-format = "sha1"
-hash = "e87ac9650bb006e26623f939d47e12e5dcd50610"
-
-[update]
-[update.modrinth]
-mod-id = "SaCpeal4"
-version = "D2F8i5te"

mods/fabric-language-kotlin.pw.toml

@@ -0,0 +1,13 @@
+name = "Fabric Language Kotlin"
+filename = "fabric-language-kotlin-1.10.19+kotlin.1.9.23.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/ZMokinzs/fabric-language-kotlin-1.10.19%2Bkotlin.1.9.23.jar"
+hash-format = "sha1"
+hash = "d8a8a5a4f1289e9b4d65f9551c32fbdf56b4f162"
+
+[update]
+[update.modrinth]
+mod-id = "Ha28R6CL"
+version = "ZMokinzs"

mods/gravestones.pw.toml

@@ -1,13 +0,0 @@
-name = "Gravestones"
-filename = "gravestones-v1.15.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/ssUbhMkL/versions/Uw9uAQaY/gravestones-v1.15.jar"
-hash-format = "sha1"
-hash = "94c2fd5291c0ccf9f9bce7c0f6093df69b2cc18f"
-
-[update]
-[update.modrinth]
-mod-id = "ssUbhMkL"
-version = "Uw9uAQaY"

mods/inventory-profiles-next.pw.toml

@@ -0,0 +1,13 @@
+name = "Inventory Profiles Next"
+filename = "InventoryProfilesNext-fabric-1.20-1.10.9.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/O7RBXm3n/versions/MYaRwBOZ/InventoryProfilesNext-fabric-1.20-1.10.9.jar"
+hash-format = "sha1"
+hash = "296cf5f19ed9bca1ac8202699e9acb7b6cb8c954"
+
+[update]
+[update.modrinth]
+mod-id = "O7RBXm3n"
+version = "MYaRwBOZ"

mods/libipn.pw.toml

@@ -0,0 +1,13 @@
+name = "libIPN"
+filename = "libIPN-fabric-1.20-4.0.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/onSQdWhM/versions/n7RHn1mT/libIPN-fabric-1.20-4.0.1.jar"
+hash-format = "sha1"
+hash = "55e42623a065a7f7e9cef0e70c4d20d351740aa8"
+
+[update]
+[update.modrinth]
+mod-id = "onSQdWhM"
+version = "n7RHn1mT"

mods/spiritofthelands.pw.toml

@@ -0,0 +1,8 @@
+name = "Spirit of the Lands"
+filename = "spiritofthelands-1.0.0-alpha01-fabric+1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://objects.githubusercontent.com/github-production-release-asset-2e65be/665919855/133e3253-2386-4687-a2b5-f7072998038f?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAVCODYLSA53PQK4ZA%2F20240316%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240316T215731Z&X-Amz-Expires=300&X-Amz-Signature=213f044db855275290d49773639d169bddb946821df3e898bb099f9b3b1efe10&X-Amz-SignedHeaders=host&actor_id=5091937&key_id=0&repo_id=665919855&response-content-disposition=attachment%3B%20filename%3Dspiritofthelands-1.0.0-alpha01-fabric%2B1.20.1.jar&response-content-type=application%2Foctet-stream"
+hash-format = "sha1"
+hash = "f7811f55d685ec7c2db41af4becce1dd01ab9af6"

mods/universal-graves.pw.toml

@@ -0,0 +1,13 @@
+name = "Universal Graves"
+filename = "graves-3.0.1+1.20.1.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "e21420c5e6e246862d6dbae30056d82b84116d74"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 5059232
+project-id = 497175

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "d63501d9f8fdb6bc81eddfb262c47af24ce065d9557d4385801e4b77eb330e1a"
+hash = "b225154810a6bf29c777b478e041e6d142d219c0bdbc21f2939b2e8d3b0bcf10"
 
 [versions]
 fabric = "0.15.7"