From c13825e29e8fa8c684798a67d3ebbcc36e25aaa4 Mon Sep 17 00:00:00 2001
From: HeroChris <cpraterke1997@gmail.com>
Date: Sat, 30 Nov 2024 19:46:23 +0100
Subject: [PATCH] New advancements + cleanup

- 2 New advancements for the locked interaction.
- Removed 2 default folder, crafting recipes and loot tables
---
 .../advancement/herohost/hands_off.json       | 34 +++++++++++++++++++
 .../advancement/herohost/hard_listener.json   | 29 ++++++++++++++++
 data/herohost/advancement/herohost/root.json  |  2 +-
 .../function/core/initialize.mcfunction       |  2 +-
 .../function/core/reconnect.mcfunction        |  2 +-
 data/herohost/function/main.mcfunction        |  2 +-
 data/herohost/function/misc/lock.mcfunction   |  7 +++-
 data/herohost/function/test.mcfunction        |  1 +
 pack.mcmeta                                   |  8 +++++
 9 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 data/herohost/advancement/herohost/hands_off.json
 create mode 100644 data/herohost/advancement/herohost/hard_listener.json
 create mode 100644 data/herohost/function/test.mcfunction

diff --git a/data/herohost/advancement/herohost/hands_off.json b/data/herohost/advancement/herohost/hands_off.json
new file mode 100644
index 0000000..3f9f89e
--- /dev/null
+++ b/data/herohost/advancement/herohost/hands_off.json
@@ -0,0 +1,34 @@
+{
+    "parent": "herohost:herohost/root",
+    "display": {
+        "icon": {
+            "id": "minecraft:barrier"
+        },
+        "title": {
+            "translate": "hhost.minigame.advancement.herohost.hands_off.title",
+            "fallback": "Hands off"
+        },
+        "description": {
+            "translate": "hhost.minigame.advancement.herohost.hands_off.description",
+            "fallback": "Can't do that, it's not yours"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": false,
+        "hidden": true
+    },
+    "criteria": {
+        "hands_off": {
+            "trigger": "minecraft:player_interacted_with_entity",
+            "conditions": {
+                "entity": {
+                    "type": "minecraft:interaction",
+                    "nbt": "{Tags:[\"locked\"]}"
+                }
+            }
+        }
+    },
+    "rewards": {
+        
+    }
+}
\ No newline at end of file
diff --git a/data/herohost/advancement/herohost/hard_listener.json b/data/herohost/advancement/herohost/hard_listener.json
new file mode 100644
index 0000000..e44985f
--- /dev/null
+++ b/data/herohost/advancement/herohost/hard_listener.json
@@ -0,0 +1,29 @@
+{
+    "parent": "herohost:herohost/hands_off",
+    "display": {
+        "icon": {
+            "id": "minecraft:barrier"
+        },
+        "title": {
+            "translate": "hhost.minigame.advancement.herohost.hard_listener.title",
+            "fallback": "Hard listener"
+        },
+        "description": {
+            "translate": "hhost.minigame.advancement.herohost.hard_listener.description",
+            "fallback": "One warning should be enough..."
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": false,
+        "hidden": true
+    },
+    "criteria": {
+        "hard_listener": {
+            "trigger": "minecraft:impossible",
+            "conditions": {}
+        }
+    },
+    "rewards": {
+        
+    }
+}
\ No newline at end of file
diff --git a/data/herohost/advancement/herohost/root.json b/data/herohost/advancement/herohost/root.json
index 5508ade..ec7e6d0 100644
--- a/data/herohost/advancement/herohost/root.json
+++ b/data/herohost/advancement/herohost/root.json
@@ -5,7 +5,7 @@
         },
         "title": {
             "translate": "hhost.minigame.advancement.herohost.root.title",
-            "fallback": "HeroHost servers."
+            "fallback": "HeroHost servers"
         },
         "description": {
             "translate": "hhost.minigame.advancement.herohost.root.description",
diff --git a/data/herohost/function/core/initialize.mcfunction b/data/herohost/function/core/initialize.mcfunction
index 048acd6..cfb5a5a 100644
--- a/data/herohost/function/core/initialize.mcfunction
+++ b/data/herohost/function/core/initialize.mcfunction
@@ -2,7 +2,7 @@
 
 tellraw @s [{"text":"» ","color":"gray"},{"translate":"hhost.minigame.welcome","fallback":"Welcome %s to the %s server!","with":[{"selector":"@s","color":"yellow"},{"text":"H","color":"#fa6a52","extra":[{"text":"e","color":"#fc7551"},{"text":"r","color":"#fd8051"},{"text":"o","color":"#fe8a52"},{"text":"H","color":"#ff9454"},{"text":"o","color":"#ff9e56"},{"text":"s","color":"#ffa85a"},{"text":"t","color":"#ffb15e"}]}],"color":"white"}]
 tellraw @a[tag=hc.initialized] [{"text":"» ","color":"gray"},{"translate":"hhost.minigame.wish_welcome","fallback":"Everyone, give %s a warm welcome!","with":[{"selector":"@s","color":"yellow"}],"color":"white"}]
-execute at @s run playsound minecraft:entity.chicken.egg master @s ~ ~ ~ 0.6 0.7
+execute at @s run playsound minecraft:block.amethyst_block.step master @s ~ ~ ~ 0.7 0.7
 
 # tp player
 
diff --git a/data/herohost/function/core/reconnect.mcfunction b/data/herohost/function/core/reconnect.mcfunction
index dacb630..8a66a23 100644
--- a/data/herohost/function/core/reconnect.mcfunction
+++ b/data/herohost/function/core/reconnect.mcfunction
@@ -2,7 +2,7 @@
 
 tellraw @s [{"text":"» ","color":"gray"},{"translate":"hhost.minigame.welcome_back","fallback":"Welcome back %s to the %s server!","with":[{"selector":"@s","color":"yellow"},{"text":"H","color":"#fa6a52","extra":[{"text":"e","color":"#fc7551"},{"text":"r","color":"#fd8051"},{"text":"o","color":"#fe8a52"},{"text":"H","color":"#ff9454"},{"text":"o","color":"#ff9e56"},{"text":"s","color":"#ffa85a"},{"text":"t","color":"#ffb15e"}]}],"color":"white"}]
 tellraw @s[tag=hc.debug] [{"text":"» ","color":"red"},{"translate":"hhost.minigame.debug_warning","fallback":"You are still in debug mode, click %s to disable it.","with":[{"translate":"hhost.minigame.here","fallback":"here","color":"red","clickEvent":{"action":"run_command","value":"/tag @s remove hc.debug"},"hoverEvent":{"action":"show_text","contents":[{"translate":"hhost.minigame.operator_warning","fallback":"You need to be an operator to use this.","color":"red"}]}}],"color":"white"}]
-execute at @s run playsound minecraft:entity.chicken.egg master @s ~ ~ ~ 0.6 0.7
+execute at @s run playsound minecraft:block.amethyst_block.step master @s ~ ~ ~ 0.7 0.7
 
 # tp player
 
diff --git a/data/herohost/function/main.mcfunction b/data/herohost/function/main.mcfunction
index 5a72fcd..3efe706 100644
--- a/data/herohost/function/main.mcfunction
+++ b/data/herohost/function/main.mcfunction
@@ -9,7 +9,7 @@ kill @e[type=item,tag=!persistent]
 gamemode adventure @a[tag=!hc.debug]
 
 # hc.debug
-#give @s minecraft:written_book[minecraft:item_model="minecraft:wind_charge",minecraft:enchantment_glint_override=false]
+
 
 # games
 # execute in herohost:world if entity @p[x=-125,y=50,z=-376,dx=250,dy=100,dz=250] run function herohost:tnt/core
\ No newline at end of file
diff --git a/data/herohost/function/misc/lock.mcfunction b/data/herohost/function/misc/lock.mcfunction
index 282aaa6..927fb87 100644
--- a/data/herohost/function/misc/lock.mcfunction
+++ b/data/herohost/function/misc/lock.mcfunction
@@ -2,4 +2,9 @@
 
 advancement revoke @s only herohost:misc/lock
 title @s actionbar [{"translate":"hhost.minigame.locked","fallback":"You can't do that! This is not yours to touch."}]
-playsound minecraft:block.nether_wood.break master @s ~ ~ ~ 1 1 1
\ No newline at end of file
+playsound minecraft:block.nether_wood.break master @s ~ ~ ~ 1 1 1
+
+# advancement related
+    scoreboard players add @s +hc.locked 1
+    advancement grant @s only herohost:/hands_off
+    execute if score @s +hc.locked matches 10.. run advancement grant @s only herohost:herohost/hard_listener
\ No newline at end of file
diff --git a/data/herohost/function/test.mcfunction b/data/herohost/function/test.mcfunction
new file mode 100644
index 0000000..02c09b3
--- /dev/null
+++ b/data/herohost/function/test.mcfunction
@@ -0,0 +1 @@
+execute as @p run give @s minecraft:written_book[minecraft:item_model="minecraft:wind_charge",minecraft:custom_name='[{"translate":"hhost.minigame.book.player_stats.title","fallback":"Player stats","color":"#5c89a8","italic":false}]',minecraft:lore=['[{"translate":"hhost.minigame.book.player_stats.lore","fallback":"Everything about you.","italic":false,"color":"white"}]','[""]','[{"translate":"hhost.minigame.by","fallback":"By: %s","with":[{"text":"H","color":"#fa6a52","extra":[{"text":"e","color":"#fc7551"},{"text":"r","color":"#fd8051"},{"text":"o","color":"#fe8a52"},{"text":"H","color":"#ff9454"},{"text":"o","color":"#ff9e56"},{"text":"s","color":"#ffa85a"},{"text":"t","color":"#ffb15e"}]}],"color":"white","italic":false}]'],minecraft:enchantment_glint_override=false,hide_additional_tooltip={},minecraft:written_book_content={title:"",author:"",pages:['{"translate":"hhost.minigame.book.player_stats.intro"}']}]
\ No newline at end of file
diff --git a/pack.mcmeta b/pack.mcmeta
index 276ce38..add7dde 100644
--- a/pack.mcmeta
+++ b/pack.mcmeta
@@ -8,6 +8,14 @@
           {
               "namespace": "minecraft",
               "path": "advancement/.*"
+          },
+          {
+              "namespace": "minecraft",
+              "path": "loot_table/.*"
+          },
+          {
+              "namespace": "minecraft",
+              "path": "recipe/.*"
           }
       ]
   }