diff --git a/src/anti_enderman_grief/data/anti_enderman_grief/advancement/anti_enderman_grief.json b/src/anti_enderman_grief/data/anti_enderman_grief/advancement/anti_enderman_grief.json index eaff9c3..bfa2146 100644 --- a/src/anti_enderman_grief/data/anti_enderman_grief/advancement/anti_enderman_grief.json +++ b/src/anti_enderman_grief/data/anti_enderman_grief/advancement/anti_enderman_grief.json @@ -1,22 +1,22 @@ { - "display": { - "icon": { - "id": "minecraft:ender_pearl" - }, - "title": "Anti Enderman Grief", - "description": "Prevents endermen from picking up blocks.", - "show_toast": false, - "announce_to_chat": false - }, - "criteria": { - "tick": { - "trigger": "minecraft:tick" - } - }, - "requirements": [ - [ - "tick" - ] - ], - "parent": "minecraft:root" -} + "display": { + "icon": { + "id": "minecraft:ender_pearl" + }, + "title": "Anti Enderman Grief", + "description": "Prevents endermen from picking up blocks.", + "show_toast": false, + "announce_to_chat": false + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + }, + "requirements": [ + [ + "tick" + ] + ], + "parent": "minecraft:root" +} \ No newline at end of file diff --git a/src/anti_enderman_grief/pack.mcmeta b/src/anti_enderman_grief/pack.mcmeta index fcfd9c0..da9e82e 100644 --- a/src/anti_enderman_grief/pack.mcmeta +++ b/src/anti_enderman_grief/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Anti Enderman Grief","color":"gold"}] } } \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/check_for_items_in_filled_cauldrons.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/check_for_items_in_filled_cauldrons.mcfunction deleted file mode 100644 index c5c49b9..0000000 --- a/src/cauldron_concrete/data/cauldron_concrete/function/check_for_items_in_filled_cauldrons.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -schedule function cauldron_concrete:check_for_items_in_filled_cauldrons 1t -execute as @e[type=minecraft:item] at @s if block ~ ~ ~ #minecraft:cauldrons unless block ~ ~ ~ minecraft:cauldron run function cauldron_concrete:check_item \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/check_item.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/check_item.mcfunction deleted file mode 100644 index 97fc839..0000000 --- a/src/cauldron_concrete/data/cauldron_concrete/function/check_item.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -tag @s add cauCon.subject -data modify entity a093751a-2c77-4658-9d5f-62ab4494bdaf HandItems[0] set from entity @s Item -execute as a093751a-2c77-4658-9d5f-62ab4494bdaf if predicate cauldron_concrete:concrete_powder as @e[type=minecraft:item,tag=cauCon.subject] run function cauldron_concrete:harden -tag @s remove cauCon.subject \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/harden.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/harden.mcfunction deleted file mode 100644 index f7f57fb..0000000 --- a/src/cauldron_concrete/data/cauldron_concrete/function/harden.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -data modify entity @s[nbt={Item:{id:"minecraft:white_concrete_powder"}}] Item.id set value "minecraft:white_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:orange_concrete_powder"}}] Item.id set value "minecraft:orange_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:magenta_concrete_powder"}}] Item.id set value "minecraft:magenta_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:light_blue_concrete_powder"}}] Item.id set value "minecraft:light_blue_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:yellow_concrete_powder"}}] Item.id set value "minecraft:yellow_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:lime_concrete_powder"}}] Item.id set value "minecraft:lime_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:pink_concrete_powder"}}] Item.id set value "minecraft:pink_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:gray_concrete_powder"}}] Item.id set value "minecraft:gray_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:light_gray_concrete_powder"}}] Item.id set value "minecraft:light_gray_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:cyan_concrete_powder"}}] Item.id set value "minecraft:cyan_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:purple_concrete_powder"}}] Item.id set value "minecraft:purple_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:blue_concrete_powder"}}] Item.id set value "minecraft:blue_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:brown_concrete_powder"}}] Item.id set value "minecraft:brown_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:green_concrete_powder"}}] Item.id set value "minecraft:green_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:red_concrete_powder"}}] Item.id set value "minecraft:red_concrete" -data modify entity @s[nbt={Item:{id:"minecraft:black_concrete_powder"}}] Item.id set value "minecraft:black_concrete" \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/load.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/load.mcfunction deleted file mode 100644 index 3ccd5b7..0000000 --- a/src/cauldron_concrete/data/cauldron_concrete/function/load.mcfunction +++ /dev/null @@ -1 +0,0 @@ -execute unless entity a093751a-2c77-4658-9d5f-62ab4494bdaf positioned 16562064 1000 -22242912 run function cauldron_concrete:summon_marker \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/schedule_1s.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/schedule_1s.mcfunction new file mode 100644 index 0000000..d575223 --- /dev/null +++ b/src/cauldron_concrete/data/cauldron_concrete/function/schedule_1s.mcfunction @@ -0,0 +1,2 @@ +schedule function cauldron_concrete:schedule_1s 1s +execute as @e[type=minecraft:item] at @s if items entity @s contents #cauldron_concrete:convertible if block ~ ~ ~ minecraft:water_cauldron run item modify entity @s contents cauldron_concrete:convert \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/summon_marker.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/summon_marker.mcfunction deleted file mode 100644 index aa8efdf..0000000 --- a/src/cauldron_concrete/data/cauldron_concrete/function/summon_marker.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -forceload add ~ ~ -summon minecraft:armor_stand ~ ~ ~ {Marker:1b,NoGravity:1b,Invulnerable:1b,Invisible:1b,UUID:[I;-1600948966,746014296,-1654693205,1150598575]} \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/function/uninstall.mcfunction b/src/cauldron_concrete/data/cauldron_concrete/function/uninstall.mcfunction index c1989f2..f1f4f7f 100644 --- a/src/cauldron_concrete/data/cauldron_concrete/function/uninstall.mcfunction +++ b/src/cauldron_concrete/data/cauldron_concrete/function/uninstall.mcfunction @@ -1,3 +1 @@ -schedule clear cauldron_concrete:check_for_items_in_filled_cauldrons -kill a093751a-2c77-4658-9d5f-62ab4494bdaf -forceload remove 16562064 -22242912 \ No newline at end of file +schedule clear cauldron_concrete:schedule_1s \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/item_modifier/convert.json b/src/cauldron_concrete/data/cauldron_concrete/item_modifier/convert.json new file mode 100644 index 0000000..f7fd688 --- /dev/null +++ b/src/cauldron_concrete/data/cauldron_concrete/item_modifier/convert.json @@ -0,0 +1,162 @@ +[ + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:white_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:white_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:orange_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:orange_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:magenta_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:magenta_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:light_blue_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:light_blue_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:yellow_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:yellow_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:lime_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:lime_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:pink_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:pink_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:gray_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:gray_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:light_gray_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:light_gray_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:cyan_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:cyan_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:purple_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:purple_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:blue_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:blue_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:brown_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:brown_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:green_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:green_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:red_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:red_concrete" + } + }, + { + "function": "minecraft:filtered", + "item_filter": { + "items": "minecraft:black_concrete_powder" + }, + "modifier": { + "function": "minecraft:set_item", + "item": "minecraft:black_concrete" + } + } +] \ No newline at end of file diff --git a/src/cauldron_concrete/data/cauldron_concrete/predicate/concrete_powder.json b/src/cauldron_concrete/data/cauldron_concrete/predicate/concrete_powder.json deleted file mode 100644 index 4742ed3..0000000 --- a/src/cauldron_concrete/data/cauldron_concrete/predicate/concrete_powder.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "tag": "cauldron_concrete:concrete_powder" - } - } - } -} diff --git a/src/cauldron_concrete/data/cauldron_concrete/tags/item/concrete_powder.json b/src/cauldron_concrete/data/cauldron_concrete/tags/item/convertible.json similarity index 100% rename from src/cauldron_concrete/data/cauldron_concrete/tags/item/concrete_powder.json rename to src/cauldron_concrete/data/cauldron_concrete/tags/item/convertible.json diff --git a/src/cauldron_concrete/data/minecraft/tags/function/load.json b/src/cauldron_concrete/data/minecraft/tags/function/load.json index e02bc3c..eb3eefa 100644 --- a/src/cauldron_concrete/data/minecraft/tags/function/load.json +++ b/src/cauldron_concrete/data/minecraft/tags/function/load.json @@ -1 +1 @@ -{"replace":false,"values":["cauldron_concrete:load","cauldron_concrete:check_for_items_in_filled_cauldrons"]} \ No newline at end of file +{"values":["cauldron_concrete:schedule_1s"]} \ No newline at end of file diff --git a/src/cauldron_concrete/pack.mcmeta b/src/cauldron_concrete/pack.mcmeta index 6b5c29a..a6e017a 100644 --- a/src/cauldron_concrete/pack.mcmeta +++ b/src/cauldron_concrete/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 15, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Cauldron Concrete","color":"gold"}] } } \ No newline at end of file diff --git a/src/cauldron_mud/data/cauldron_mud/advancement/cauldron_mud.json b/src/cauldron_mud/data/cauldron_mud/advancement/cauldron_mud.json new file mode 100644 index 0000000..4522a30 --- /dev/null +++ b/src/cauldron_mud/data/cauldron_mud/advancement/cauldron_mud.json @@ -0,0 +1,23 @@ +{ + "display": { + "icon": { + "id": "minecraft:mud" + }, + "title": "Cauldron Mud", + "description": "Drop dirt into a cauldron with water to make mud.", + "show_toast": false, + "announce_to_chat": false + }, + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + }, + "requirements": [ + [ + "tick" + ] + ], + "parent": "minecraft:root" + } + \ No newline at end of file diff --git a/src/cauldron_mud/data/cauldron_mud/function/schedule_1s.mcfunction b/src/cauldron_mud/data/cauldron_mud/function/schedule_1s.mcfunction new file mode 100644 index 0000000..462b951 --- /dev/null +++ b/src/cauldron_mud/data/cauldron_mud/function/schedule_1s.mcfunction @@ -0,0 +1,2 @@ +schedule function cauldron_mud:schedule_1s 1s +execute as @e[type=minecraft:item] at @s if items entity @s contents #cauldron_mud:convertible if block ~ ~ ~ minecraft:water_cauldron run item modify entity @s contents cauldron_mud:convert \ No newline at end of file diff --git a/src/cauldron_mud/data/cauldron_mud/function/uninstall.mcfunction b/src/cauldron_mud/data/cauldron_mud/function/uninstall.mcfunction new file mode 100644 index 0000000..4c530ba --- /dev/null +++ b/src/cauldron_mud/data/cauldron_mud/function/uninstall.mcfunction @@ -0,0 +1 @@ +schedule clear cauldron_mud:schedule_1s \ No newline at end of file diff --git a/src/cauldron_mud/data/cauldron_mud/item_modifier/convert.json b/src/cauldron_mud/data/cauldron_mud/item_modifier/convert.json new file mode 100644 index 0000000..08de8fe --- /dev/null +++ b/src/cauldron_mud/data/cauldron_mud/item_modifier/convert.json @@ -0,0 +1,4 @@ +{ + "function": "minecraft:set_item", + "item": "minecraft:mud" +} \ No newline at end of file diff --git a/src/cauldron_mud/data/cauldron_mud/tags/item/convertible.json b/src/cauldron_mud/data/cauldron_mud/tags/item/convertible.json new file mode 100644 index 0000000..8de8e5b --- /dev/null +++ b/src/cauldron_mud/data/cauldron_mud/tags/item/convertible.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:coarse_dirt", + "minecraft:dirt", + "minecraft:rooted_dirt" + ] +} diff --git a/src/cauldron_mud/data/minecraft/tags/function/load.json b/src/cauldron_mud/data/minecraft/tags/function/load.json new file mode 100644 index 0000000..0c06609 --- /dev/null +++ b/src/cauldron_mud/data/minecraft/tags/function/load.json @@ -0,0 +1 @@ +{"values":["cauldron_mud:schedule_1s"]} \ No newline at end of file diff --git a/src/cauldron_mud/pack.mcmeta b/src/cauldron_mud/pack.mcmeta new file mode 100644 index 0000000..4d65074 --- /dev/null +++ b/src/cauldron_mud/pack.mcmeta @@ -0,0 +1,9 @@ +{ + "pack": { + "pack_format": 48, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, + "description": [{"text":"Cauldron Mud","color":"gold"}] + } +} \ No newline at end of file diff --git a/src/cauldron_mud/pack.png b/src/cauldron_mud/pack.png new file mode 100644 index 0000000..70e8e07 Binary files /dev/null and b/src/cauldron_mud/pack.png differ diff --git a/src/craftable_saddles/data/craftable_saddles/advancement/craftable_saddles.json b/src/craftable_saddles/data/craftable_saddles/advancement/craftable_saddles.json deleted file mode 100644 index f060a9f..0000000 --- a/src/craftable_saddles/data/craftable_saddles/advancement/craftable_saddles.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "display": { - "icon": { - "id": "minecraft:saddle" - }, - "title": "Craftable Saddles", - "description": "Craft saddles using leather, string, and iron.", - "show_toast": false, - "announce_to_chat": false - }, - "criteria": { - "tick": { - "trigger": "minecraft:tick" - } - }, - "requirements": [ - [ - "tick" - ] - ], - "parent": "minecraft:root" -} diff --git a/src/craftable_saddles/data/minecraft/advancement/saddle.json b/src/craftable_saddles/data/minecraft/advancement/saddle.json deleted file mode 100644 index 15f5ee5..0000000 --- a/src/craftable_saddles/data/minecraft/advancement/saddle.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_leather": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:leather" - } - ] - } - }, - "has_string": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:string" - } - ] - } - }, - "has_iron_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:iron_ingot" - } - ] - } - } - }, - "requirements": [ - [ - "has_leather", - "has_string", - "has_iron_ingot" - ] - ], - "rewards": { - "recipes": [ - "minecraft:saddle" - ] - } -} \ No newline at end of file diff --git a/src/craftable_saddles/data/minecraft/recipe/saddle.json b/src/craftable_saddles/data/minecraft/recipe/saddle.json deleted file mode 100644 index 1a3ec0b..0000000 --- a/src/craftable_saddles/data/minecraft/recipe/saddle.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "LLL", - "LSL", - "I I" - ], - "key": { - "L": "minecraft:leather", - "S": "minecraft:string", - "I": "minecraft:iron_ingot" - }, - "result": { - "id": "minecraft:saddle" - } -} \ No newline at end of file diff --git a/src/craftable_saddles/pack.mcmeta b/src/craftable_saddles/pack.mcmeta deleted file mode 100644 index 3a75158..0000000 --- a/src/craftable_saddles/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, - "description": [{"text":"Craftable Saddles","color":"gold"}] - } -} diff --git a/src/craftable_saddles/pack.png b/src/craftable_saddles/pack.png deleted file mode 100644 index fa4729a..0000000 Binary files a/src/craftable_saddles/pack.png and /dev/null differ diff --git a/src/double_shulker_shells/pack.mcmeta b/src/double_shulker_shells/pack.mcmeta index 0a2eeae..e107768 100644 --- a/src/double_shulker_shells/pack.mcmeta +++ b/src/double_shulker_shells/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Double Shulker Shells","color":"gold"}] } } diff --git a/src/leather_bundles/data/leather_bundles/advancement/leather_bundle.json b/src/leather_bundles/data/leather_bundles/advancement/leather_bundle.json deleted file mode 100644 index 425dbe9..0000000 --- a/src/leather_bundles/data/leather_bundles/advancement/leather_bundle.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_leather": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:leather" - } - ] - } - }, - "has_string": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:string" - } - ] - } - } - }, - "requirements": [ - [ - "has_leather", - "has_string" - ] - ], - "rewards": { - "recipes": [ - "minecraft:leather_bundle" - ] - } -} \ No newline at end of file diff --git a/src/leather_bundles/data/leather_bundles/advancement/leather_bundle_recipe.json b/src/leather_bundles/data/leather_bundles/advancement/leather_bundle_recipe.json deleted file mode 100644 index c83f54f..0000000 --- a/src/leather_bundles/data/leather_bundles/advancement/leather_bundle_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "display": { - "icon": { - "id": "minecraft:bundle" - }, - "title": "Leather Bundle", - "description": "Alternate recipe for bundles using leather instead of rabbit hide.", - "show_toast": false, - "announce_to_chat": false - }, - "parent": "minecraft:root", - "criteria": { - "tick": { - "trigger": "minecraft:tick" - } - }, - "requirements": [ - [ - "tick" - ] - ] -} diff --git a/src/leather_bundles/data/leather_bundles/recipe/leather_bundle.json b/src/leather_bundles/data/leather_bundles/recipe/leather_bundle.json deleted file mode 100644 index b0e9879..0000000 --- a/src/leather_bundles/data/leather_bundles/recipe/leather_bundle.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - " S ", - " L ", - " " - ], - "key": { - "L": "minecraft:leather", - "S": "minecraft:string" - }, - "result": { - "id": "minecraft:bundle", - "count": 1 - } -} \ No newline at end of file diff --git a/src/leather_bundles/pack.mcmeta b/src/leather_bundles/pack.mcmeta deleted file mode 100644 index 5c20fdd..0000000 --- a/src/leather_bundles/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, - "description": [{"text":"Leather Bundles","color":"gold"}] - } -} diff --git a/src/leather_bundles/pack.png b/src/leather_bundles/pack.png deleted file mode 100644 index a4f0149..0000000 Binary files a/src/leather_bundles/pack.png and /dev/null differ diff --git a/src/nether_coordinate_scale_1to1/pack.mcmeta b/src/nether_coordinate_scale_1to1/pack.mcmeta index 91a15c6..ae6f9d1 100644 --- a/src/nether_coordinate_scale_1to1/pack.mcmeta +++ b/src/nether_coordinate_scale_1to1/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Nether Coordinate Scale 1:1","color":"gold"}] } } diff --git a/src/no_vault_limit/pack.mcmeta b/src/no_vault_limit/pack.mcmeta index 1feac2d..be6a0b4 100644 --- a/src/no_vault_limit/pack.mcmeta +++ b/src/no_vault_limit/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 27, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"No Vault Limit","color":"gold"}] } } \ No newline at end of file diff --git a/src/player_death_counter/data/player_death_counter/advancement/player_death_counter.json b/src/player_death_counter/data/player_death_counter/advancement/player_death_counter.json index d54be77..3f9ddf4 100644 --- a/src/player_death_counter/data/player_death_counter/advancement/player_death_counter.json +++ b/src/player_death_counter/data/player_death_counter/advancement/player_death_counter.json @@ -1,22 +1,22 @@ { - "display": { - "icon": { - "id": "minecraft:bone" + "display": { + "icon": { + "id": "minecraft:bone" + }, + "title": "Player Death Counter", + "description": "Counts player deaths.", + "show_toast": false, + "announce_to_chat": false }, - "title": "Player Death Counter", - "description": "Counts player deaths.", - "show_toast": false, - "announce_to_chat": false - }, - "parent": "minecraft:root", - "criteria": { - "tick": { - "trigger": "minecraft:tick" - } - }, - "requirements": [ - [ - "tick" + "parent": "minecraft:root", + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + }, + "requirements": [ + [ + "tick" + ] ] - ] -} +} \ No newline at end of file diff --git a/src/player_death_counter/pack.mcmeta b/src/player_death_counter/pack.mcmeta index 7bc00ea..5d6891a 100644 --- a/src/player_death_counter/pack.mcmeta +++ b/src/player_death_counter/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Player Death Counter","color":"gold"}] } } diff --git a/src/server/data/minecraft/advancement/root.json b/src/server/data/minecraft/advancement/root.json index 379794f..42768c6 100644 --- a/src/server/data/minecraft/advancement/root.json +++ b/src/server/data/minecraft/advancement/root.json @@ -1,23 +1,23 @@ { - "display": { - "icon": { - "id": "minecraft:nether_star" + "display": { + "icon": { + "id": "minecraft:nether_star" + }, + "title": "Server Datapacks", + "description": "Active server datapacks.", + "background": "minecraft:textures/block/black_concrete.png", + "frame": "challenge", + "show_toast": false, + "announce_to_chat": false }, - "title": "Server Datapacks", - "description": "Active server datapacks.", - "background": "minecraft:textures/block/black_concrete.png", - "frame": "challenge", - "show_toast": false, - "announce_to_chat": false - }, - "criteria": { - "tick": { - "trigger": "minecraft:tick" - } - }, - "requirements": [ - [ - "tick" + "criteria": { + "tick": { + "trigger": "minecraft:tick" + } + }, + "requirements": [ + [ + "tick" + ] ] - ] -} +} \ No newline at end of file diff --git a/src/server/pack.mcmeta b/src/server/pack.mcmeta index 8262294..9fdebd6 100644 --- a/src/server/pack.mcmeta +++ b/src/server/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Server Root","color":"gold"}] } } \ No newline at end of file diff --git a/src/universal_dyeing/pack.mcmeta b/src/universal_dyeing/pack.mcmeta index 3e77aac..f036d23 100644 --- a/src/universal_dyeing/pack.mcmeta +++ b/src/universal_dyeing/pack.mcmeta @@ -1,7 +1,9 @@ { "pack":{ "pack_format": 48, - "supported_formats": {"min_inclusive": 15, "max_inclusive": 48}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Universal Dyeing","color":"gold"}] } } \ No newline at end of file diff --git a/src/wool_dyeing/pack.mcmeta b/src/wool_dyeing/pack.mcmeta index 1b4e8d6..cde4eaa 100644 --- a/src/wool_dyeing/pack.mcmeta +++ b/src/wool_dyeing/pack.mcmeta @@ -1,7 +1,9 @@ { "pack":{ "pack_format": 48, - "supported_formats": {"min_inclusive": 48, "max_inclusive": 61}, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 88}, + "min_format": 48, + "max_format": 88, "description": [{"text":"Wool Dyeing","color":"gold"}] } } \ No newline at end of file