Update v.1.6.8

- Better compatibility with other datapacks
- Support for the minecraft versions 1.14.X, 1.15.X, 1.16.1, 1.16.2
- Removed name tag visibility
- Removed translation because it not used

README.md

@@ -1,10 +1,17 @@
-# Advanced Monsters Datapack v.1.4.6
+# Advanced Monsters Datapack v.1.6.8
+Compatibility: Multiplayer 1.14+
 
-With the Advanced Monsters Datapack v.1.4.6 of 2mal3 there is a chance (usually 10%) that a monster will become an Advanced Monster. This monster has 50% more life, does 50% more damage, is 10% faster and sees players 10% longer.
+With the Advanced Monsters Datapack v.1.6.8 by 2mal3 there is a chance (usually 10%) that a monster will become an Advanced Monster. This monster has 50% more life, does 50% more damage, is 10% faster and sees players 10% longer.
 
 The chance can be changed under data > amd > loot_tables > random.json by changing the second number. The probability then results from 1 / The specified number.
 
-This datapack supports with my [Language Pack](http://adfoc.us/51488274991099) the languages German, Spanish and French.
+***
 
+### Installation:
+  - Download the file.
+  - Move the folder in the file to a datapack folder in a world of your choice.
 
- To uninstall, enter /function #amd:uninstall and drag the Datapack folder from the Datapacks Order of the World
+### Uninstall:
+  - Enter `/function #amd:uninstall`
+  - Confirm that you want to uninstall
+  - Optional: Delete the datapack from the folder

data/amd/advancements/amd.json

@@ -0,0 +1,17 @@
+{
+  "display": {
+      "title": "Advanced Monsters v.1.6.8",
+      "description": "With the Advanced Monsters Datapack v.1.6.8 by 2mal3 there is a chance that a monster will become an Advanced Monster. This monster is much stronger and harder to defeat.",
+      "icon": {
+          "item": "minecraft:zombie_head"
+      },
+      "announce_to_chat": false,
+      "show_toast": false
+  },
+  "parent": "global:2mal3",
+  "criteria": {
+      "trigger": {
+          "trigger": "minecraft:tick"
+      }
+  }
+}

data/amd/functions/custom.mcfunction

@@ -1,6 +1,6 @@
 # Description: Additional abilities for transformed monsters
-# Called by: main/tick
+# Called by: main/tick/tick
 # Datapack by 2mal3
 
-execute as @e[type=#amd:arrow] at @s run data merge entity @e[type=minecraft:arrow,limit=1,sort=nearest,distance=..2] {damage:4d}
-execute as @e[type=minecraft:ghast] at @s run data merge entity @e[type=minecraft:fireball,limit=1,sort=nearest,distance=..5] {ExplosionPower:4}
+execute if entity @s[type=#amd:arrow] run data merge entity @e[type=minecraft:arrow,limit=1,sort=nearest,distance=..2] {damage:4d}
+execute if entity @s[type=minecraft:ghast] run data merge entity @e[type=minecraft:fireball,limit=1,sort=nearest,distance=..5] {ExplosionPower:4}

data/amd/functions/main/reload/reload.mcfunction

@@ -0,0 +1,30 @@
+# Description: All commands to init the datapack
+# Called by: #reaload
+# Datapack by 2mal3
+
+# scoreboards
+scoreboard objectives add amd.random dummy
+scoreboard objectives add amd.data dummy
+
+scoreboard players set $V1 amd.data 1
+scoreboard players set $V2 amd.data 6
+scoreboard players set $V3 amd.data 8
+
+
+# test minecraft version
+function version:test
+
+
+# send the reload message 4 sekonds after reload
+schedule function amd:main/reload/reload_message 3s
+
+
+# start game loop
+execute if score $version version matches 1140..1152 run function amd:main/tick/second/1.14
+execute if score $version version matches 1160..1161 run function amd:main/tick/second/1.16
+execute if score $version version matches 1162.. run function amd:main/tick/second/1.16.2
+
+# better compitiblity with other datapacks 1.5.6
+# support for 1.14.X, 1.15.X, 1.16.1, 1.16.2 1.6.6
+# removed nametag visiblity 1.6.7
+# removed transaltion because it not used 1.6.8

data/amd/functions/main/reload/reload_message.mcfunction

@@ -0,0 +1,5 @@
+# Description: send the reload message 4 sekonds after reload
+# Called by: main/reload/reload
+# Datapack by 2mal3
+
+tellraw @a[tag=!global.ignore,tag=!global.ignore.gui] ["",{"text":"[Server] Advanced Monsters Datapack v."},{"score":{"name":"$V1","objective":"amd.data"}},{"text":"."},{"score":{"name":"$V2","objective":"amd.data"}},{"text":"."},{"score":{"name":"$V3","objective":"amd.data"}},{"text":" by 2mal3 was loaded!"}]

data/amd/functions/main/tick/second/1.14.mcfunction

@@ -0,0 +1,13 @@
+# Description: Game loop for 1.14+ every second
+# Called by: main/reload/reload, main/tick/second
+# Datapack by 2mal3
+
+# choose a random monster
+execute as @e[type=#amd:monsters/1.14,tag=!global.ignore,tag=!amd.transformed] at @s store result score @s amd.random run loot spawn ~ ~ ~ loot amd:random
+
+# transform the choosen monsters to advanced
+execute as @e[scores={amd.random=1},tag=!amd.transformed,tag=!global.ignore] at @s run function amd:transform/1.14
+
+
+# tick
+schedule function amd:main/tick/second/1.14 1s

data/amd/functions/main/tick/second/1.16.2.mcfunction

@@ -0,0 +1,13 @@
+# Description: Game loop for 1.16.2 every second
+# Called by: main/reload/reload, main/tick/second
+# Datapack by 2mal3
+
+# choose a random monster
+execute as @e[type=#amd:monsters/1.16.2,tag=!global.ignore,tag=!amd.transformed] at @s store result score @s amd.random run loot spawn ~ ~ ~ loot amd:random
+
+# transform the choosen monsters to advanced
+execute as @e[scores={amd.random=1},tag=!amd.transformed,tag=!global.ignore] at @s run function amd:transform/1.16.2
+
+
+# tick
+schedule function amd:main/tick/second/1.16.2 1s

data/amd/functions/main/tick/second/1.16.mcfunction

@@ -0,0 +1,13 @@
+# Description: Game loop for 1.16 every second
+# Called by: main/reload/reload, main/tick/second
+# Datapack by 2mal3
+
+# choose a random monster
+execute as @e[type=#amd:monsters/1.16,tag=!global.ignore,tag=!amd.transformed] at @s store result score @s amd.random run loot spawn ~ ~ ~ loot amd:random
+
+# transform the choosen monsters to advanced
+execute as @e[scores={amd.random=1},tag=!amd.transformed,tag=!global.ignore] at @s run function amd:transform/1.16
+
+
+# tick
+schedule function amd:main/tick/second/1.16 1s

data/amd/functions/main/tick.mcfunction → data/amd/functions/main/tick/tick.mcfunction

@@ -1,6 +1,6 @@
-# Description: tick
-# Called by: #tick
-# Datapack by 2mal3
-
-# better advanced monsters projectiles
-execute as @e[scores={amd.random=1}] at @s run function amd:custom
+# Description: Game loop tick for 1.14+
+# Called by: main/tick/tick/main
+# Datapack by 2mal3
+
+# better advanced monsters projectiles
+execute as @e[scores={amd.random=1}] at @s run function amd:custom

data/amd/functions/main/uninstall/uninstall.mcfunction

@@ -1,24 +1,29 @@
 # Description: uninstalling
-# Called by: main/uninstall/1
+# Called by: main/uninstall/uninstall_ask
 # Datapack by 2mal3
 
-# remove message
-tellraw @a ["",{"text":"[Server] Advanced Monsters Datapack v."},{"score":{"name":"V1","objective":"amd.data"}},{"text":"."},{"score":{"name":"V2","objective":"amd.data"}},{"text":"."},{"score":{"name":"V3","objective":"amd.data"}},{"translate":" by 2mal3 was successfully uninstalled."}]
+# send remove message
+tellraw @a[tag=!global.ignore,tag=!global.ignore.gui] [{"text":"[Server] Advanced Monsters Datapack v."},{"score":{"name":"$V1","objective":"amd.data"}},{"text":"."},{"score":{"name":"$V2","objective":"amd.data"}},{"text":"."},{"score":{"name":"$V3","objective":"amd.data"}},{"text":" by 2mal3 was successfully uninstalled."}]
 
 
 # remove scoreboards
 scoreboard objectives remove amd.random
 scoreboard objectives remove amd.data
 
 
-# remove advanced Monsters
+# uninstall version library
+function version:uninstall
+
+
+# remove advanced monsters
 execute as @e[tag=amd.transformed] run replaceitem entity @s armor.head minecraft:air
-execute as @e[tag=amd.transformed] run data merge entity @s {CustomName:''}
-execute as @e[tag=amd.transformed] run data merge entity @s {CustomNameVisible:0b}
+execute as @e[tag=amd.transformed] run data merge entity @s {CustomName:""}
 
 
 # diasable datapack tick
-schedule clear amd:main/tick_slow
+schedule clear amd:main/tick/second/1.14
+schedule clear amd:main/tick/second/1.16
+schedule clear amd:main/tick/second/1.16.2
 
 
 # disable datapck

data/amd/functions/main/uninstall/uninstall_ask.mcfunction

@@ -2,4 +2,4 @@
 # Called by: #uninstall
 # Datapack by 2mal3
 
-tellraw @s ["",{"translate":"Do you really want to deinstall the ","color":"red"},{"text":"Advanced Monsters Dtapack","color":"red"},{"text":" v.","color":"red"},{"score":{"name":"V1","objective":"amd.data"},"color":"red"},{"text":".","color":"red"},{"score":{"name":"V2","objective":"amd.data"},"color":"red"},{"text":".","color":"red"},{"score":{"name":"V3","objective":"amd.data"},"color":"red"},{"translate":" by 2mal3?","color":"red"},{"text":"\n"},{"translate":"[No]","color":"dark_green","hoverEvent":{"action":"show_text","value":"*click*"}},{"text":" \u0020"},{"translate":"[Yes]","color":"dark_red","clickEvent":{"action":"run_command","value":"/function amd:main/uninstall/uninstall"},"hoverEvent":{"action":"show_text","value":"*click*"}}]
+tellraw @s[tag=!global.ignore,tag=!global.ignore.gui] [{"text":"Do you really want to deinstall the ","color":"red"},{"text":"Advanced Monsters Dtapack","color":"red"},{"text":" v.","color":"red"},{"score":{"name":"$V1","objective":"amd.data"},"color":"red"},{"text":".","color":"red"},{"score":{"name":"$V2","objective":"amd.data"},"color":"red"},{"text":".","color":"red"},{"score":{"name":"$V3","objective":"amd.data"},"color":"red"},{"text":" by 2mal3?","color":"red"},{"text":"\n"},{"text":"[No]","color":"dark_green","hoverEvent":{"action":"show_text","value":"*click*"}},{"text":" \u0020"},{"text":"[Yes]","color":"dark_red","clickEvent":{"action":"run_command","value":"/function amd:main/uninstall/uninstall"},"hoverEvent":{"action":"show_text","value":"*click*"}}]