From 62a1c161b4c3ad964b88b22aecb045e97d3d6576 Mon Sep 17 00:00:00 2001 From: "Real komaru (not fake)" Date: Sat, 14 Dec 2024 10:26:11 +0000 Subject: [PATCH] Sync files from private development repository --- .../advancement/adventure/silent_armor.json | 6 ++--- .../advancement/biomes/pandas_express.json | 27 +++---------------- .../data/bacaped/function/install.mcfunction | 10 +++---- .../bacaped/function/hc_install.mcfunction | 10 +++---- 4 files changed, 17 insertions(+), 36 deletions(-) diff --git a/BACAP_Enhanced_Discoveries/data/bacaped/advancement/adventure/silent_armor.json b/BACAP_Enhanced_Discoveries/data/bacaped/advancement/adventure/silent_armor.json index 27d19ee..4480edb 100644 --- a/BACAP_Enhanced_Discoveries/data/bacaped/advancement/adventure/silent_armor.json +++ b/BACAP_Enhanced_Discoveries/data/bacaped/advancement/adventure/silent_armor.json @@ -18,7 +18,7 @@ }, "parent": "bacaped:adventure/emerald_armor", "criteria": { - "armor_with_silence trims": { + "armor_with_silence_trims": { "trigger": "minecraft:inventory_changed", "conditions": { "player": [ @@ -295,8 +295,8 @@ "items": "#minecraft:chest_armor", "components": { "minecraft:trim": { - "material": "minecraft:diamond", - "pattern": "minecraft:resin" + "material": "minecraft:resin", + "pattern": "minecraft:silence" } } } diff --git a/BACAP_Enhanced_Discoveries/data/bacaped/advancement/biomes/pandas_express.json b/BACAP_Enhanced_Discoveries/data/bacaped/advancement/biomes/pandas_express.json index 0e6b5c6..3d8621b 100644 --- a/BACAP_Enhanced_Discoveries/data/bacaped/advancement/biomes/pandas_express.json +++ b/BACAP_Enhanced_Discoveries/data/bacaped/advancement/biomes/pandas_express.json @@ -31,40 +31,21 @@ }, "parent": "blazeandcave:biomes/zoologist", "criteria": { - "use_lead": { + "trigger": { "trigger": "minecraft:player_interacted_with_entity", "conditions": { "item": { "items": "minecraft:lead" }, "entity": { - "type": "#minecraft:boat" - } - } - }, - "look_panda": { - "trigger": "minecraft:location", - "conditions": { - "player": { - "type_specific": { - "type": "minecraft:player", - "looking_at": { - "type": "minecraft:panda", - "vehicle": { - "type": "#minecraft:boat" - } - } + "type": "#minecraft:boat", + "passenger": { + "type": "minecraft:panda" } } } } }, - "requirements": [ - [ - "use_lead", - "look_panda" - ] - ], "rewards": { "function": "bacaped_rewards:biomes/pandas_express" } diff --git a/BACAP_Enhanced_Discoveries/data/bacaped/function/install.mcfunction b/BACAP_Enhanced_Discoveries/data/bacaped/function/install.mcfunction index 4a7375e..3cff672 100644 --- a/BACAP_Enhanced_Discoveries/data/bacaped/function/install.mcfunction +++ b/BACAP_Enhanced_Discoveries/data/bacaped/function/install.mcfunction @@ -1,5 +1,5 @@ -datapack disable "file/BACAP_Enhanced_Discoveries_2.4.5" -datapack disable "file/BACAP_Enhanced_Discoveries_2.4.5.zip" -datapack enable "file/BACAP_Enhanced_Discoveries_2.4.5" last -datapack enable "file/BACAP_Enhanced_Discoveries_2.4.5.zip" last -tellraw @a [{"translate":"BACAP Enhanced Discoveries","bold":true,"color":"#5BE576"},{"translate":" successfully installed","color":"yellow","bold":false},{"translate":"\n","bold":false},{"translate":"Version:","color":"#6FFF69","bold":false},{"text": " 2.4.5","bold":false},{"translate":"\n","bold":false},{"translate":"Thanks for downloading, if you find any bugs, typos or other inaccuracies, ","color":"#A6DEFF","bold":false},{"translate":"write an issue","underlined":true,"color":"#A6DEFF","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries/issues"},"hoverEvent":{"action":"show_text","contents":{"translate":"Write an issue"}},"bold":false},{"translate":"\n","bold":false},{"translate":"[\u2604]","color":"gray","bold":false},{"translate":" ","bold":false},{"translate":"GitHub","color":"dark_gray","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on GitHub"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Modrinth","color":"#76E476","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/bacap-enhanced-discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on Modrinth"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Discord","color":"#8265EF","clickEvent":{"action":"open_url","value":"https://discord.gg/FBGCuvaV4z"},"hoverEvent":{"action":"show_text","contents":{"translate":"Join Discord Server"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Docs","color":"#FFAB5F","clickEvent":{"action":"open_url","value":"https://komaru-cats.github.io/BACAP-Enhanced-Discoveries/"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open the advancement documentation"}},"bold":false}] \ No newline at end of file +datapack disable "file/BACAP_Enhanced_Discoveries_2.4.6" +datapack disable "file/BACAP_Enhanced_Discoveries_2.4.6.zip" +datapack enable "file/BACAP_Enhanced_Discoveries_2.4.6" last +datapack enable "file/BACAP_Enhanced_Discoveries_2.4.6.zip" last +tellraw @a [{"translate":"BACAP Enhanced Discoveries","bold":true,"color":"#5BE576"},{"translate":" successfully installed","color":"yellow","bold":false},{"translate":"\n","bold":false},{"translate":"Version:","color":"#6FFF69","bold":false},{"text": " 2.4.6","bold":false},{"translate":"\n","bold":false},{"translate":"Thanks for downloading, if you find any bugs, typos or other inaccuracies, ","color":"#A6DEFF","bold":false},{"translate":"write an issue","underlined":true,"color":"#A6DEFF","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries/issues"},"hoverEvent":{"action":"show_text","contents":{"translate":"Write an issue"}},"bold":false},{"translate":"\n","bold":false},{"translate":"[\u2604]","color":"gray","bold":false},{"translate":" ","bold":false},{"translate":"GitHub","color":"dark_gray","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on GitHub"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Modrinth","color":"#76E476","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/bacap-enhanced-discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on Modrinth"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Discord","color":"#8265EF","clickEvent":{"action":"open_url","value":"https://discord.gg/FBGCuvaV4z"},"hoverEvent":{"action":"show_text","contents":{"translate":"Join Discord Server"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Docs","color":"#FFAB5F","clickEvent":{"action":"open_url","value":"https://komaru-cats.github.io/BACAP-Enhanced-Discoveries/"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open the advancement documentation"}},"bold":false}] \ No newline at end of file diff --git a/BACAP_Enhanced_Discoveries_Hardcore_Addon/data/bacaped/function/hc_install.mcfunction b/BACAP_Enhanced_Discoveries_Hardcore_Addon/data/bacaped/function/hc_install.mcfunction index 9d50048..cdf5ce5 100644 --- a/BACAP_Enhanced_Discoveries_Hardcore_Addon/data/bacaped/function/hc_install.mcfunction +++ b/BACAP_Enhanced_Discoveries_Hardcore_Addon/data/bacaped/function/hc_install.mcfunction @@ -1,5 +1,5 @@ -datapack disable "file/BACAP_Enhanced_Discoveries_2.4.5_Hardcore_Addon" -datapack disable "file/BACAP_Enhanced_Discoveries_2.4.5_Hardcore_Addon.zip" -datapack enable "file/BACAP_Enhanced_Discoveries_2.4.5_Hardcore_Addon" last -datapack enable "file/BACAP_Enhanced_Discoveries_2.4.5_Hardcore_Addon.zip" last -tellraw @a [{"translate":"BACAP Enhanced Discoveries Hardcore Addon","bold":true,"color":"#f85f67"},{"translate":" successfully installed","color":"yellow","bold":false},{"translate":"\n","bold":false},{"translate":"Version:","color":"#6FFF69","bold":false},{"text": " 2.4.5","bold":false},{"translate":"\n","bold":false},{"translate":"Thanks for downloading, if you find any bugs, typos or other inaccuracies, ","color":"#A6DEFF","bold":false},{"translate":"write an issue","underlined":true,"color":"#A6DEFF","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries/issues"},"hoverEvent":{"action":"show_text","contents":{"translate":"Write an issue"}},"bold":false},{"translate":"\n","bold":false},{"translate":"[\u2604]","color":"gray","bold":false},{"translate":" ","bold":false},{"translate":"GitHub","color":"dark_gray","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on GitHub"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Modrinth","color":"#76E476","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/bacap-enhanced-discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on Modrinth"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Discord","color":"#8265EF","clickEvent":{"action":"open_url","value":"https://discord.gg/FBGCuvaV4z"},"hoverEvent":{"action":"show_text","contents":{"translate":"Join Discord Server"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Docs","color":"#FFAB5F","clickEvent":{"action":"open_url","value":"https://komaru-cats.github.io/BACAP-Enhanced-Discoveries/"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open the advancement documentation"}},"bold":false}] \ No newline at end of file +datapack disable "file/BACAP_Enhanced_Discoveries_2.4.6_Hardcore_Addon" +datapack disable "file/BACAP_Enhanced_Discoveries_2.4.6_Hardcore_Addon.zip" +datapack enable "file/BACAP_Enhanced_Discoveries_2.4.6_Hardcore_Addon" last +datapack enable "file/BACAP_Enhanced_Discoveries_2.4.6_Hardcore_Addon.zip" last +tellraw @a [{"translate":"BACAP Enhanced Discoveries Hardcore Addon","bold":true,"color":"#f85f67"},{"translate":" successfully installed","color":"yellow","bold":false},{"translate":"\n","bold":false},{"translate":"Version:","color":"#6FFF69","bold":false},{"text": " 2.4.6","bold":false},{"translate":"\n","bold":false},{"translate":"Thanks for downloading, if you find any bugs, typos or other inaccuracies, ","color":"#A6DEFF","bold":false},{"translate":"write an issue","underlined":true,"color":"#A6DEFF","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries/issues"},"hoverEvent":{"action":"show_text","contents":{"translate":"Write an issue"}},"bold":false},{"translate":"\n","bold":false},{"translate":"[\u2604]","color":"gray","bold":false},{"translate":" ","bold":false},{"translate":"GitHub","color":"dark_gray","clickEvent":{"action":"open_url","value":"https://github.com/Komaru-cats/BACAP-Enhanced-Discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on GitHub"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Modrinth","color":"#76E476","clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/bacap-enhanced-discoveries"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open on Modrinth"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Discord","color":"#8265EF","clickEvent":{"action":"open_url","value":"https://discord.gg/FBGCuvaV4z"},"hoverEvent":{"action":"show_text","contents":{"translate":"Join Discord Server"}},"bold":false},{"translate":" | ","color":"gray","bold":false},{"translate":"Docs","color":"#FFAB5F","clickEvent":{"action":"open_url","value":"https://komaru-cats.github.io/BACAP-Enhanced-Discoveries/"},"hoverEvent":{"action":"show_text","contents":{"translate":"Open the advancement documentation"}},"bold":false}] \ No newline at end of file