From b6d562747f617585a6d74846ed38f4ab7ee0fa2e Mon Sep 17 00:00:00 2001 From: 2mal3 Date: Sun, 24 Jan 2021 19:52:49 +0100 Subject: [PATCH] Update v1.3.0 Added: - Easy setting of the probability of transforming - Datapack icon - Debug mode Changed: - Performance improvements - Better compatibility with other datapacks - Other version numbers system - Completely new and Better code Removed: - Compatibility with older minecraft versions --- README.md | 29 ++--- changelog.txt | 104 ++++++++++++++++++ .../amd.json => 2mal3/advancements/admo.json} | 6 +- .../functions/admo/core/first_run.mcfunction | 15 +++ .../functions/admo/core/reload.mcfunction | 20 ++++ .../functions/admo/core/second.mcfunction | 9 ++ .../admo/core/uninstall/uninstall.mcfunction | 24 ++++ .../core/uninstall/uninstall_ask.mcfunction | 5 + .../2mal3/functions/admo/transform.mcfunction | 34 ++++++ .../admo/tray_transforming.mcfunction | 18 +++ data/2mal3/functions/random/random.mcfunction | 24 ++++ data/2mal3/functions/random/reload.mcfunction | 15 +++ .../functions/random/uninstall.mcfunction | 6 + .../tags/entity_types/admo/bow.json} | 15 ++- .../tags/entity_types/admo/monsters.json} | 4 +- .../tags/entity_types/admo/undead.json} | 4 +- data/2mal3/tags/functions/admo/uninstall.json | 5 + .../core/reload/first_run.mcfunction | 7 -- .../functions/core/reload/reload.mcfunction | 28 ----- .../core/tick/second/1.14.mcfunction | 13 --- .../core/tick/second/1.16.2.mcfunction | 13 --- .../core/tick/second/1.16.mcfunction | 13 --- data/amd/functions/core/tick/tick.mcfunction | 6 - .../core/uninstall/uninstall.mcfunction | 31 ------ .../core/uninstall/uninstall_ask.mcfunction | 5 - data/amd/functions/custom.mcfunction | 6 - data/amd/functions/transform/1.14.mcfunction | 49 --------- .../amd/functions/transform/1.16.2.mcfunction | 52 --------- data/amd/functions/transform/1.16.mcfunction | 51 --------- data/amd/loot_tables/random.json | 1 - data/amd/tags/entity_types/monsters/1.14.json | 32 ------ data/amd/tags/entity_types/monsters/1.16.json | 34 ------ data/amd/tags/entity_types/undead/1.14.json | 13 --- data/amd/tags/functions/uninstall.json | 5 - data/global/advancements/2mal3.json | 2 +- data/global/advancements/root.json | 2 +- data/load/functions/__init.mcfunction | 13 +++ data/load/tags/functions/__init.json | 8 ++ data/load/tags/functions/load.json | 5 + data/load/tags/functions/post_load.json | 3 + data/load/tags/functions/standard.json | 5 + data/minecraft/tags/functions/load.json | 6 +- data/minecraft/tags/functions/tick.json | 5 - data/version/functions/test.mcfunction | 33 ------ data/version/functions/uninstall.mcfunction | 5 - .../functions/versions/1.13/0.mcfunction | 6 - .../functions/versions/1.13/1.mcfunction | 6 - .../functions/versions/1.13/2.mcfunction | 6 - .../functions/versions/1.14/0.mcfunction | 6 - .../functions/versions/1.14/1.mcfunction | 6 - .../functions/versions/1.14/2.mcfunction | 6 - .../functions/versions/1.14/3.mcfunction | 6 - .../functions/versions/1.14/4.mcfunction | 6 - .../functions/versions/1.15/0.mcfunction | 6 - .../functions/versions/1.15/1.mcfunction | 6 - .../functions/versions/1.15/2.mcfunction | 6 - .../functions/versions/1.16/0.mcfunction | 6 - .../functions/versions/1.16/1.mcfunction | 6 - .../functions/versions/1.16/2.mcfunction | 6 - icon.png | Bin 0 -> 860 bytes pack.mcmeta | 2 +- 61 files changed, 349 insertions(+), 520 deletions(-) create mode 100644 changelog.txt rename data/{amd/advancements/amd.json => 2mal3/advancements/admo.json} (52%) create mode 100644 data/2mal3/functions/admo/core/first_run.mcfunction create mode 100644 data/2mal3/functions/admo/core/reload.mcfunction create mode 100644 data/2mal3/functions/admo/core/second.mcfunction create mode 100644 data/2mal3/functions/admo/core/uninstall/uninstall.mcfunction create mode 100644 data/2mal3/functions/admo/core/uninstall/uninstall_ask.mcfunction create mode 100644 data/2mal3/functions/admo/transform.mcfunction create mode 100644 data/2mal3/functions/admo/tray_transforming.mcfunction create mode 100644 data/2mal3/functions/random/random.mcfunction create mode 100644 data/2mal3/functions/random/reload.mcfunction create mode 100644 data/2mal3/functions/random/uninstall.mcfunction rename data/{amd/tags/entity_types/arrow.json => 2mal3/tags/entity_types/admo/bow.json} (54%) rename data/{amd/tags/entity_types/monsters/1.16.2.json => 2mal3/tags/entity_types/admo/monsters.json} (94%) rename data/{amd/tags/entity_types/undead/1.16.json => 2mal3/tags/entity_types/admo/undead.json} (82%) create mode 100644 data/2mal3/tags/functions/admo/uninstall.json delete mode 100644 data/amd/functions/core/reload/first_run.mcfunction delete mode 100644 data/amd/functions/core/reload/reload.mcfunction delete mode 100644 data/amd/functions/core/tick/second/1.14.mcfunction delete mode 100644 data/amd/functions/core/tick/second/1.16.2.mcfunction delete mode 100644 data/amd/functions/core/tick/second/1.16.mcfunction delete mode 100644 data/amd/functions/core/tick/tick.mcfunction delete mode 100644 data/amd/functions/core/uninstall/uninstall.mcfunction delete mode 100644 data/amd/functions/core/uninstall/uninstall_ask.mcfunction delete mode 100644 data/amd/functions/custom.mcfunction delete mode 100644 data/amd/functions/transform/1.14.mcfunction delete mode 100644 data/amd/functions/transform/1.16.2.mcfunction delete mode 100644 data/amd/functions/transform/1.16.mcfunction delete mode 100644 data/amd/loot_tables/random.json delete mode 100644 data/amd/tags/entity_types/monsters/1.14.json delete mode 100644 data/amd/tags/entity_types/monsters/1.16.json delete mode 100644 data/amd/tags/entity_types/undead/1.14.json delete mode 100644 data/amd/tags/functions/uninstall.json create mode 100644 data/load/functions/__init.mcfunction create mode 100644 data/load/tags/functions/__init.json create mode 100644 data/load/tags/functions/load.json create mode 100644 data/load/tags/functions/post_load.json create mode 100644 data/load/tags/functions/standard.json delete mode 100644 data/minecraft/tags/functions/tick.json delete mode 100644 data/version/functions/test.mcfunction delete mode 100644 data/version/functions/uninstall.mcfunction delete mode 100644 data/version/functions/versions/1.13/0.mcfunction delete mode 100644 data/version/functions/versions/1.13/1.mcfunction delete mode 100644 data/version/functions/versions/1.13/2.mcfunction delete mode 100644 data/version/functions/versions/1.14/0.mcfunction delete mode 100644 data/version/functions/versions/1.14/1.mcfunction delete mode 100644 data/version/functions/versions/1.14/2.mcfunction delete mode 100644 data/version/functions/versions/1.14/3.mcfunction delete mode 100644 data/version/functions/versions/1.14/4.mcfunction delete mode 100644 data/version/functions/versions/1.15/0.mcfunction delete mode 100644 data/version/functions/versions/1.15/1.mcfunction delete mode 100644 data/version/functions/versions/1.15/2.mcfunction delete mode 100644 data/version/functions/versions/1.16/0.mcfunction delete mode 100644 data/version/functions/versions/1.16/1.mcfunction delete mode 100644 data/version/functions/versions/1.16/2.mcfunction create mode 100644 icon.png diff --git a/README.md b/README.md index 60f3036..2ed46f1 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,20 @@ -# Advanced Monsters Datapack v1.6.10 -Compatibility: Multiplayer 1.14+ +# Advanced Monsters Datapack v1.3.0 +Compatibility: Multiplayer 1.16+ -With the Advanced Monsters Datapack v1.6.10 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. +This datapack adds the chance for normal monsters to become advanced monsters. These monsters are faster, stronger and have more lives, so the game becomes a bit more difficult. +That is all. -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. +### Settings: +The command: `scoreboard players set $admo.transform_chance admo.data ` can be used to set the probability of spawning the advanced monsters. +The probability is calculated with **1 / the set number**. Example: If you set as the number 20 the probability is 5% (1/20=0.05=5%). +If the number is 1, every monster is advanced. +If the number is 0, no monster is advanced. -*** - -### Installation: - - Download the file. - - Move the folder in the file to a datapack folder in a world of your choice. +### Exact information about advanced monsters: +- 70% more damage +- 50% more life +- 20% faster attacks +- 30% larger range +- 20% faster -### Uninstall: - - Enter `/function #amd:uninstall` - - Confirm that you want to uninstall - - Optional: Delete the datapack from the folder +*** diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..9627231 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,104 @@ + +Update v1.3.0 (24.1.2021) + +Added: +- Easy setting of the probability of transforming +- Datapack icon +- Debug mode + +Changed: +- Performance improvements +- Better compatibility with other datapacks +- Other version numbers system +- Completely new and Better code + +Removed: +- Compatibility with older minecraft versions + +---------------------------------------------------------------- + +Update v1.2.1 (28.8.2020) + +Changed: +- Small code optimizations +- Better compatibility with other datapacks + +---------------------------------------------------------------- + +Update v1.2.0 (24.7.2020) + +Added: +- Support for the minecraft versions 1.14.X, 1.15.X, 1.16.1, 1.16.2 + +Changed: +- Better compatibility with other datapacks + +Removed: +- Name tag visibility of Advanced Monsters +- Translation with my Language Pack + +---------------------------------------------------------------- + +Update v1.1.6 (21.6.2020) + +Changed: +- Better performance +- Better reload message + +---------------------------------------------------------------- + +Update v1.1.5 (18.6.2020) + +Changed: +- Install and uninstall translation +- Better uninstall + +---------------------------------------------------------------- + +Update v1.1.4 (15.5.2020) + +Changed: +- Better info system +- Better uninstall + +---------------------------------------------------------------- + +Update v1.1.3 (17.4.2020) + +Changed: +- Better code +- More language support + +Bug fixes: +- I do not know + +---------------------------------------------------------------- + +Update v1.1.2 (10.4.2020) + +Changed: +- More language support +- Revision of the entire information system + +---------------------------------------------------------------- + +Update v1.1.1 (9.4.2020) + +Changed: +- More language support + +---------------------------------------------------------------- + +Update v1.1.0 (5.4.2020) + +Added: +- Language support for Spanish, German and French with my Language Pack + +---------------------------------------------------------------- + +Update v1.0.1 (5.4.2020) + +Bug fixes: +- I do not know + +---------------------------------------------------------------- \ No newline at end of file diff --git a/data/amd/advancements/amd.json b/data/2mal3/advancements/admo.json similarity index 52% rename from data/amd/advancements/amd.json rename to data/2mal3/advancements/admo.json index 3d79a6a..191a16f 100644 --- a/data/amd/advancements/amd.json +++ b/data/2mal3/advancements/admo.json @@ -1,7 +1,7 @@ { "display": { - "title": "Advanced Monsters v1.6.10", - "description": "With the Advanced Monsters Datapack v1.6.10 by 2mal3 there is a chance that a monster will become an Advanced Monster. This monster is much stronger and harder to defeat.", + "title": "Advanced Monsters v1.3.0", + "description": "Adds advanced monsters that spawn with a certain probability.", "icon": { "item": "minecraft:zombie_head" }, @@ -14,4 +14,4 @@ "trigger": "minecraft:tick" } } -} \ No newline at end of file +} diff --git a/data/2mal3/functions/admo/core/first_run.mcfunction b/data/2mal3/functions/admo/core/first_run.mcfunction new file mode 100644 index 0000000..e9063de --- /dev/null +++ b/data/2mal3/functions/admo/core/first_run.mcfunction @@ -0,0 +1,15 @@ +# Description: One-time commands at the first start of the datapack +# Called from function: 2mal3:admo/core/reload +# Datapack by 2mal3 + +# Output debug message in chat, if enabled (INFO) +tellraw @a[scores={admo.debug_mode=3..}] [{"text":"[","color":"gray"},{"text":"AdvancedMonsters","color":"green"},{"text":"/","color":"gray"},{"text":"INFO","color":"green"},{"text":"]: ","color":"gray"},{"text":"Datapack installed!","color":"green"}] + +# Start config +scoreboard players set $admo.transform_chance admo.data 10 + +# Remembers that the Datapack was installed +scoreboard players set $admo.first_run admo.data 1 + +# Sends installation message +tellraw @a [{"text":"Advanced Monsters Datapack v1.3.0 by 2mal3 was installed!","color":"blue"}] diff --git a/data/2mal3/functions/admo/core/reload.mcfunction b/data/2mal3/functions/admo/core/reload.mcfunction new file mode 100644 index 0000000..d12a1a1 --- /dev/null +++ b/data/2mal3/functions/admo/core/reload.mcfunction @@ -0,0 +1,20 @@ +# Description: Commands when reloading the datapack +# Called from tag: minecraft:reaload +# Datapack by 2mal3 + +# Output debug message in chat, if enabled (INFO) +tellraw @a[scores={admo.debug_mode=3..}] [{"text":"[","color":"gray"},{"text":"AdvancedMonsters","color":"green"},{"text":"/","color":"gray"},{"text":"INFO","color":"green"},{"text":"]: ","color":"gray"},{"text":"Datapack reloaded!","color":"green"}] + + +# Adds scoreboards +scoreboard objectives add admo.data dummy +scoreboard objectives add admo.debug_mode dummy + +# Set the version in format: xx.xx.xx +scoreboard players set $admo.version admo.data 010300 + +# Executes the installation when the datapack is started for the first time +execute unless score $admo.first_run admo.data matches 1 run schedule function 2mal3:admo/core/first_run 4s + +# Starts the loops +function 2mal3:admo/core/second diff --git a/data/2mal3/functions/admo/core/second.mcfunction b/data/2mal3/functions/admo/core/second.mcfunction new file mode 100644 index 0000000..b7b3681 --- /dev/null +++ b/data/2mal3/functions/admo/core/second.mcfunction @@ -0,0 +1,9 @@ +# Description: Main loop every second +# Called from functions: 2mal3:admo/core/reload, 2mal3:admo/core/second +# Datapack by 2mal3 + +# Try to transform all new monsters +execute as @e[type=#2mal3:admo/monsters,tag=!admo.processed,tag=!global.ignore] at @s run function 2mal3:admo/tray_transforming + +# Calls the function in the next second +schedule function 2mal3:admo/core/second 1s diff --git a/data/2mal3/functions/admo/core/uninstall/uninstall.mcfunction b/data/2mal3/functions/admo/core/uninstall/uninstall.mcfunction new file mode 100644 index 0000000..0fb9bfd --- /dev/null +++ b/data/2mal3/functions/admo/core/uninstall/uninstall.mcfunction @@ -0,0 +1,24 @@ +# Description: Uninstalls the Datapack +# Called from function: core/uninstall/uninstall_ask +# Datapack by 2mal3 + +# Output debug message in chat, if enabled (INFO) +tellraw @a[scores={admo.debug_mode=3..}] [{"text":"[","color":"gray"},{"text":"AdvancedMonsters","color":"green"},{"text":"/","color":"gray"},{"text":"INFO","color":"green"},{"text":"]: ","color":"gray"},{"text":"Datapack uninstalled!","color":"green"}] + + +# Stops the loops +schedule clear 2mal3:admo/core/second + +# Deletes the scoreboards +scoreboard objectives remove admo.data +scoreboard objectives remove admo.debug_mode + +# Uninstall librarys +function 2mal3:random/uninstall + +# Sends an uninstallation message to all players +tellraw @a [{"text":"Advanced Monsters Datapack v1.3.0 by 2mal3 was successfully uninstalled."}] + +# Disables the datapack +datapack disable "file/Advanced-Monsters-Datapack-v1.3.0" +datapack disable "file/Advanced-Monsters-Datapack-v1.3.0.zip" diff --git a/data/2mal3/functions/admo/core/uninstall/uninstall_ask.mcfunction b/data/2mal3/functions/admo/core/uninstall/uninstall_ask.mcfunction new file mode 100644 index 0000000..f1f5727 --- /dev/null +++ b/data/2mal3/functions/admo/core/uninstall/uninstall_ask.mcfunction @@ -0,0 +1,5 @@ +# Description: Ask the player if he really wants to uninstall the datapack +# Called from tag: 2mal3:admo/uninstall +# Datapack by 2mal3 + +tellraw @s [{"text":"Do you really want to deinstall the Datapack 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 2mal3:admo/core/uninstall/uninstall"},"hoverEvent":{"action":"show_text","value":"*click*"}}] diff --git a/data/2mal3/functions/admo/transform.mcfunction b/data/2mal3/functions/admo/transform.mcfunction new file mode 100644 index 0000000..e53ad84 --- /dev/null +++ b/data/2mal3/functions/admo/transform.mcfunction @@ -0,0 +1,34 @@ +# Description: Transforms a monster +# Called from functions: 2mal3:admo/tray_transforming +# Datapack by 2mal3 + +# Output debug message in chat, if enabled (DEBUG) +tellraw @a[scores={admo.debug_mode=4..}] [{"text":"[","color":"gray"},{"text":"AdvancedMonsters","color":"aqua"},{"text":"/","color":"gray"},{"text":"DEBUG","color":"aqua"},{"text":"]: ","color":"gray"},{"text":"Transformed ","color":"aqua"},{"selector":"@s","color":"aqua"},{"text":"!","color":"aqua"}] + + +# Sets the name of the monster +tag @s add admo.this +setblock ~ ~ ~ oak_sign{Text1:'[{"text":"Advanced: ","color":"red"},{"selector":"@e[tag=admo.this,sort=nearest,limit=1]","color":"white"}]'} +data modify entity @s CustomName set from block ~ ~ ~ Text1 + +setblock ~ ~ ~ minecraft:air +tag @s remove admo.this + + +# Make the monster stronger +attribute @s generic.attack_damage modifier add f50dfa13-c51b-414e-b068-36437a86b406 "admo.attack_damage" 0.7 multiply +attribute @s generic.max_health modifier add 5312c08e-69d3-4798-90b5-d008f9d8b4b3 "admo.max_health" 0.5 multiply + +attribute @s generic.attack_speed modifier add 6219720a-e6fd-421c-b988-5000816e9109 "admo.attack_speed" 0.2 multiply +attribute @s generic.follow_range modifier add addb878b-b2dc-4307-b04e-f6838ecfb44f "admo.follow_range" 0.3 multiply +attribute @s generic.movement_speed modifier add 9e42d73c-9479-47a6-85a6-e3ac6a42b450 "admo.movement_speed" 0.2 multiply + + +# Heal the monster +effect give @s[type=#2mal3:admo/undead] minecraft:instant_damage 1 100 true +effect give @s[type=!#2mal3:admo/undead] minecraft:instant_health 1 100 true + + +# Improves special abilities of the monster +execute if entity @s[type=minecraft:creeper] run data modify entity @s ExplosionRadius set value 6b +execute if entity @s[type=#2mal3:admo/bow] run enchant @s minecraft:power 2 \ No newline at end of file diff --git a/data/2mal3/functions/admo/tray_transforming.mcfunction b/data/2mal3/functions/admo/tray_transforming.mcfunction new file mode 100644 index 0000000..7fd87fe --- /dev/null +++ b/data/2mal3/functions/admo/tray_transforming.mcfunction @@ -0,0 +1,18 @@ +# Description: Transforms with a certain chance the monster +# Called from functions: 2mal3:admo/core/second +# Datapack by 2mal3 + +# Output debug message in chat, if enabled (DEBUG) +tellraw @a[scores={admo.debug_mode=4..}] [{"text":"[","color":"gray"},{"text":"AdvancedMonsters","color":"aqua"},{"text":"/","color":"gray"},{"text":"DEBUG","color":"aqua"},{"text":"]: ","color":"gray"},{"text":"Try to transform ","color":"aqua"},{"selector":"@s","color":"aqua"},{"text":" ...","color":"aqua"}] + + +# Transforms with a certain chance the monster +scoreboard players set $2mal3.random.in_0 2mal3.random 0 +scoreboard players operation $2mal3.random.in_1 2mal3.random = $admo.transform_chance admo.data +function 2mal3:random/random + +execute if score $2mal3.random.out_0 2mal3.random matches 0 run function 2mal3:admo/transform + + +# Notes that this monster was processed +tag @s add admo.processed diff --git a/data/2mal3/functions/random/random.mcfunction b/data/2mal3/functions/random/random.mcfunction new file mode 100644 index 0000000..e8194fe --- /dev/null +++ b/data/2mal3/functions/random/random.mcfunction @@ -0,0 +1,24 @@ +# Description: Generates a random number +# Called by: ... +# Datapack library by 2mal3 + +# prepare +forceload add 0 0 +summon area_effect_cloud 0 0 0 {Tags:["2mal3.random"]} + + +# generate +execute store result score $2mal3.random.temp_0 2mal3.random run data get entity @e[type=minecraft:area_effect_cloud,tag=2mal3.random,limit=1] UUID[0] + +scoreboard players operation $2mal3.random.temp_1 2mal3.random = $2mal3.random.in_1 2mal3.random +scoreboard players operation $2mal3.random.temp_1 2mal3.random -= $2mal3.random.in_0 2mal3.random + +scoreboard players operation $2mal3.random.temp_0 2mal3.random %= $2mal3.random.temp_1 2mal3.random +scoreboard players operation $2mal3.random.temp_0 2mal3.random += $2mal3.random.in_0 2mal3.random + +scoreboard players operation $2mal3.random.out_0 2mal3.random = $2mal3.random.temp_0 2mal3.random + + +# remve +kill @e[type=minecraft:area_effect_cloud,tag=2mal3.random] +forceload remove 0 0 \ No newline at end of file diff --git a/data/2mal3/functions/random/reload.mcfunction b/data/2mal3/functions/random/reload.mcfunction new file mode 100644 index 0000000..e8d9bea --- /dev/null +++ b/data/2mal3/functions/random/reload.mcfunction @@ -0,0 +1,15 @@ +# Description: Init the datapack library +# Called by: ... +# Datapack library by 2mal3 + +# add scoreboards +scoreboard objectives add 2mal3.random dummy + +# set variables +scoreboard players set $2mal3.random.in_0 2mal3.random 0 +scoreboard players set $2mal3.random.in_1 2mal3.random 0 + +scoreboard players set $2mal3.random.temp_0 2mal3.random 0 +scoreboard players set $2mal3.random.temp_1 2mal3.random 0 + +scoreboard players set $2mal3.random.out_0 2mal3.random 0 \ No newline at end of file diff --git a/data/2mal3/functions/random/uninstall.mcfunction b/data/2mal3/functions/random/uninstall.mcfunction new file mode 100644 index 0000000..49ce5f6 --- /dev/null +++ b/data/2mal3/functions/random/uninstall.mcfunction @@ -0,0 +1,6 @@ +# Description: Uninstall the datapack library +# Called by: ... +# Datapack library by 2mal3 + +# remove scoreboards +scoreboard objectives remove 2mal3.random \ No newline at end of file diff --git a/data/amd/tags/entity_types/arrow.json b/data/2mal3/tags/entity_types/admo/bow.json similarity index 54% rename from data/amd/tags/entity_types/arrow.json rename to data/2mal3/tags/entity_types/admo/bow.json index 181a8ba..69a5bab 100644 --- a/data/amd/tags/entity_types/arrow.json +++ b/data/2mal3/tags/entity_types/admo/bow.json @@ -1,8 +1,7 @@ -{ - "replace": false, - "values": [ - "minecraft:skeleton", - "minecraft:stray", - "minecraft:pillager" - ] -} +{ + "replace": false, + "values": [ + "minecraft:skeleton", + "minecraft:stray" + ] +} diff --git a/data/amd/tags/entity_types/monsters/1.16.2.json b/data/2mal3/tags/entity_types/admo/monsters.json similarity index 94% rename from data/amd/tags/entity_types/monsters/1.16.2.json rename to data/2mal3/tags/entity_types/admo/monsters.json index a49bc7f..43cb14b 100644 --- a/data/amd/tags/entity_types/monsters/1.16.2.json +++ b/data/2mal3/tags/entity_types/admo/monsters.json @@ -1,6 +1,8 @@ { "replace": false, "values": [ + "#2mal3:admo/bow", + "minecraft:blaze", "minecraft:cave_spider", "minecraft:creeper", @@ -17,10 +19,8 @@ "minecraft:ravager", "minecraft:shulker", "minecraft:silverfish", - "minecraft:skeleton", "minecraft:slime", "minecraft:spider", - "minecraft:stray", "minecraft:vex", "minecraft:vindicator", "minecraft:wither_skeleton", diff --git a/data/amd/tags/entity_types/undead/1.16.json b/data/2mal3/tags/entity_types/admo/undead.json similarity index 82% rename from data/amd/tags/entity_types/undead/1.16.json rename to data/2mal3/tags/entity_types/admo/undead.json index 962bf87..12919dd 100644 --- a/data/amd/tags/entity_types/undead/1.16.json +++ b/data/2mal3/tags/entity_types/admo/undead.json @@ -1,11 +1,11 @@ { "replace": false, "values": [ + "#2mal3:admo/bow", + "minecraft:drowned", "minecraft:husk", "minecraft:phantom", - "minecraft:skeleton", - "minecraft:stray", "minecraft:wither_skeleton", "minecraft:zombie", "minecraft:zombie_villager", diff --git a/data/2mal3/tags/functions/admo/uninstall.json b/data/2mal3/tags/functions/admo/uninstall.json new file mode 100644 index 0000000..256aed9 --- /dev/null +++ b/data/2mal3/tags/functions/admo/uninstall.json @@ -0,0 +1,5 @@ +{ + "values": [ + "2mal3:admo/core/uninstall/uninstall_ask" + ] +} diff --git a/data/amd/functions/core/reload/first_run.mcfunction b/data/amd/functions/core/reload/first_run.mcfunction deleted file mode 100644 index 77945e4..0000000 --- a/data/amd/functions/core/reload/first_run.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# Description: send the installation message 3 sekonds after reload -# Called by: core/reload/reload -# Datapack by 2mal3 - -tellraw @a[tag=!global.ignore,tag=!global.ignore.gui] ["",{"text":"Advanced Monsters Datapack v","color":"blue"},{"score":{"name":"$V1","objective":"amd.data"},"color":"blue"},{"text":".","color":"blue"},{"score":{"name":"$V2","objective":"amd.data"},"color":"blue"},{"text":".","color":"blue"},{"score":{"name":"$V3","objective":"amd.data"},"color":"blue"},{"text":" by 2mal3 was installed!","color":"blue"}] - -scoreboard players set $amd.first_run amd.data 1 \ No newline at end of file diff --git a/data/amd/functions/core/reload/reload.mcfunction b/data/amd/functions/core/reload/reload.mcfunction deleted file mode 100644 index 0152627..0000000 --- a/data/amd/functions/core/reload/reload.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -# 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 10 - - -# test minecraft version -function version:test - - -# send the reload message 4 sekonds after reload -execute unless score $amd.first_run amd.data matches 1 run schedule function amd:core/reload/first_run 4s - - -# start game loop -execute if score $version version matches 1140..1152 run function amd:f/tick/second/1.14 -execute if score $version version matches 1160..1161 run function amd:core/tick/second/1.16 -execute if score $version version matches 1162.. run function amd:core/tick/second/1.16.2 - -# small optmizations 1.6.9 -# better compatiblity with other datapacks 1.6.10 \ No newline at end of file diff --git a/data/amd/functions/core/tick/second/1.14.mcfunction b/data/amd/functions/core/tick/second/1.14.mcfunction deleted file mode 100644 index 3ec5a23..0000000 --- a/data/amd/functions/core/tick/second/1.14.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Description: Game loop for 1.14+ every second -# Called by: core/reload/reload, core/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:core/tick/second/1.14 1s diff --git a/data/amd/functions/core/tick/second/1.16.2.mcfunction b/data/amd/functions/core/tick/second/1.16.2.mcfunction deleted file mode 100644 index 9abd249..0000000 --- a/data/amd/functions/core/tick/second/1.16.2.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Description: Game loop for 1.16.2 every second -# Called by: core/reload/reload, core/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:core/tick/second/1.16.2 1s diff --git a/data/amd/functions/core/tick/second/1.16.mcfunction b/data/amd/functions/core/tick/second/1.16.mcfunction deleted file mode 100644 index 65bbea3..0000000 --- a/data/amd/functions/core/tick/second/1.16.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Description: Game loop for 1.16 every second -# Called by: core/reload/reload, core/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:core/tick/second/1.16 1s diff --git a/data/amd/functions/core/tick/tick.mcfunction b/data/amd/functions/core/tick/tick.mcfunction deleted file mode 100644 index 4786dc7..0000000 --- a/data/amd/functions/core/tick/tick.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Game loop tick for 1.14+ -# Called by: core/tick/tick/core -# Datapack by 2mal3 - -# better advanced monsters projectiles -execute as @e[scores={amd.random=1}] at @s run function amd:custom diff --git a/data/amd/functions/core/uninstall/uninstall.mcfunction b/data/amd/functions/core/uninstall/uninstall.mcfunction deleted file mode 100644 index e3878c4..0000000 --- a/data/amd/functions/core/uninstall/uninstall.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -# Description: uninstalling -# Called by: core/uninstall/uninstall_ask -# Datapack by 2mal3 - -# 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 - - -# 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:""} - - -# diasable datapack tick -schedule clear amd:core/tick/second/1.14 -schedule clear amd:core/tick/second/1.16 -schedule clear amd:core/tick/second/1.16.2 - - -# disable datapck -datapack disable "file/Advanced-Monsters-Datapack" -datapack disable "file/Advanced-Monsters-Datapack.zip" diff --git a/data/amd/functions/core/uninstall/uninstall_ask.mcfunction b/data/amd/functions/core/uninstall/uninstall_ask.mcfunction deleted file mode 100644 index 1ac295e..0000000 --- a/data/amd/functions/core/uninstall/uninstall_ask.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Description: uninstalling -# Called by: #uninstall -# Datapack by 2mal3 - -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:core/uninstall/uninstall"},"hoverEvent":{"action":"show_text","value":"*click*"}}] diff --git a/data/amd/functions/custom.mcfunction b/data/amd/functions/custom.mcfunction deleted file mode 100644 index 4805d45..0000000 --- a/data/amd/functions/custom.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Additional abilities for transformed monsters -# Called by: core/tick/tick -# Datapack by 2mal3 - -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} diff --git a/data/amd/functions/transform/1.14.mcfunction b/data/amd/functions/transform/1.14.mcfunction deleted file mode 100644 index a788f19..0000000 --- a/data/amd/functions/transform/1.14.mcfunction +++ /dev/null @@ -1,49 +0,0 @@ -# Description: Turns the monsters into advanced for 1.14+ -# Called by: core/tick/second/1.14 -# Datapack by 2mal3 - -# rename monsters -data merge entity @s[tag=!global.ignore.gui] {CustomName:'[{"text":"Advanced","color":"red"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:blaze] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Blaze","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:cave_spider] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Cave Spider","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:creeper] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Creeper","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:drowned] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Drowned","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:elder_guardian] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Elder guardian","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:endermite] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Endermite","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:evoker] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Evoker","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:ghast] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Ghast","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:guardian] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Guardian","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:husk] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Husk","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:illusioner] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Illusioner","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:magma_cube] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Magma cube","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:phantom] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Phantom","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:ravager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Ravager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:shulker] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Shulker","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:silverfish] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Silverfish","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:skeleton] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Skeleton","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:slime] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Slime","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:spider] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Spider","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:stray] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Stray","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:vex] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Vex","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:vindicator] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Vindicator","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:wither_skeleton] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Wither Skeleton","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zombie] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zombie","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zombie_villager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zombie Villager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:pillager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Pillager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:witch] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Witch","color":"white"}]'} - - -# make the monsters stronger -replaceitem entity @s armor.head minecraft:stone_button{AttributeModifiers:[{AttributeName:"generic.maxHealth",Name:"generic.maxHealth",Amount:0.5,Operation:1,UUIDLeast:11091,UUIDMost:277775,Slot:"head"},{AttributeName:"generic.attackDamage",Name:"generic.attackDamage",Amount:0.5,Operation:1,UUIDLeast:931896,UUIDMost:196357,Slot:"head"},{AttributeName:"generic.followRange",Name:"generic.followRange",Amount:0.1,Operation:1,UUIDLeast:728338,UUIDMost:733947,Slot:"head"},{AttributeName:"generic.movementSpeed",Name:"generic.movementSpeed",Amount:0.1,Operation:1,UUIDLeast:198717,UUIDMost:41222,Slot:"head"}]} 1 -data merge entity @s[type=creeper] {ExplosionRadius:7b} - -# Heals the monster to his max health -execute if entity @s[type=!#amd:undead/1.14] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Potion:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_healing"}}} -execute if entity @s[type=!#amd:undead/1.14] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Potion:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_healing"}}} -execute if entity @s[type=#amd:undead/1.14] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Potion:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_harming"}}} -execute if entity @s[type=#amd:undead/1.14] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Potion:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_harming"}}} -effect give @s minecraft:slowness 5 99 true - - -# add tag to ignore -tag @s add amd.transformed diff --git a/data/amd/functions/transform/1.16.2.mcfunction b/data/amd/functions/transform/1.16.2.mcfunction deleted file mode 100644 index d3665a1..0000000 --- a/data/amd/functions/transform/1.16.2.mcfunction +++ /dev/null @@ -1,52 +0,0 @@ -# Description: Turns the monsters into advanced for 1.16.2 -# Called by: core/tick/second/1.16.2 -# Datapack by 2mal3 - -# rename monsters -data merge entity @s[tag=!global.ignore.gui] {CustomName:'[{"text":"Advanced","color":"red"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:blaze] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Blaze","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:cave_spider] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Cave Spider","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:creeper] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Creeper","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:drowned] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Drowned","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:elder_guardian] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Elder guardian","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:endermite] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Endermite","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:evoker] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Evoker","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:ghast] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Ghast","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:guardian] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Guardian","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:husk] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Husk","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:illusioner] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Illusioner","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:magma_cube] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Magma cube","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:phantom] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Phantom","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:ravager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Ravager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:shulker] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Shulker","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:silverfish] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Silverfish","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:skeleton] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Skeleton","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:slime] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Slime","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:spider] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Spider","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:stray] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Stray","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:vex] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Vex","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:vindicator] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Vindicator","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:wither_skeleton] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Wither Skeleton","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zombie] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zombie","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zombie_villager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zombie Villager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:pillager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Pillager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:witch] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Witch","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zoglin] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zoglin","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:hoglin] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Hoglin","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:piglin_brute] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Piglin Brute","color":"white"}]'} - - -# make the monsters stronger -replaceitem entity @s armor.head stone_button{AttributeModifiers:[{AttributeName:"generic.max_health",Name:"generic.max_health",Amount:0.5,Operation:1,UUID:[I;1952402172,-108901445,-1142802844,241040109],Slot:"head"},{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0.5,Operation:1,UUID:[I;-122403957,-1331608788,-1976865319,-1138603839],Slot:"head"},{AttributeName:"generic.follow_range",Name:"generic.follow_range",Amount:0.1,Operation:1,UUID:[I;2052287807,-521057642,-1982890753,1519780821],Slot:"head"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.1,Operation:0,UUID:[I;189066003,-1103805622,-1127492764,-478351356],Slot:"head"}]} 1 -data merge entity @s[type=creeper] {ExplosionRadius:7b} - -# Heals the monster to his max health -execute if entity @s[type=!#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_healing"}}} -execute if entity @s[type=!#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_healing"}}} -execute if entity @s[type=#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_harming"}}} -execute if entity @s[type=#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_harming"}}} -effect give @s minecraft:slowness 5 99 true - - -# add tag to ignore -tag @s add amd.transformed diff --git a/data/amd/functions/transform/1.16.mcfunction b/data/amd/functions/transform/1.16.mcfunction deleted file mode 100644 index f3c0e22..0000000 --- a/data/amd/functions/transform/1.16.mcfunction +++ /dev/null @@ -1,51 +0,0 @@ -# Description: Turns the monsters into advanced for 1.16 -# Called by: core/tick/second/1.16 -# Datapack by 2mal3 - -# rename monsters -data merge entity @s[tag=!global.ignore.gui] {CustomName:'[{"text":"Advanced","color":"red"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:blaze] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Blaze","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:cave_spider] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Cave Spider","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:creeper] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Creeper","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:drowned] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Drowned","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:elder_guardian] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Elder guardian","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:endermite] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Endermite","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:evoker] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Evoker","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:ghast] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Ghast","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:guardian] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Guardian","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:husk] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Husk","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:illusioner] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Illusioner","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:magma_cube] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Magma cube","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:phantom] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Phantom","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:ravager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Ravager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:shulker] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Shulker","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:silverfish] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Silverfish","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:skeleton] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Skeleton","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:slime] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Slime","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:spider] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Spider","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:stray] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Stray","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:vex] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Vex","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:vindicator] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Vindicator","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:wither_skeleton] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Wither Skeleton","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zombie] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zombie","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zombie_villager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zombie Villager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:pillager] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Pillager","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:witch] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Witch","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:zoglin] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Zoglin","color":"white"}]'} -data merge entity @s[tag=!global.ignore.gui,type=minecraft:hoglin] {CustomName:'[{"text":"Advanced: ","color":"red"},{"text":"Hoglin","color":"white"}]'} - - -# make the monsters stronger -replaceitem entity @s armor.head stone_button{AttributeModifiers:[{AttributeName:"generic.max_health",Name:"generic.max_health",Amount:0.5,Operation:1,UUID:[I;1952402172,-108901445,-1142802844,241040109],Slot:"head"},{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0.5,Operation:1,UUID:[I;-122403957,-1331608788,-1976865319,-1138603839],Slot:"head"},{AttributeName:"generic.follow_range",Name:"generic.follow_range",Amount:0.1,Operation:1,UUID:[I;2052287807,-521057642,-1982890753,1519780821],Slot:"head"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.1,Operation:0,UUID:[I;189066003,-1103805622,-1127492764,-478351356],Slot:"head"}]} 1 -data merge entity @s[type=creeper] {ExplosionRadius:7b} - -# Heals the monster to his max health -execute if entity @s[type=!#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_healing"}}} -execute if entity @s[type=!#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_healing"}}} -execute if entity @s[type=#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_harming"}}} -execute if entity @s[type=#amd:undead/1.16] run summon minecraft:potion ~ ~ ~ {Motion:[0.0,0.5,0.0],Item:{id:"minecraft:splash_potion",Count:1b,tag:{Potion:"minecraft:strong_harming"}}} -effect give @s minecraft:slowness 5 99 true - - -# add tag to ignore -tag @s add amd.transformed diff --git a/data/amd/loot_tables/random.json b/data/amd/loot_tables/random.json deleted file mode 100644 index 09b6aac..0000000 --- a/data/amd/loot_tables/random.json +++ /dev/null @@ -1 +0,0 @@ -{"pools":[{"rolls":{"min":1,"max":10},"entries":[{"type":"item","name":"minecraft:stone","weight":1,"functions":[{"function":"set_count","count":0}]}]}]} diff --git a/data/amd/tags/entity_types/monsters/1.14.json b/data/amd/tags/entity_types/monsters/1.14.json deleted file mode 100644 index 70ac6fd..0000000 --- a/data/amd/tags/entity_types/monsters/1.14.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:blaze", - "minecraft:cave_spider", - "minecraft:creeper", - "minecraft:drowned", - "minecraft:elder_guardian", - "minecraft:endermite", - "minecraft:evoker", - "minecraft:ghast", - "minecraft:guardian", - "minecraft:husk", - "minecraft:illusioner", - "minecraft:magma_cube", - "minecraft:phantom", - "minecraft:ravager", - "minecraft:shulker", - "minecraft:silverfish", - "minecraft:skeleton", - "minecraft:slime", - "minecraft:spider", - "minecraft:stray", - "minecraft:vex", - "minecraft:vindicator", - "minecraft:wither_skeleton", - "minecraft:zombie", - "minecraft:zombie_villager", - "minecraft:pillager", - "minecraft:witch" - ] -} diff --git a/data/amd/tags/entity_types/monsters/1.16.json b/data/amd/tags/entity_types/monsters/1.16.json deleted file mode 100644 index bfb8b8f..0000000 --- a/data/amd/tags/entity_types/monsters/1.16.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:blaze", - "minecraft:cave_spider", - "minecraft:creeper", - "minecraft:drowned", - "minecraft:elder_guardian", - "minecraft:endermite", - "minecraft:evoker", - "minecraft:ghast", - "minecraft:guardian", - "minecraft:husk", - "minecraft:illusioner", - "minecraft:magma_cube", - "minecraft:phantom", - "minecraft:ravager", - "minecraft:shulker", - "minecraft:silverfish", - "minecraft:skeleton", - "minecraft:slime", - "minecraft:spider", - "minecraft:stray", - "minecraft:vex", - "minecraft:vindicator", - "minecraft:wither_skeleton", - "minecraft:zombie", - "minecraft:zombie_villager", - "minecraft:pillager", - "minecraft:witch", - "minecraft:zoglin", - "minecraft:hoglin" - ] -} diff --git a/data/amd/tags/entity_types/undead/1.14.json b/data/amd/tags/entity_types/undead/1.14.json deleted file mode 100644 index d72d3e4..0000000 --- a/data/amd/tags/entity_types/undead/1.14.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:drowned", - "minecraft:husk", - "minecraft:phantom", - "minecraft:skeleton", - "minecraft:stray", - "minecraft:wither_skeleton", - "minecraft:zombie", - "minecraft:zombie_villager" - ] -} diff --git a/data/amd/tags/functions/uninstall.json b/data/amd/tags/functions/uninstall.json deleted file mode 100644 index 48e5a4d..0000000 --- a/data/amd/tags/functions/uninstall.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "amd:core/uninstall/uninstall_ask" - ] -} diff --git a/data/global/advancements/2mal3.json b/data/global/advancements/2mal3.json index 942c8e8..a53f3e7 100644 --- a/data/global/advancements/2mal3.json +++ b/data/global/advancements/2mal3.json @@ -15,4 +15,4 @@ "trigger": "minecraft:tick" } } -} \ No newline at end of file +} diff --git a/data/global/advancements/root.json b/data/global/advancements/root.json index 8dd153c..baacd04 100644 --- a/data/global/advancements/root.json +++ b/data/global/advancements/root.json @@ -14,4 +14,4 @@ "trigger": "minecraft:tick" } } -} \ No newline at end of file +} diff --git a/data/load/functions/__init.mcfunction b/data/load/functions/__init.mcfunction new file mode 100644 index 0000000..09d5744 --- /dev/null +++ b/data/load/functions/__init.mcfunction @@ -0,0 +1,13 @@ +# If you are a user of this library, do not modify this function, or you risk +# causing compatibility issues with other data packs. If you have a good reason +# to *add* something, feel free to make an issue on the GitHub for this project: +# https://github.com/LanternMC/Load + +# Add the common objective to be used for version resolution. +scoreboard objectives add load dummy + +# Reset all scores on this objective to allow for version resolution on reload. +scoreboard players reset * load + +# Call a nonexistent function to allow for this data pack to be extended later. +function load:__init2 diff --git a/data/load/tags/functions/__init.json b/data/load/tags/functions/__init.json new file mode 100644 index 0000000..540c627 --- /dev/null +++ b/data/load/tags/functions/__init.json @@ -0,0 +1,8 @@ +{ + "values": [ + "load:__init", + "#load:standard", + "#load:load", + "#load:post_load" + ] +} diff --git a/data/load/tags/functions/load.json b/data/load/tags/functions/load.json new file mode 100644 index 0000000..921d1e0 --- /dev/null +++ b/data/load/tags/functions/load.json @@ -0,0 +1,5 @@ +{ + "values": [ + "2mal3:admo/core/reload" + ] +} diff --git a/data/load/tags/functions/post_load.json b/data/load/tags/functions/post_load.json new file mode 100644 index 0000000..8252388 --- /dev/null +++ b/data/load/tags/functions/post_load.json @@ -0,0 +1,3 @@ +{ + "values": [] +} diff --git a/data/load/tags/functions/standard.json b/data/load/tags/functions/standard.json new file mode 100644 index 0000000..5654ce1 --- /dev/null +++ b/data/load/tags/functions/standard.json @@ -0,0 +1,5 @@ +{ + "values": [ + "2mal3:random/reload" + ] +} diff --git a/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json index 0bca35a..500882c 100644 --- a/data/minecraft/tags/functions/load.json +++ b/data/minecraft/tags/functions/load.json @@ -1,5 +1,5 @@ { - "values": [ - "amd:core/reload/reload" - ] + "values": [ + "#load:__init" + ] } diff --git a/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json deleted file mode 100644 index 524b19e..0000000 --- a/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "amd:core/tick/tick" - ] -} diff --git a/data/version/functions/test.mcfunction b/data/version/functions/test.mcfunction deleted file mode 100644 index 6461d86..0000000 --- a/data/version/functions/test.mcfunction +++ /dev/null @@ -1,33 +0,0 @@ -# Description: Testing version -# Called by: ... -# Datapack library by 2mal3 - -# add scoreboad -scoreboard objectives add version dummy -scoreboard players set $version version 0 - - -# test versions -# 1.13 -function version:versions/1.13/0 -function version:versions/1.13/1 -function version:versions/1.13/2 - -# 1.14 -function version:versions/1.14/0 -function version:versions/1.14/1 -function version:versions/1.14/2 -function version:versions/1.14/3 -function version:versions/1.14/4 - -# 1.15 -function version:versions/1.15/0 -function version:versions/1.15/1 -function version:versions/1.15/2 - -# 1.16 -function version:versions/1.16/0 -function version:versions/1.16/1 -function version:versions/1.16/2 - -# The version is stored under version in scoreboard version_library in X.XX.X format. diff --git a/data/version/functions/uninstall.mcfunction b/data/version/functions/uninstall.mcfunction deleted file mode 100644 index 04a21c1..0000000 --- a/data/version/functions/uninstall.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Description: Uninstall the library -# Called by: ... -# Datapack library by 2mal3 - -scoreboard objectives remove version \ No newline at end of file diff --git a/data/version/functions/versions/1.13/0.mcfunction b/data/version/functions/versions/1.13/0.mcfunction deleted file mode 100644 index 7863eae..0000000 --- a/data/version/functions/versions/1.13/0.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.13 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:cave_air -scoreboard players set $version version 1130 diff --git a/data/version/functions/versions/1.13/1.mcfunction b/data/version/functions/versions/1.13/1.mcfunction deleted file mode 100644 index 73e3a99..0000000 --- a/data/version/functions/versions/1.13/1.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.13 -# Called by: version_library:main -# Datapack library by 2mal3 - -forceload query -scoreboard players set $version version 1131 diff --git a/data/version/functions/versions/1.13/2.mcfunction b/data/version/functions/versions/1.13/2.mcfunction deleted file mode 100644 index caf2290..0000000 --- a/data/version/functions/versions/1.13/2.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.13 -# Called by: version_library:main -# Datapack library by 2mal3 - -forceload query -scoreboard players set $version version 1132 diff --git a/data/version/functions/versions/1.14/0.mcfunction b/data/version/functions/versions/1.14/0.mcfunction deleted file mode 100644 index 8a26b37..0000000 --- a/data/version/functions/versions/1.14/0.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.14 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:smithing_table -scoreboard players set $version version 1140 diff --git a/data/version/functions/versions/1.14/1.mcfunction b/data/version/functions/versions/1.14/1.mcfunction deleted file mode 100644 index abf4f35..0000000 --- a/data/version/functions/versions/1.14/1.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.14 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:smithing_table -scoreboard players set $version version 1141 diff --git a/data/version/functions/versions/1.14/2.mcfunction b/data/version/functions/versions/1.14/2.mcfunction deleted file mode 100644 index f9bf6c1..0000000 --- a/data/version/functions/versions/1.14/2.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.14 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:smithing_table -scoreboard players set $version version 1142 diff --git a/data/version/functions/versions/1.14/3.mcfunction b/data/version/functions/versions/1.14/3.mcfunction deleted file mode 100644 index 2119284..0000000 --- a/data/version/functions/versions/1.14/3.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.14 -# Called by: version_library:main -# Datapack library by 2mal3 - -gamerule disableRaids -scoreboard players set $version version 1143 diff --git a/data/version/functions/versions/1.14/4.mcfunction b/data/version/functions/versions/1.14/4.mcfunction deleted file mode 100644 index 4283c0d..0000000 --- a/data/version/functions/versions/1.14/4.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.14 -# Called by: version_library:main -# Datapack library by 2mal3 - -gamerule disableRaids -scoreboard players set $version version 1144 diff --git a/data/version/functions/versions/1.15/0.mcfunction b/data/version/functions/versions/1.15/0.mcfunction deleted file mode 100644 index 6ec1a81..0000000 --- a/data/version/functions/versions/1.15/0.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.15 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:honey_block -scoreboard players set $version version 1150 diff --git a/data/version/functions/versions/1.15/1.mcfunction b/data/version/functions/versions/1.15/1.mcfunction deleted file mode 100644 index a5ee2d6..0000000 --- a/data/version/functions/versions/1.15/1.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.15 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:honey_block -scoreboard players set $version version 1151 diff --git a/data/version/functions/versions/1.15/2.mcfunction b/data/version/functions/versions/1.15/2.mcfunction deleted file mode 100644 index 36ab250..0000000 --- a/data/version/functions/versions/1.15/2.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.15 -# Called by: version_library:main -# Datapack library by 2mal3 - -gamerule doTraderSpawning -scoreboard players set $version version 1152 diff --git a/data/version/functions/versions/1.16/0.mcfunction b/data/version/functions/versions/1.16/0.mcfunction deleted file mode 100644 index 3be590f..0000000 --- a/data/version/functions/versions/1.16/0.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.16 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:crying_obsidian -scoreboard players set $version version 1160 diff --git a/data/version/functions/versions/1.16/1.mcfunction b/data/version/functions/versions/1.16/1.mcfunction deleted file mode 100644 index c64d81c..0000000 --- a/data/version/functions/versions/1.16/1.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.16 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if block ~ ~ ~ minecraft:crying_obsidian -scoreboard players set $version version 1161 diff --git a/data/version/functions/versions/1.16/2.mcfunction b/data/version/functions/versions/1.16/2.mcfunction deleted file mode 100644 index d370d31..0000000 --- a/data/version/functions/versions/1.16/2.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Description: Testing version 1.16 -# Called by: version_library:main -# Datapack library by 2mal3 - -execute if entity @e[type=minecraft:piglin_brute] -scoreboard players set $version version 1162 diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d2522a2c260f26e4786eb760393d28d30ed22c7e GIT binary patch literal 860 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAifV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lhh0G|+7kRnFLiP^jb!CVF^tdcU38Dq0@$ zrXi{lnnIeUN}85RI@T(>)+#E7G6r@U+SV#uTwL;oqB43SY8FzmnnGd<{6J$58M{mZ zQgS6he!>6o0fsjcGI2naoCO|{#S9F5he4R}c>anM1_q`?PZ!6K2=}))E>2oxAi#Rz zZm7GH(1AwD3m5JQ{gaCXQRej4GAj-*TzHvT(GUr}}OfBvvhnK0F@8-R|6o0b8MmE=Rl3NN=@HA!x}{nz_jd$`nw>G? zx14$KEWiI=D>gUI3fathiKX>|jDhXKh1!iuieb&i z**jwEs+F(s{uGdAcD;6#_o_fuz4!`d6CSgG$xS;9v^;uR%64;`^tlFHW_bAc`J-i> z0yFl>PfXm@IP1wJ2FHcvZ7qqm$>yRCdQ4n_Hcp2Z_?bVN%=_}Olj;wKEUB^`@|-7^ z=~QLvu5nk;S@}M-{QY-V{k1JU4kd1txA*8brlhtXW|d+{jJ#K0!*IxMd*iH<&CCm$ zOQICEvGFWWj<=CsF|+;2&vu3tiGhZGm#-?O9M<9Fm~!=y8|RkmrGlFjr>iWy+BKm> zM*r@WcZ{42<`O)6Hzb3hQn2X#u-}krW%_sSj4IUfy^5$Er314Cr z+H^U866eNMBEby0PdRm;15v#5FLiFeJicY||JQEJHh*gGkabr^RF2nbZXL5?WNO)j TZGMHo6v*J|>gTe~DWM4fhF)Ju literal 0 HcmV?d00001 diff --git a/pack.mcmeta b/pack.mcmeta index 664b5f0..2ce46be 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 6, - "description": "The Advanced Monsters Datapack v1.6.10 by 2mal3!" + "description": "The Advanced Monsters Datapack v1.3.0 by 2mal3!" } }