diff --git a/README.md b/README.md index 27acd71..e6ad00c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # More Mobs -> A data pack for 1.14x-1.17x +> A data pack for 1.14x-1.18x ## Features diff --git a/data/more_mobs/functions/messages/welcome.mcfunction b/data/more_mobs/functions/messages/welcome.mcfunction index e13fff7..f70a8d2 100644 --- a/data/more_mobs/functions/messages/welcome.mcfunction +++ b/data/more_mobs/functions/messages/welcome.mcfunction @@ -1,6 +1,6 @@ ## by Tschipcraft -tellraw @s ["",{"text":"➤ More Mobs by Tschipcraft installed!","italic":false,"color":"aqua"},{"text":"\n"},{"text":"[Reset]","color":"red","clickEvent":{"action":"run_command","value":"/function more_mobs:reset"},"hoverEvent":{"action":"show_text","contents":["",{"text":"Reset the whole data pack. ","color":"white"}]}},{"text":" "},{"text":"[Uninstall]","color":"dark_red","clickEvent":{"action":"run_command","value":"/function more_mobs:uninstall"},"hoverEvent":{"action":"show_text","contents":["",{"text":"Uninstalls the data pack. ","color":"white"}]}},{"text":" "},{"text":"[Check for updates] ","color":"blue","clickEvent":{"action":"open_url","value":"https://tschipcraft.ddns.net/update/test.html?pack=more_mobs&v=1.1"},"hoverEvent":{"action":"show_text","contents":"Click here to check for updates"}}] +tellraw @s ["",{"text":"➤ More Mobs by Tschipcraft installed!","italic":false,"color":"aqua"},{"text":"\n"},{"text":"[Reset]","color":"red","clickEvent":{"action":"run_command","value":"/function more_mobs:reset"},"hoverEvent":{"action":"show_text","contents":["",{"text":"Reset the whole data pack. ","color":"white"}]}},{"text":" "},{"text":"[Uninstall]","color":"dark_red","clickEvent":{"action":"run_command","value":"/function more_mobs:uninstall"},"hoverEvent":{"action":"show_text","contents":["",{"text":"Uninstalls the data pack. ","color":"white"}]}},{"text":" "},{"text":"[Check for updates] ","color":"blue","clickEvent":{"action":"open_url","value":"https://tschipcraft.ddns.net/update/test.html?pack=more_mobs&v=1.2"},"hoverEvent":{"action":"show_text","contents":"Click here to check for updates"}}] scoreboard players set @s mm_install 1 #tellraw @s ["",{"text":"➤ Realistic Explosions by Tschipcraft installed!","italic":false,"color":"aqua"},{"text":"\n"},{"text":"[Settings]","color":"light_purple","clickEvent":{"action":"run_command","value":"/function realistic_explosions:settings"},"hoverEvent":{"action":"show_text","contents":"Click here"}},{"text":" "},{"text":"[Reset]","color":"red","clickEvent":{"action":"run_command","value":"/function realistic_explosions:reset"},"hoverEvent":{"action":"show_text","contents":["",{"text":"Reset the whole data pack. ","color":"white"}]}},{"text":" "},{"text":"[Uninstall]","color":"dark_red","clickEvent":{"action":"run_command","value":"/function realistic_explosions:uninstall"},"hoverEvent":{"action":"show_text","contents":["",{"text":"Uninstalls the data pack. ","color":"white"}]}},{"text":" "},{"text":"[Check for updates] ","color":"blue","clickEvent":{"action":"open_url","value":"https://tschipcraft.ddns.net/update/test.html?pack=realistic_explosions&v=1.0"},"hoverEvent":{"action":"show_text","contents":"Click here to check for updates"}}] diff --git a/data/more_mobs/functions/uninstall.mcfunction b/data/more_mobs/functions/uninstall.mcfunction index 5d9d042..22cccf7 100644 --- a/data/more_mobs/functions/uninstall.mcfunction +++ b/data/more_mobs/functions/uninstall.mcfunction @@ -21,5 +21,7 @@ team remove mm_nonametag datapack disable "file/more_mobs" datapack disable "file/more_mobs.zip" +datapack disable "file/more_mobs-v1.2-mc1.18-datapack.zip" -say More Mobs by Tschipcraft successfully uninstalled by @s + +say More Mobs by Tschipcraft successfully uninstalled by @s! diff --git a/data/more_mobs/functions/version_checker.mcfunction b/data/more_mobs/functions/version_checker.mcfunction index 37032b9..b418f0b 100644 --- a/data/more_mobs/functions/version_checker.mcfunction +++ b/data/more_mobs/functions/version_checker.mcfunction @@ -2,7 +2,8 @@ scoreboard objectives add mm_version dummy execute store result score global mm_version run data get entity @r DataVersion -execute if score global mm_version matches 2731.. run tellraw @a [{"text":"[More Mobs] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Minecraft version 1.18 or above detected! This data pack may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger menu","underlined":true,"color":"gold","clickEvent":{"action":"run_command","value":"/trigger menu"},"hoverEvent":{"action":"show_text","contents":"Click here"}},{"text":")","color":"gold"}] +execute if score global mm_version matches 2863.. run tellraw @a [{"text":"[More Mobs] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Minecraft version 1.18.1 or above detected! This data pack may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger menu","underlined":true,"color":"gold","clickEvent":{"action":"run_command","value":"/trigger menu"},"hoverEvent":{"action":"show_text","contents":"Click here"}},{"text":")","color":"gold"}] +#execute if score global ts_version matches 2731..2862 run say 1.18 detected! #execute if score global ts_version matches 2587..2730 run say 1.17 detected! #execute if score global ts_version matches 2231..2586 run say 1.16 detected! #execute if score global ts_version matches 1977..2230 run say 1.15 detected! diff --git a/more_mobs.zip b/more_mobs.zip index 684102a..614b20a 100644 Binary files a/more_mobs.zip and b/more_mobs.zip differ diff --git a/pack.mcmeta b/pack.mcmeta index 5bfd2aa..1ed2af2 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format" : 7, - "description" : [{"text":"More Mobs by Tschipcraft","color":"gold","bold":"true"},{"text":"\nfor 1.14x / 1.17x","color":"light_purple","bold":"false"}] + "pack_format" : 8, + "description" : [{"text":"More Mobs by Tschipcraft","color":"gold","bold":"true"},{"text":"\nfor 1.14x / 1.18x","color":"light_purple","bold":"false"}] } }