diff --git a/Dockerfile-mc b/Dockerfile-mc index 141840d2..bc043241 100644 --- a/Dockerfile-mc +++ b/Dockerfile-mc @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 FROM debian:stable-slim AS build -ARG bedrock_bone_meal_version=1.2.1+1.20 +ARG bedrock_bone_meal_version=1.2.1+1.20.5 RUN apt-get update \ && apt-get install zip wget ca-certificates -y --no-install-recommends \ @@ -25,11 +25,11 @@ FROM itzg/minecraft-server:2024.10.2 ENV MODRINTH_PROJECTS=fabric-api,cloth-config,lithium,ferrite-core,starlight,fastback,chunky,no-chat-reports,disableinsecurechattoast,inventory-sorting,jamlib,architectury-api,rightclickharvest,jade,rei,memoryleakfix,mc-server-description -ENV DATAPACKS=/datapacks/ocw-stuff.zip,/datapacks/who-did-this.zip,/datapacks/bedrock-bone-meal.zip,/datapacks/custom-compostables.zip +ENV DATAPACKS=/datapacks/who-did-this.zip,/datapacks/bedrock-bone-meal.zip RUN mkdir -p /datapacks COPY --from=build /datapacks/*.zip /datapacks -ENV VANILLATWEAKS_FILE=/vt/craftingtweaks.json,/vt/datapacks.json +ENV VANILLATWEAKS_FILE=/vt/craftingtweaks.json RUN mkdir -p /vt COPY rhc/vt/*.json /vt diff --git a/datapacks/custom-compostables/data/custcompost/advancements/composter/use_compostable_on_interaction.json b/datapacks/custom-compostables/data/custcompost/advancements/composter/use_compostable_on_interaction.json index b33b4eea..f0cab291 100644 --- a/datapacks/custom-compostables/data/custcompost/advancements/composter/use_compostable_on_interaction.json +++ b/datapacks/custom-compostables/data/custcompost/advancements/composter/use_compostable_on_interaction.json @@ -4,7 +4,7 @@ "trigger": "minecraft:player_interacted_with_entity", "conditions": { "item": { - "tag": "custcompost:compostables", + "items": "#custcompost:compostables", "count": { "min": 1 } diff --git a/datapacks/custom-compostables/data/custcompost/advancements/holding_compostable.json b/datapacks/custom-compostables/data/custcompost/advancements/holding_compostable.json index 65235a62..32dc1dff 100644 --- a/datapacks/custom-compostables/data/custcompost/advancements/holding_compostable.json +++ b/datapacks/custom-compostables/data/custcompost/advancements/holding_compostable.json @@ -10,7 +10,7 @@ "predicate": { "equipment": { "mainhand": { - "tag": "custcompost:compostables" + "items": "#custcompost:compostables" } } } diff --git a/datapacks/custom-compostables/data/custcompost/advancements/not_holding_compostable.json b/datapacks/custom-compostables/data/custcompost/advancements/not_holding_compostable.json index f03a8040..9d971e47 100644 --- a/datapacks/custom-compostables/data/custcompost/advancements/not_holding_compostable.json +++ b/datapacks/custom-compostables/data/custcompost/advancements/not_holding_compostable.json @@ -12,7 +12,7 @@ "predicate": { "equipment": { "mainhand": { - "tag": "custcompost:compostables" + "items": "#custcompost:compostables" } } } diff --git a/datapacks/custom-compostables/data/custcompost/functions/composter/hopper/hopper_tick_check.mcfunction b/datapacks/custom-compostables/data/custcompost/functions/composter/hopper/hopper_tick_check.mcfunction index 4435a041..544a3a3a 100644 --- a/datapacks/custom-compostables/data/custcompost/functions/composter/hopper/hopper_tick_check.mcfunction +++ b/datapacks/custom-compostables/data/custcompost/functions/composter/hopper/hopper_tick_check.mcfunction @@ -11,17 +11,17 @@ scoreboard players set @s hopperslot2other 0 scoreboard players set @s hopperslot3other 0 scoreboard players set @s hopperslot4other 0 -execute store result score @s hopperslot0 run data get block ~ ~1 ~ Items[{Slot:0b,id:"minecraft:poisonous_potato"}].Count -execute store result score @s hopperslot1 run data get block ~ ~1 ~ Items[{Slot:1b,id:"minecraft:poisonous_potato"}].Count -execute store result score @s hopperslot2 run data get block ~ ~1 ~ Items[{Slot:2b,id:"minecraft:poisonous_potato"}].Count -execute store result score @s hopperslot3 run data get block ~ ~1 ~ Items[{Slot:3b,id:"minecraft:poisonous_potato"}].Count -execute store result score @s hopperslot4 run data get block ~ ~1 ~ Items[{Slot:4b,id:"minecraft:poisonous_potato"}].Count +execute store result score @s hopperslot0 run data get block ~ ~1 ~ Items[{Slot:0b,id:"minecraft:poisonous_potato"}].count +execute store result score @s hopperslot1 run data get block ~ ~1 ~ Items[{Slot:1b,id:"minecraft:poisonous_potato"}].count +execute store result score @s hopperslot2 run data get block ~ ~1 ~ Items[{Slot:2b,id:"minecraft:poisonous_potato"}].count +execute store result score @s hopperslot3 run data get block ~ ~1 ~ Items[{Slot:3b,id:"minecraft:poisonous_potato"}].count +execute store result score @s hopperslot4 run data get block ~ ~1 ~ Items[{Slot:4b,id:"minecraft:poisonous_potato"}].count -execute store result score @s hopperslot0other run data get block ~ ~1 ~ Items[{Slot:0b}].Count -execute store result score @s hopperslot1other run data get block ~ ~1 ~ Items[{Slot:1b}].Count -execute store result score @s hopperslot2other run data get block ~ ~1 ~ Items[{Slot:2b}].Count -execute store result score @s hopperslot3other run data get block ~ ~1 ~ Items[{Slot:3b}].Count -execute store result score @s hopperslot4other run data get block ~ ~1 ~ Items[{Slot:4b}].Count +execute store result score @s hopperslot0other run data get block ~ ~1 ~ Items[{Slot:0b}].count +execute store result score @s hopperslot1other run data get block ~ ~1 ~ Items[{Slot:1b}].count +execute store result score @s hopperslot2other run data get block ~ ~1 ~ Items[{Slot:2b}].count +execute store result score @s hopperslot3other run data get block ~ ~1 ~ Items[{Slot:3b}].count +execute store result score @s hopperslot4other run data get block ~ ~1 ~ Items[{Slot:4b}].count scoreboard players operation @s hopperslot0other -= @s hopperslot0 scoreboard players operation @s hopperslot1other -= @s hopperslot1 diff --git a/datapacks/custom-compostables/data/custcompost/predicates/composter/holding_compostable_65.json b/datapacks/custom-compostables/data/custcompost/predicates/composter/holding_compostable_65.json index 84c81efe..19ba0a7a 100644 --- a/datapacks/custom-compostables/data/custcompost/predicates/composter/holding_compostable_65.json +++ b/datapacks/custom-compostables/data/custcompost/predicates/composter/holding_compostable_65.json @@ -4,7 +4,7 @@ "predicate": { "equipment": { "mainhand": { - "tag": "custcompost:compostables_65", + "items": "#custcompost:compostables_65", "count": { "min": 1 } diff --git a/datapacks/custom-compostables/data/custcompost/predicates/composter/hopper/can_run_composter.json b/datapacks/custom-compostables/data/custcompost/predicates/composter/hopper/can_run_composter.json index 72f7187f..0f408058 100644 --- a/datapacks/custom-compostables/data/custcompost/predicates/composter/hopper/can_run_composter.json +++ b/datapacks/custom-compostables/data/custcompost/predicates/composter/hopper/can_run_composter.json @@ -1,19 +1,99 @@ [ { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:composter" - ], - "state": { - "level": { - "min": 0, - "max": 6 + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "0" + } + } + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "1" + } + } + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "2" + } + } + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "3" + } + } + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "4" + } + } + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "5" + } + } + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "blocks": [ + "minecraft:composter" + ], + "state": { + "level": "6" + } } } } - } + ] }, { "condition": "minecraft:location_check", @@ -25,8 +105,7 @@ ], "nbt": "{TransferCooldown:0}", "state": { - "facing": "down", - "enabled": true + "facing": "down" } } } diff --git a/datapacks/custom-compostables/pack.mcmeta b/datapacks/custom-compostables/pack.mcmeta index 61bb8ec3..b45ce39c 100644 --- a/datapacks/custom-compostables/pack.mcmeta +++ b/datapacks/custom-compostables/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 26, + "pack_format": 41, "description": "Custom Compostables v0.1.0 by Nincodedo" } } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_pyramid.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_pyramid.json index faf1e2df..2d678e91 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_pyramid.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_pyramid.json @@ -39,7 +39,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_well.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_well.json index 0878ccc8..346382cb 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_well.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/archaeology/desert_well.json @@ -7,13 +7,13 @@ "entries": [ { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:arms_up_pottery_sherd" + "name": "minecraft:arms_up_pottery_sherd", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:brewer_pottery_sherd" + "name": "minecraft:brewer_pottery_sherd", + "weight": 2 }, { "type": "minecraft:item", @@ -88,7 +88,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/blocks/bookshelf.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/blocks/bookshelf.json index fc10957e..e85f3f22 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/blocks/bookshelf.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/blocks/bookshelf.json @@ -15,7 +15,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:library_hidden_wing" + "structures": "nincodedo:library_hidden_wing" } } ] @@ -27,14 +27,11 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } + "components": { + "minecraft:enchantments": { + "minecraft:silk_touch": 1 } - ] + } } } ] diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/abandoned_mineshaft.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/abandoned_mineshaft.json index 48901c52..345e71fb 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/abandoned_mineshaft.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/abandoned_mineshaft.json @@ -7,8 +7,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 20, - "name": "minecraft:golden_apple" + "name": "minecraft:golden_apple", + "weight": 20 }, { "type": "minecraft:item", @@ -16,13 +16,13 @@ }, { "type": "minecraft:item", - "weight": 30, - "name": "minecraft:name_tag" + "name": "minecraft:name_tag", + "weight": 30 }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:book", + "weight": 10, "functions": [ { "function": "minecraft:enchant_randomly" @@ -31,8 +31,8 @@ }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:iron_pickaxe" + "name": "minecraft:iron_pickaxe", + "weight": 5 }, { "type": "minecraft:empty", @@ -50,8 +50,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 10, "name": "minecraft:iron_ingot", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -66,8 +66,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:gold_ingot", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -82,8 +82,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:redstone", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -98,8 +98,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:lapis_lazuli", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -114,8 +114,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:diamond", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -130,8 +130,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:coal", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -146,8 +146,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:bread", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -162,8 +162,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:glow_berries", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -178,8 +178,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:melon_seeds", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -194,8 +194,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:pumpkin_seeds", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -210,8 +210,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:beetroot_seeds", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -232,8 +232,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 20, "name": "minecraft:rail", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -248,8 +248,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:powered_rail", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -264,8 +264,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:detector_rail", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -280,8 +280,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:activator_rail", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -296,8 +296,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:torch", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -320,11 +320,11 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" }, { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_books" + "value": "nincodedo:ocw_books" } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ancient_city.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ancient_city.json index ba34cc5b..332ed52b 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ancient_city.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ancient_city.json @@ -30,8 +30,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:compass", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -42,8 +42,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:sculk_catalyst", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -58,13 +58,13 @@ }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:name_tag" + "name": "minecraft:name_tag", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:diamond_hoe", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -93,8 +93,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:lead", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -105,8 +105,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:diamond_horse_armor", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -117,8 +117,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:saddle", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -129,18 +129,18 @@ }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:music_disc_13" + "name": "minecraft:music_disc_13", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:music_disc_cat" + "name": "minecraft:music_disc_cat", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:diamond_leggings", + "weight": 2, "functions": [ { "function": "minecraft:enchant_with_levels", @@ -155,8 +155,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:book", + "weight": 3, "functions": [ { "function": "minecraft:enchant_randomly", @@ -168,8 +168,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:sculk", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -184,8 +184,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:sculk_sensor", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -200,8 +200,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:candle", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -216,8 +216,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:amethyst_shard", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -232,8 +232,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:experience_bottle", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -248,8 +248,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:glow_berries", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -264,8 +264,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:iron_leggings", + "weight": 3, "functions": [ { "function": "minecraft:enchant_with_levels", @@ -280,8 +280,8 @@ }, { "type": "minecraft:item", - "weight": 4, "name": "minecraft:echo_shard", + "weight": 4, "functions": [ { "function": "minecraft:set_count", @@ -296,8 +296,8 @@ }, { "type": "minecraft:item", - "weight": 4, "name": "minecraft:disc_fragment_5", + "weight": 4, "functions": [ { "function": "minecraft:set_count", @@ -312,8 +312,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:potion", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -332,8 +332,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:book", + "weight": 5, "functions": [ { "function": "minecraft:enchant_randomly" @@ -342,8 +342,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:book", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -358,8 +358,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:bone", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -374,8 +374,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:soul_torch", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -390,8 +390,8 @@ }, { "type": "minecraft:item", - "weight": 7, "name": "minecraft:coal", + "weight": 7, "functions": [ { "function": "minecraft:set_count", @@ -416,8 +416,8 @@ }, { "type": "minecraft:item", - "weight": 4, - "name": "minecraft:ward_armor_trim_smithing_template" + "name": "minecraft:ward_armor_trim_smithing_template", + "weight": 4 }, { "type": "minecraft:item", @@ -433,7 +433,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/ascend" + "value": "nincodedo:uniqueitems/ascend" } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/desert_pyramid.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/desert_pyramid.json index 6cfb771d..2c138b80 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/desert_pyramid.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/desert_pyramid.json @@ -261,11 +261,11 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" }, { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_books" + "value": "nincodedo:ocw_books" } ] }, diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/pillager_outpost.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/pillager_outpost.json index 59ccd095..39792c02 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/pillager_outpost.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/pillager_outpost.json @@ -25,8 +25,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 7, "name": "minecraft:wheat", + "weight": 7, "functions": [ { "function": "minecraft:set_count", @@ -41,8 +41,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:potato", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -57,8 +57,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:carrot", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -108,13 +108,13 @@ "entries": [ { "type": "minecraft:item", - "weight": 7, - "name": "minecraft:experience_bottle" + "name": "minecraft:experience_bottle", + "weight": 7 }, { "type": "minecraft:item", - "weight": 4, "name": "minecraft:string", + "weight": 4, "functions": [ { "function": "minecraft:set_count", @@ -129,8 +129,8 @@ }, { "type": "minecraft:item", - "weight": 4, "name": "minecraft:arrow", + "weight": 4, "functions": [ { "function": "minecraft:set_count", @@ -145,8 +145,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:tripwire_hook", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -161,8 +161,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:iron_ingot", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -187,14 +187,19 @@ ] }, { - "rolls": 1, + "rolls": { + "type": "minecraft:uniform", + "min": 0, + "max": 1 + }, + "bonus_rolls": 0, "entries": [ { "type": "minecraft:alternatives", "children": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/potionhorn", + "value": "nincodedo:uniqueitems/potionhorn", "conditions": [ { "condition": "minecraft:value_check", @@ -218,12 +223,6 @@ "function": "minecraft:set_instrument", "options": "#minecraft:regular_goat_horns" } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } ] } ] diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ruined_portal.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ruined_portal.json index d35a0ac7..ff87f428 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ruined_portal.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/ruined_portal.json @@ -9,7 +9,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_books" + "value": "nincodedo:ocw_books" } ] }, @@ -23,8 +23,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 40, "name": "minecraft:obsidian", + "weight": 40, "functions": [ { "function": "minecraft:set_count", @@ -39,8 +39,8 @@ }, { "type": "minecraft:item", - "weight": 40, "name": "minecraft:flint", + "weight": 40, "functions": [ { "function": "minecraft:set_count", @@ -55,8 +55,8 @@ }, { "type": "minecraft:item", - "weight": 40, "name": "minecraft:iron_nugget", + "weight": 40, "functions": [ { "function": "minecraft:set_count", @@ -71,23 +71,23 @@ }, { "type": "minecraft:item", - "weight": 40, - "name": "minecraft:flint_and_steel" + "name": "minecraft:flint_and_steel", + "weight": 40 }, { "type": "minecraft:item", - "weight": 40, - "name": "minecraft:fire_charge" + "name": "minecraft:fire_charge", + "weight": 40 }, { "type": "minecraft:item", - "weight": 15, - "name": "minecraft:golden_apple" + "name": "minecraft:golden_apple", + "weight": 15 }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:gold_nugget", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -102,8 +102,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_sword", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -112,8 +112,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_axe", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -122,8 +122,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_hoe", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -132,8 +132,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_shovel", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -142,8 +142,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_pickaxe", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -152,8 +152,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_boots", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -162,8 +162,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_chestplate", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -172,8 +172,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_helmet", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -182,8 +182,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:golden_leggings", + "weight": 15, "functions": [ { "function": "minecraft:enchant_randomly" @@ -192,8 +192,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:glistering_melon_slice", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -208,18 +208,18 @@ }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:golden_horse_armor" + "name": "minecraft:golden_horse_armor", + "weight": 5 }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:light_weighted_pressure_plate" + "name": "minecraft:light_weighted_pressure_plate", + "weight": 5 }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:golden_carrot", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -234,13 +234,13 @@ }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:clock" + "name": "minecraft:clock", + "weight": 5 }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:gold_ingot", + "weight": 5, "functions": [ { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/shipwreck_map.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/shipwreck_map.json index fee963cc..0124769a 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/shipwreck_map.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/shipwreck_map.json @@ -33,7 +33,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" } ] }, diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/simple_dungeon.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/simple_dungeon.json index e86ca760..2caf3a7c 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/simple_dungeon.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/simple_dungeon.json @@ -11,58 +11,58 @@ "entries": [ { "type": "minecraft:item", - "weight": 20, - "name": "minecraft:saddle" + "name": "minecraft:saddle", + "weight": 20 }, { "type": "minecraft:item", - "weight": 15, - "name": "minecraft:golden_apple" + "name": "minecraft:golden_apple", + "weight": 15 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:enchanted_golden_apple" + "name": "minecraft:enchanted_golden_apple", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:music_disc_otherside" + "name": "minecraft:music_disc_otherside", + "weight": 2 }, { "type": "minecraft:item", - "weight": 15, - "name": "minecraft:music_disc_13" + "name": "minecraft:music_disc_13", + "weight": 15 }, { "type": "minecraft:item", - "weight": 15, - "name": "minecraft:music_disc_cat" + "name": "minecraft:music_disc_cat", + "weight": 15 }, { "type": "minecraft:item", - "weight": 20, - "name": "minecraft:name_tag" + "name": "minecraft:name_tag", + "weight": 20 }, { "type": "minecraft:item", - "weight": 10, - "name": "minecraft:golden_horse_armor" + "name": "minecraft:golden_horse_armor", + "weight": 10 }, { "type": "minecraft:item", - "weight": 15, - "name": "minecraft:iron_horse_armor" + "name": "minecraft:iron_horse_armor", + "weight": 15 }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:diamond_horse_armor" + "name": "minecraft:diamond_horse_armor", + "weight": 5 }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:book", + "weight": 10, "functions": [ { "function": "minecraft:enchant_randomly" @@ -81,8 +81,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 10, "name": "minecraft:iron_ingot", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -97,8 +97,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:gold_ingot", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -113,13 +113,13 @@ }, { "type": "minecraft:item", - "weight": 20, - "name": "minecraft:bread" + "name": "minecraft:bread", + "weight": 20 }, { "type": "minecraft:item", - "weight": 20, "name": "minecraft:wheat", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -134,13 +134,13 @@ }, { "type": "minecraft:item", - "weight": 10, - "name": "minecraft:bucket" + "name": "minecraft:bucket", + "weight": 10 }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:redstone", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -155,8 +155,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:coal", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -171,8 +171,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:melon_seeds", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -187,8 +187,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:pumpkin_seeds", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -203,8 +203,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:beetroot_seeds", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -225,8 +225,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 10, "name": "minecraft:bone", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -241,8 +241,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:gunpowder", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -257,8 +257,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:rotten_flesh", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -273,8 +273,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:string", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -297,11 +297,11 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" }, { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_books" + "value": "nincodedo:ocw_books" } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/stronghold_library.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/stronghold_library.json index 71a5e654..64a8f0d8 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/stronghold_library.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/stronghold_library.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 20, "name": "minecraft:book", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 20, "name": "minecraft:paper", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -51,8 +51,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:book", + "weight": 10, "functions": [ { "function": "minecraft:enchant_with_levels", @@ -71,11 +71,11 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" }, { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_books" + "value": "nincodedo:ocw_books" } ] }, diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_big.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_big.json index d7bd55f6..564daf2c 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_big.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_big.json @@ -120,8 +120,8 @@ }, { "type": "minecraft:loot_table", - "weight": 5, - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map", + "weight": 5 } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_small.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_small.json index 46272ef0..17b2d0ac 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_small.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/underwater_ruin_small.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 10, "name": "minecraft:coal", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -27,13 +27,13 @@ }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:stone_axe" + "name": "minecraft:stone_axe", + "weight": 2 }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:rotten_flesh" + "name": "minecraft:rotten_flesh", + "weight": 5 }, { "type": "minecraft:item", @@ -41,8 +41,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:wheat", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -71,8 +71,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:fishing_rod", + "weight": 5, "functions": [ { "function": "minecraft:enchant_randomly" @@ -81,17 +81,18 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:map", + "weight": 5, "functions": [ { "function": "minecraft:exploration_map", - "decoration": "red_x", + "decoration": "minecraft:red_x", "zoom": 1, "skip_existing_chunks": false }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "filled_map.buried_treasure" } @@ -100,8 +101,8 @@ }, { "type": "minecraft:loot_table", - "weight": 2, - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map", + "weight": 2 } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/village/village_cartographer.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/village/village_cartographer.json index abce24cd..6afb8c09 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/village/village_cartographer.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/village/village_cartographer.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 10, "name": "minecraft:map", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:paper", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -43,13 +43,13 @@ }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:compass" + "name": "minecraft:compass", + "weight": 5 }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:bread", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -64,8 +64,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:stick", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -88,7 +88,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw_map" + "value": "nincodedo:ocw_map" } ] } diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/gameplay/fishing.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/gameplay/fishing.json index 089213ff..627f3354 100644 --- a/datapacks/ocw-stuff/data/minecraft/loot_tables/gameplay/fishing.json +++ b/datapacks/ocw-stuff/data/minecraft/loot_tables/gameplay/fishing.json @@ -7,22 +7,22 @@ "entries": [ { "type": "minecraft:loot_table", + "value": "minecraft:gameplay/fishing/junk", "weight": 10, - "quality": -2, - "name": "minecraft:gameplay/fishing/junk" + "quality": -2 }, { "type": "minecraft:loot_table", + "value": "minecraft:gameplay/fishing/treasure", "weight": 5, "quality": 2, - "name": "minecraft:gameplay/fishing/treasure", "conditions": [ { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { "type_specific": { - "type": "fishing_hook", + "type": "minecraft:fishing_hook", "in_open_water": true } } @@ -31,20 +31,21 @@ }, { "type": "minecraft:loot_table", + "value": "minecraft:gameplay/fishing/fish", "weight": 85, - "quality": -1, - "name": "minecraft:gameplay/fishing/fish" + "quality": -1 } ] }, { "rolls": 1, + "bonus_rolls": 0, "entries": [ { "type": "minecraft:loot_table", + "value": "minecraft:gameplay/fishing/junk", "weight": 10, "quality": -3, - "name": "minecraft:gameplay/fishing/junk", "conditions": [ { "condition": "minecraft:random_chance", @@ -54,16 +55,16 @@ }, { "type": "minecraft:loot_table", + "value": "minecraft:gameplay/fishing/treasure", "weight": 5, - "quality": 4, - "name": "minecraft:gameplay/fishing/treasure", + "quality": 2, "conditions": [ { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { "type_specific": { - "type": "fishing_hook", + "type": "minecraft:fishing_hook", "in_open_water": true } } @@ -72,9 +73,9 @@ }, { "type": "minecraft:loot_table", + "value": "minecraft:gameplay/fishing/fish", "weight": 85, - "quality": -2, - "name": "minecraft:gameplay/fishing/fish", + "quality": -1, "conditions": [ { "condition": "minecraft:random_chance", @@ -87,7 +88,12 @@ { "condition": "minecraft:match_tool", "predicate": { - "nbt": "{NinUnique:\"NR\",NinPowered:1}" + "components": { + "minecraft:custom_data": { + "nincodedo:unique_item":"NR", + "nincodedo:powered":1 + } + } } } ] diff --git a/datapacks/ocw-stuff/data/minecraft/recipes/chest.json b/datapacks/ocw-stuff/data/minecraft/recipes/chest.json index 387845bc..4822dc25 100644 --- a/datapacks/ocw-stuff/data/minecraft/recipes/chest.json +++ b/datapacks/ocw-stuff/data/minecraft/recipes/chest.json @@ -12,6 +12,6 @@ } }, "result": { - "item": "minecraft:chest" + "id": "minecraft:chest" } } diff --git a/datapacks/ocw-stuff/data/minecraft/recipes/ladder.json b/datapacks/ocw-stuff/data/minecraft/recipes/ladder.json index ace604ac..1ef558ec 100644 --- a/datapacks/ocw-stuff/data/minecraft/recipes/ladder.json +++ b/datapacks/ocw-stuff/data/minecraft/recipes/ladder.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "minecraft:ladder", + "id": "minecraft:ladder", "count": 3 } } diff --git a/datapacks/ocw-stuff/data/minecraft/tags/banner_pattern/no_item_required.json b/datapacks/ocw-stuff/data/minecraft/tags/banner_pattern/no_item_required.json new file mode 100644 index 00000000..c3eec376 --- /dev/null +++ b/datapacks/ocw-stuff/data/minecraft/tags/banner_pattern/no_item_required.json @@ -0,0 +1,5 @@ +{ + "values": [ + "nincodedo:bidoof" + ] +} diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/adventure/spyglass_at_salesman.json b/datapacks/ocw-stuff/data/nincodedo/advancements/adventure/spyglass_at_salesman.json index f5751142..5c5c38a5 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/adventure/spyglass_at_salesman.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/adventure/spyglass_at_salesman.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:spyglass" + "id": "minecraft:spyglass" }, "title": "Is It Someone Who Wants To Sell Me Something?", "description": [ diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/cats.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/cats.json index 2391120a..a56b50fd 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/cats.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/cats.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:cod" + "id": "minecraft:cod" }, "title": "Cats Cats Cats Cats", "description": "Cat + Cat = Cat", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/deforestation.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/deforestation.json index ff2fab1c..d772d574 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/deforestation.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/deforestation.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:oak_log" + "id": "minecraft:oak_log" }, "title": [ { diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/first_day_shield.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/first_day_shield.json index 749cf062..0ab4ecf3 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/first_day_shield.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/first_day_shield.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:cookie" + "id": "minecraft:cookie" }, "title": "Smart Cookie", "description": "Craft a shield", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/good_omen.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/good_omen.json index 64ab709f..3a57dfe7 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/good_omen.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/good_omen.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:chest" + "id": "minecraft:chest" }, "title": "This is a Good Omen", "description": "Whatever it is, its good", @@ -16,7 +16,7 @@ "conditions": { "player": { "location": { - "structure": "minecraft:buried_treasure" + "structures": "minecraft:buried_treasure" } } } @@ -26,7 +26,7 @@ "conditions": { "player": { "location": { - "structure": "minecraft:mineshaft" + "structures": "#minecraft:mineshaft" } } } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/nice.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/nice.json index 447b7a41..b6bcd781 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/nice.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/nice.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:bell" + "id": "minecraft:bell" }, "title": "Nice", "description": "Ring a bell 69 times", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/root.json index 1d8fb64c..07033d4c 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:totem_of_undying" + "id": "minecraft:totem_of_undying" }, "title": "You Did This!", "description": "Stuff you're actually supposed to do", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/all.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/all.json index 9903c411..31b609cb 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/all.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/all.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:golden_boots" + "id": "minecraft:golden_boots" }, "title": "ALL the structures!", "description": "Find all the ancient OCW structures", @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:cave_base_roof" + "structures": "nincodedo:cave_base_roof" } } ] @@ -32,7 +32,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:library_hidden_wing" + "structures": "nincodedo:library_hidden_wing" } } ] @@ -45,7 +45,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:metal_link_house" + "structures": "nincodedo:metal_link_house" } } ] @@ -58,7 +58,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:mountacemore" + "structures": "nincodedo:mountacemore" } } ] @@ -71,7 +71,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:small_library" + "structures": "nincodedo:small_library" } } ] @@ -84,7 +84,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:the_happened_tavern" + "structures": "nincodedo:the_happened_tavern" } } ] @@ -97,7 +97,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:sheep_farm" + "structures": "nincodedo:sheep_farm" } } ] @@ -110,7 +110,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:undeadcottage" + "structures": "nincodedo:undeadcottage" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/any.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/any.json index c5047644..10432ec5 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/any.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/any.json @@ -1,8 +1,23 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;-1328213324,298470611,-1737189839,-240128687],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTdhNWU1MjE4M2U0MWIyOGRlNDFkOTAzODg4M2QzOTlkYzU4N2Q0ZWIyMzBlNjk2ZDhmNmJlNmQzZTU3Y2YifX19\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [ + -1328213324, + 298470611, + -1737189839, + -240128687 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTdhNWU1MjE4M2U0MWIyOGRlNDFkOTAzODg4M2QzOTlkYzU4N2Q0ZWIyMzBlNjk2ZDhmNmJlNmQzZTU3Y2YifX19" + } + ] + } + } }, "title": "Is that an old decrepit shack? Neat!", "description": "Find any OCW structure", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/cave_base.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/cave_base.json index 5e64511c..ceafe86d 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/cave_base.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/cave_base.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "minecraft:zombie_head" + "id": "minecraft:zombie_head" }, "title": "The Cave Base", "description": "Undead and Nin's base from OCW Minecraft 1.2's alt survivor world (2012)", "frame": "task", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:cave_base_roof" + "structures": "nincodedo:cave_base_roof" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/library.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/library.json index e71137e1..28651a52 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/library.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/library.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "minecraft:bookshelf" + "id": "minecraft:bookshelf" }, "title": "Forbidden Wing of The Library", "description": "Originally built by Zedar from OCW Minecraft 1.3, the library town. (2012) Expanded upon by Nin (2023)", "frame": "challenge", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:library_hidden_wing" + "structures": "nincodedo:library_hidden_wing" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/metal_link_house.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/metal_link_house.json index ecf0993a..58dd3759 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/metal_link_house.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/metal_link_house.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "minecraft:spruce_sapling" + "id": "minecraft:spruce_sapling" }, "title": "Metal_Link's House", "description": "From OCW Minecraft 1.9 Beta, the Refugee Camp (2011)", "frame": "task", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:metal_link_house" + "structures": "nincodedo:metal_link_house" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/mountacemore.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/mountacemore.json index 271cb6b4..8a22ba42 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/mountacemore.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/mountacemore.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:totem_of_undying" + "id": "minecraft:totem_of_undying" }, "title": [ { @@ -16,7 +16,7 @@ "frame": "challenge", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -27,7 +27,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:mountacemore" + "structures": "nincodedo:mountacemore" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/sheep_farm.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/sheep_farm.json index 8c763d79..61a39635 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/sheep_farm.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/sheep_farm.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "minecraft:shears" + "id": "minecraft:shears" }, "title": "50,000 sheep used to live here, now it's a ghost town", - "description": "The sheep farm from last season's Hardcore series during the successful attempt (2021)", + "description": "The sheep farm from season 1 of the Hardcore series during the successful attempt (2021)", "frame": "task", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:sheep_farm" + "structures": "nincodedo:sheep_farm" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/small_library.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/small_library.json index 918a2228..2dc6c84c 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/small_library.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/small_library.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "minecraft:bookshelf" + "id": "minecraft:bookshelf" }, "title": "Smol Library", "description": "From OCW Minecraft 1.9 Beta, the Refugee Camp, but I honestly do not know who built it (2011)", "frame": "task", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:small_library" + "structures": "nincodedo:small_library" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/the_happened_tavern.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/the_happened_tavern.json index dcc700b3..f73dfd94 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/the_happened_tavern.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/the_happened_tavern.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:cactus" + "id": "minecraft:cactus" }, "title": "Location of The Happened", "description": "The tavern from OCW Minecraft 1.3, the library town. (2012)", @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:the_happened_tavern" + "structures": "nincodedo:the_happened_tavern" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/undeadcottage.json b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/undeadcottage.json index 4f297303..2c815cf4 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/undeadcottage.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/goodgoals/structures/undeadcottage.json @@ -1,14 +1,14 @@ { "display": { "icon": { - "item": "minecraft:campfire" + "id": "minecraft:campfire" }, "title": "A cozy cottage that's never ever burned down", "description": "Undead's Cottage from OCW Minecraft 1.2 Alpha (2010)", "frame": "task", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "parent": "nincodedo:goodgoals/structures/any", "criteria": { @@ -19,7 +19,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:undeadcottage" + "structures": "nincodedo:undeadcottage" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/items/get_out_of_boat.json b/datapacks/ocw-stuff/data/nincodedo/advancements/items/get_out_of_boat.json index d9c4e12f..705e040a 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/items/get_out_of_boat.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/items/get_out_of_boat.json @@ -41,7 +41,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Inventory:[{id:\"minecraft:compass\",tag:{NinUnique:\"BoatCompass\"}}]}" + "nbt": "{Inventory:[{id:\"minecraft:compass\",components:{\"minecraft:custom_data\":{NinUnique:\"BoatCompass\"}}}]}" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/all_gifts.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/all_gifts.json index a8318ebb..910c943f 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/all_gifts.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/all_gifts.json @@ -1,8 +1,23 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;1833366945,-1473035956,-1173514174,-883347090],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjU2MTJkYzdiODZkNzFhZmMxMTk3MzAxYzE1ZmQ5NzllOWYzOWU3YjFmNDFkOGYxZWJkZjgxMTU1NzZlMmUifX19\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [ + 1833366945, + -1473035956, + -1173514174, + -883347090 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjU2MTJkYzdiODZkNzFhZmMxMTk3MzAxYzE1ZmQ5NzllOWYzOWU3YjFmNDFkOGYxZWJkZjgxMTU1NzZlMmUifX19" + } + ] + } + } }, "title": "Wau So Generous!", "description": "You did ALL the gifts!", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/cactus.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/cactus.json index 02f6fcdc..873a501e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/cactus.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/cactus.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:cactus" + "id": "minecraft:cactus" }, "title": "Metal_Link Appreciates This", "description": "Gotta find that desert", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/green_dye.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/green_dye.json index 3d131ab6..e2c25ef4 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/green_dye.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/green_dye.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:green_dye" + "id": "minecraft:green_dye" }, "title": "Wow, The Extra Mile", "description": "Good job on smelting stuff", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/right_bed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/right_bed.json index a3ea55e8..aaf53b22 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/right_bed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/right_bed.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:green_bed" + "id": "minecraft:green_bed" }, "title": "This bed is juuuuust riiiiiiiiight", "description": "Metal_Link appreciates your gift of sleepiness", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/root.json index ff3a9813..9dd35bcd 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/metal_gifts/root.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Metal_Link}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Metal_Link" + } + } }, "title": "Metal_Link", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/blue_dye.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/blue_dye.json index c9ca17f2..a2f6f86b 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/blue_dye.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/blue_dye.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:blue_dye" + "id": "minecraft:blue_dye" }, "title": "Duh", "description": "Blue dye for Nin", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/lapis.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/lapis.json index 0ffc10f1..12f1bc50 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/lapis.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/lapis.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:lapis_lazuli" + "id": "minecraft:lapis_lazuli" }, "title": "Yesssssssss", "description": "Lapis, that's the good stuff", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/right_bed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/right_bed.json index 53cc54a3..99dd1302 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/right_bed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/right_bed.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:blue_bed" + "id": "minecraft:blue_bed" }, "title": "This bed is juuuuust riiiiiiiiight", "description": "Nincodedo appreciates your gift of sleepiness", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/root.json index af026843..d61f14ec 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nin_gifts/root.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Nincodedo}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Nincodedo" + } + } }, "title": "Nincodedo", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bone_blocks.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bone_blocks.json index dc1b847d..839fc2a7 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bone_blocks.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bone_blocks.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:bone_block" + "id": "minecraft:bone_block" }, "title": "Square Bones", "description": "bones²", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bones.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bones.json index 60b2425f..cdce1a15 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bones.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/bones.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:bone" + "id": "minecraft:bone" }, "title": "Gettin' them bones", "description": "bones bones bones", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/root.json index fdba66a3..46316fdb 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/nova_gifts/root.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Nova_Stardust}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Nova_Stardust" + } + } }, "title": "Nova_Stardust", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/root.json index 5d996c59..de7b8f69 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:ender_chest" + "id": "minecraft:ender_chest" }, "title": "OCW Gifts", "description": "Give gifts to friends! How nice of you", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/scammed/got_scammed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/scammed/got_scammed.json index 81d158ba..6cb871ff 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/scammed/got_scammed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/scammed/got_scammed.json @@ -1,8 +1,23 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;449435050,1190088049,-1334360732,942410307],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGFlZTZiYjM3Y2JmYzkyYjBkODZkYjVhZGE0NzkwYzY0ZmY0NDY4ZDY4Yjg0OTQyZmRlMDQ0MDVlOGVmNTMzMyJ9fX0=\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [ + 449435050, + 1190088049, + -1334360732, + 942410307 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGFlZTZiYjM3Y2JmYzkyYjBkODZkYjVhZGE0NzkwYzY0ZmY0NDY4ZDY4Yjg0OTQyZmRlMDQ0MDVlOGVmNTMzMyJ9fX0=" + } + ] + } + } }, "title": "SCAMMED", "description": "You've been smackledorfed!", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/pistons.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/pistons.json index 450e5163..19431436 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/pistons.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/pistons.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:piston" + "id": "minecraft:piston" }, "title": "Push push", "description": "Sticky? Not sticky? Either is fine", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/redstone.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/redstone.json index 1800f815..f2be41cf 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/redstone.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/redstone.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:redstone" + "id": "minecraft:redstone" }, "title": "Magic or Advanced Tech?", "description": "More than 1 but less than a stack", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/right_bed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/right_bed.json index 8c66b0d9..b8d75b6e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/right_bed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/right_bed.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:cyan_bed" + "id": "minecraft:cyan_bed" }, "title": "This bed is juuuuust riiiiiiiiight", "description": "ShokkZ appreciates your gift of sleepiness", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/root.json index 15f41d3b..0469f6f4 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/shokkz_gifts/root.json @@ -1,8 +1,10 @@ { "display": { - "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:ShokkZ}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "ShokkZ" + } }, "title": "ShokkZ", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/any_wool.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/any_wool.json index 575b530e..97013aad 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/any_wool.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/any_wool.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:white_wool" + "id": "minecraft:white_wool" }, "title": "A Good Start", "description": "Any old wool? You got a long road ahead of you bud", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/challenge.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/challenge.json index 825b62a4..c776c64c 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/challenge.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/challenge.json @@ -1,8 +1,18 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;-1907288465,-1437970451,-1762994848,-1504458630],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjdlMmJmNTM5YzhlMGFkNDY4ZTUyN2I0N2NmM2EyMWQ0ZTlhY2UxODcyM2E3MjI0OWI3ZDYzZTg1ZmI4YWUwIn19fQ==\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [-1907288465,-1437970451,-1762994848,-1504458630], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjdlMmJmNTM5YzhlMGFkNDY4ZTUyN2I0N2NmM2EyMWQ0ZTlhY2UxODcyM2E3MjI0OWI3ZDYzZTg1ZmI4YWUwIn19fQ==" + } + ] + } + } }, "title": "The Entire Rainbow", "description": "That's a lot of sheep", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/lead.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/lead.json index ae282083..0d005041 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/lead.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/lead.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:lead" + "id": "minecraft:lead" }, "title": "Wrangle Them Up!", "description": "Lead those sheep into the farm", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/right_bed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/right_bed.json index 2a52a1b1..94821406 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/right_bed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/right_bed.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:purple_bed" + "id": "minecraft:purple_bed" }, "title": "This bed is juuuuust riiiiiiiiight", "description": "Try4se appreciates your gift of sleepiness", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/root.json index 9c936400..3b97de11 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/try4se_gifts/root.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Try4se}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Try4se" + } + } }, "title": "Try4se", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/right_bed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/right_bed.json index f6f65614..d62848df 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/right_bed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/right_bed.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:brown_bed" + "id": "minecraft:brown_bed" }, "title": "This bed is juuuuust riiiiiiiiight", "description": "Tunasz_ appreciates your gift of sleepiness", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/root.json index c2c45c91..c4972ba1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/root.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Tunasz_}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Tunasz_" + } + } }, "title": "Tunasz_", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/torches.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/torches.json index 570f1261..cadc9f9e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/torches.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/tunasz_gifts/torches.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:torch" + "id": "minecraft:torch" }, "title": "Let's Light Things Up", "description": "A whole stack of torches!", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/right_bed.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/right_bed.json index 20d21e93..97d822f2 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/right_bed.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/right_bed.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:purple_bed" + "id": "minecraft:purple_bed" }, "title": "This bed is juuuuust riiiiiiiiight", "description": "Undead appreciates your gift of sleepiness", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/root.json index 1b4993d9..0fd53d82 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/root.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Undead_Zeratul}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Undead_Zeratul" + } + } }, "title": "Undead_Zeratul", "description": "", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/scaffolding.json b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/scaffolding.json index 815eddda..5a7a73e3 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/scaffolding.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/player_gifts/undead_gifts/scaffolding.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:scaffolding" + "id": "minecraft:scaffolding" }, "title": "He Goes Up and He Goes Down", "description": "Scaffolding for the building boy", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/root.json index 98690d92..f88ddd80 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/root.json @@ -1,12 +1,27 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;-1328213324,298470611,-1737189839,-240128687],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTdhNWU1MjE4M2U0MWIyOGRlNDFkOTAzODg4M2QzOTlkYzU4N2Q0ZWIyMzBlNjk2ZDhmNmJlNmQzZTU3Y2YifX19\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [ + -1328213324, + 298470611, + -1737189839, + -240128687 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTdhNWU1MjE4M2U0MWIyOGRlNDFkOTAzODg4M2QzOTlkYzU4N2Q0ZWIyMzBlNjk2ZDhmNmJlNmQzZTU3Y2YifX19" + } + ] + } + } }, - "background": "minecraft:textures/block/blue_wool.png", "title": "OCW Custom Challenges", "description": "Talk with Nin if you'd like to add your own!", + "background": "minecraft:textures/block/blue_wool.png", "frame": "task", "show_toast": false, "announce_to_chat": false, diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/salesman_sold.json b/datapacks/ocw-stuff/data/nincodedo/advancements/salesman_sold.json index 14f0f26c..29ae8a63 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/salesman_sold.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/salesman_sold.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:crossbow" + "id": "minecraft:crossbow" }, "title": "Don't need what you're selling", "description": "Send a pillager to the shadow realm", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/any.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/any.json index 558924c6..e314c8fe 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/any.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/any.json @@ -5,7 +5,11 @@ "conditions": { "items": [ { - "nbt": "{NinUnique:\"Ascend\"}" + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "Ascend" + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/ignore_use.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/ignore_use.json index b3ab1e6d..63afae08 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/ignore_use.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/ignore_use.json @@ -17,7 +17,17 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}},OnGround:0b}" + "equipment": { + "mainhand": { + "components": { + "minecraft:custom_data": { + "nincodedo:unique_item": "Ascend", + "nincodedo:powered": 1 + } + } + } + }, + "nbt": "{OnGround:0b}" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/initial.json index 1ae3f3bf..68532549 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/initial.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/initial.json @@ -1,8 +1,10 @@ { "display": { "icon": { - "item": "minecraft:carrot_on_a_stick", - "nbt": "{CustomModelData:1}" + "id": "minecraft:carrot_on_a_stick", + "components": { + "minecraft:custom_model_data": 1 + } }, "title": "What's Updog?", "description": "nm how bout u", @@ -22,7 +24,7 @@ "entity": "this", "predicate": { "type_specific": { - "type": "player", + "type": "minecraft:player", "advancements": { "nincodedo:unique_items/initial_library": true, "nincodedo:unique_items/master_sword/initial": true diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/main.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/main.json index d7f0c1bf..7cdb4c80 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/main.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/main.json @@ -1,8 +1,10 @@ { "display": { "icon": { - "item": "minecraft:carrot_on_a_stick", - "nbt": "{CustomModelData:1}" + "id": "minecraft:carrot_on_a_stick", + "components": { + "minecraft:custom_model_data": 1 + } }, "title": "Ascend", "description": "My Zelda Needs Me", @@ -18,7 +20,11 @@ "conditions": { "items": [ { - "nbt": "{NinUnique:\"Ascend\"}" + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "Ascend" + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/stop_initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/stop_initial.json index e7c6aef2..380e7759 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/stop_initial.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/stop_initial.json @@ -15,7 +15,16 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}}}", + "equipment": { + "mainhand": { + "components": { + "minecraft:custom_data": { + "nincodedo:unique_item": "Ascend", + "nincodedo:powered": 1 + } + } + } + }, "flags": { "is_sneaking": true } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_ascend.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_ascend.json index 600ac648..774eed4d 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_ascend.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_ascend.json @@ -19,7 +19,17 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}},OnGround:1b}" + "nbt": "{OnGround:1b}", + "equipment": { + "mainhand": { + "components": { + "minecraft:custom_data": { + "nincodedo:unique_item": "Ascend", + "nincodedo:powered": 1 + } + } + } + } } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_initial.json index dc05d2dc..d47a29c9 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_initial.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_initial.json @@ -18,7 +18,17 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}},OnGround:1b}" + "nbt": "{OnGround:1b}", + "equipment": { + "mainhand": { + "components": { + "minecraft:custom_data": { + "nincodedo:unique_item": "Ascend", + "nincodedo:powered": 1 + } + } + } + } } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/any.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/any.json index 1621c8fc..f583d2b9 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/any.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/any.json @@ -6,7 +6,11 @@ "conditions": { "items": [ { - "nbt": "{NinUnique:\"NR\"}" + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "NR" + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/initial.json index 34cd9162..19ab201d 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/initial.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/initial.json @@ -1,8 +1,12 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:Nincodedo}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "name": "Nincodedo" + } + } }, "title": "Need some better fishins?", "description": "Don't fall into a cave while you're lookin", @@ -20,7 +24,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:cave_base_roof" + "structures": "nincodedo:cave_base_roof" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/main.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/main.json index 3ad46210..5dac2c36 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/main.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/main.json @@ -1,8 +1,11 @@ { "display": { "icon": { - "item": "minecraft:fishing_rod", - "nbt": "{CustomModelData:1010101,Enchantments:[{}]}" + "id": "minecraft:fishing_rod", + "components": { + "minecraft:custom_model_data": 1010101, + "minecraft:enchantment_glint_override": true + } }, "title": "Nin's Iridium Fishing Rod", "description": "Imported from Pelican Town", @@ -18,7 +21,11 @@ "conditions": { "items": [ { - "nbt": "{NinUnique:\"NR\"}" + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "NR" + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/root.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/root.json index f96d85b1..2a8a90df 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:enchanted_book" + "id": "minecraft:enchanted_book" }, "title": "Unique Items", "description": "Powerful rare items", @@ -28,7 +28,11 @@ "conditions": { "items": [ { - "nbt": "{NinUnique:\"OCWMap\"}" + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "OCWMap" + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/rumors.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/rumors.json index da475f73..7bfb38f9 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/rumors.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/rumors.json @@ -1,8 +1,23 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;682268746,544686284,-1914182079,-1376598889],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDZiYTYzMzQ0ZjQ5ZGQxYzRmNTQ4OGU5MjZiZjNkOWUyYjI5OTE2YTZjNTBkNjEwYmI0MGE1MjczZGM4YzgyIn19fQ==\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [ + 682268746, + 544686284, + -1914182079, + -1376598889 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDZiYTYzMzQ0ZjQ5ZGQxYzRmNTQ4OGU5MjZiZjNkOWUyYjI5OTE2YTZjNTBkNjEwYmI0MGE1MjczZGM4YzgyIn19fQ==" + } + ] + } + } }, "title": "Rumors about the Ancient Ruins", "description": "Supposedly the Ancient OCW structures hold unique and powerful items...", diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/wow.json b/datapacks/ocw-stuff/data/nincodedo/advancements/wow.json index ac528ab6..d3c98eb2 100644 --- a/datapacks/ocw-stuff/data/nincodedo/advancements/wow.json +++ b/datapacks/ocw-stuff/data/nincodedo/advancements/wow.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:white_carpet" + "id": "minecraft:white_carpet" }, "title": "You did THIS?", "description": "How could you", diff --git a/datapacks/ocw-stuff/data/nincodedo/banner_pattern/bidoof.json b/datapacks/ocw-stuff/data/nincodedo/banner_pattern/bidoof.json new file mode 100644 index 00000000..28fac767 --- /dev/null +++ b/datapacks/ocw-stuff/data/nincodedo/banner_pattern/bidoof.json @@ -0,0 +1,4 @@ +{ + "asset_id": "nincodedo:bidoof", + "translation_key": "block.minecraft.banner.nincodedo.bidoof" +} diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completemetal.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completemetal.mcfunction index 7bf21c21..51f637e7 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completemetal.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completemetal.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of Metal_Link's gift advancements!"}] advancement grant @s only nincodedo:player_gifts/metal_gifts/root -give @s player_head{SkullOwner: {Id: [I; -2145763756, 845696088, -1763149853, 991948061], Name: "Metal_Link", Properties: {textures: [{Value: "ewogICJ0aW1lc3RhbXAiIDogMTY4NjQ1MjQwMDYzNCwKICAicHJvZmlsZUlkIiA6ICI4MDFhM2U1NDMyNjg0YzU4OTZlODc3ZTMzYjFmZWQxZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZXRhbF9MaW5rIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2JkNWUxZjY1YTgyZjI4ZTQ5MWZkNjU4MDg2NjgwZGEwNjE1YmJmN2JkOTliZDQ4OWFlOTdkZTE4NWJlNzE0ZGUiCiAgICB9LAogICAgIkNBUEUiIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2Y5YTc2NTM3NjQ3OTg5ZjlhMGI2ZDAwMWUzMjBkYWM1OTFjMzU5ZTllNjFhMzFmNGNlMTFjODhmMjA3ZjBhZDQiCiAgICB9CiAgfQp9"}]}}} 1 +give @s minecraft:player_head[minecraft:profile={name:"Metal_Link"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenin.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenin.mcfunction index 5b4ac9b4..6ff91560 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenin.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenin.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of Nincodedo's gift advancements!"}] advancement grant @s only nincodedo:player_gifts/nin_gifts/root -give @s player_head{display:{Name:'{"text":"Nincodedo\'s Head","italic":false}'},SkullOwner:{Id:[I;1690553640,1879984183,-1924351694,87346173],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2Y0NzUxMDNkNjljYTI5ODFhYTI3ZjhkMjFiMmQ5MDYwNjZmYTZjYTlhYzQyNWVhMTU2NDUzZDRmMTRjNjc2YyJ9fX0="}]}}} 1 +give @s minecraft:player_head[minecraft:profile={name:"Nincodedo"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenova.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenova.mcfunction index f5996ba0..e6016586 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenova.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completenova.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of Nova_Stardust's gift advancements!"}] advancement grant @s only nincodedo:player_gifts/nova_gifts/root -give @s player_head{display:{Name:'{"text":"Nova_Stardust\'s Head","italic":false}'},SkullOwner:{Id:[I;432733858,2013482629,-1625578069,1793702290],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmJjNTUxNzdlODYwNGRjMjdjYjViNjE1MjM4NTg5NjVhYjc0MTZhMjJiMDljMzU4M2FjYThkNDI0ZWJiODRmMSJ9fX0="}]}}} 1 +give @s minecraft:player_head[minecraft:profile={name:"Nova_Stardust"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeshokkz.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeshokkz.mcfunction index 4e00ac0a..98088948 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeshokkz.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeshokkz.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of ShokkZ's gift advancements!"}] advancement grant @s only nincodedo:player_gifts/shokkz_gifts/root -give @s player_head{display:{Name:'{"text":"ShokkZ\'s Head","italic":false}'}, SkullOwner: {Id: [I; -1821251562, -110607629, -1745842003, -154273168], Properties: {textures: [{Value: "ewogICJ0aW1lc3RhbXAiIDogMTY4MzA0NDAwOTMyMiwKICAicHJvZmlsZUlkIiA6ICI5MzcxZTgxNmY5Njg0MmYzOTdmMDkwYWRmNmNkZmE3MCIsCiAgInByb2ZpbGVOYW1lIiA6ICJTaG9ra1oiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzAzZTU0YzAxOGY1N2RlODBiYjZiYjdmMWM4Y2ZmYWIzZGI1ZTZkY2RiOTkxNDQxYTY1NzAwOGE0MDYxMDc4MSIKICAgIH0KICB9Cn0=", Signature: "ibEeXPXiX2SUzexIkOmsVeKlxNEpy8/L5vv1ry15eC5hmGiRZpOHSaEQeNuMyEdEo4KmdOvcW7NrmdrC4xLTl/LwjkCINoX4Mbf/8gOTGJjTf3vl2fDt+4if7AErXGJT8CtxuLeRmW9LrJgWiVC9r2vI01w8UJsQGi8hqMYaxKjKYkah6bE/VBxBwVDyk0KiJAYay2jrHTzUgkyfBmGy18vuWpLnMboYiXRjEmtOYoGa4JsM6Deq0RXSB/Twxktv4oZnxWkZlAJ/x733bCij92wnNaTvYwYAWWfNDxRV+JGYm75tzYMbxsVk9ssxs1C0omRITfYCBBNASLUXfxUHhBXWA6gv9lVaRxSyiSTPiEf8oftWUjtgBw6n/YZEAUKGg8WXH0wXah3uQk3kAojbRTFVramvgpDkb61hlV8ZmXG7BVQWDrNmYcTPfjhZmktqqmETvwPmebj8jmLCv5ZrSeiq/8aHPc3+NqX3KvIX/9bbH2xADKoAGITtlQS3bhf+s+3V/bRPGX277PDAHYqI6rPrlRQv4uAGcBRxerH0BIU1U+e/I6BHeyD073P13utHlTpHjNRmgEjCqLra/cKHS7/SiN9kpNin90m5jTHdDC+tzFUKMG5y/xPR5S7RoDHuiS7z6an8dui8/vAPEO4XlKj383mOYIvvfrYOdWU7JGQ="}]}, Name: "ShokkZ"}} 1 +give @s minecraft:player_head[minecraft:profile={name:"ShokkZ"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetry4se.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetry4se.mcfunction index 609658bc..c06f92d6 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetry4se.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetry4se.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of Try4se's gift advancements!"}] advancement grant @s only nincodedo:player_gifts/try4se_gifts/root -give @s player_head{display:{Name:'{"text":"Try4se\'s Head","italic":false}'},SkullOwner:{Id:[I;-1111716882,-525578951,-1433662112,1937434542],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGYxNmNjNjc3ZWU0OTQ3MWI5NjViNWEzNTRmMzU0ZmQ0ZDRkNTlmMjg4YzU5OTg5NmM0NGJlNTIzNTc4YTYzZCJ9fX0="}]}}} 1 +give @s minecraft:player_head[minecraft:profile={name:"Try4se"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetunasz.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetunasz.mcfunction index f38456f7..14502581 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetunasz.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completetunasz.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of Tunasz_'s gift advancements!"}] advancement grant @s only nincodedo:player_gifts/tunasz_gifts/root -give @s player_head{SkullOwner: {Id: [I; -1134297099, 228347247, -1929822783, -611013429], Properties: {textures: [{Value: "ewogICJ0aW1lc3RhbXAiIDogMTY3ODc1NDU2OTUzMCwKICAicHJvZmlsZUlkIiA6ICJiYzYzZmZmNTBkOWM0ZDZmOGNmOTNkYzFkYjk0YWNjYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJUdW5hc3pfIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzE4ZDRiNzAwZjNhNDEzZjFiM2QzMTg4YTI4MWRlODFhNmQxZTBhM2ZhNjc5M2RlNWEyMjI1MjQ1YmJjOWUwMzgiCiAgICB9CiAgfQp9", Signature: "GGqI2aD1mJ5kyCzIMs2uhq1qhXMHKtQX7HA74zY9yWVjSDzUVHt2HZsxPwQ6ULYdBc1H4wFvLeQYMIYShubkDt9P5gZPWpK3Vc03eRRTxSJU/WnPgsLXAFbyylznhCdlieVi8fU2X7bBGQqAvzNe1RrmpLXij+jPjp0oowMI24eG5Sn5Rm6+oMjfk8W2tH6weJADXvMqgPj8sCTWMjSH42a/4xhLaugcciiRUflr8befDFDGfM3fAylizoaQEDiGUC9bqc38wLHYxGb+0t6T1L2jHQHAZsqAjDc/CVjasTude5BY6vdqSCYSqCqCLbeiuVARuJ9v3PI9NV02Z2L1bLQUyps+5l9BCm/y4Nb6PjfQwEI8iRcjodkUVz+I2dKCEDwub4ESjPt4uy0ZaZw9PrhF73BPFkRwT2mPXgCJv4UHLMXIpmoS+VkyMcOGr1ZbLBA3FsEYz2Sf+t3EUjnQ0HGOT+5yz7hD0me5bPIySQ69nHqQc3g3dKVlAnD3g/hWof4fmcvskjLd/tWfu18cYUOKJoEP/CPKgaHlFAel6ZgEbf8fZdiOgVDTjsTaMHuccCffqAhmNq5g7ZosDzgRWUPpECdF5fPktW9DYgbXmXUKpSC9WXR04V2M/jAf0WZU9g90LSz8q+56qNIHasGX7ewGlrdar0RBOLY9ndjetww="}]}, Name: "Tunasz_"}} 1 +give @s minecraft:player_head[minecraft:profile={name:"Tunasz_"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeundead.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeundead.mcfunction index 4997370e..30813780 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeundead.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/advancements/completeundead.mcfunction @@ -1,5 +1,5 @@ playsound minecraft:ui.toast.challenge_complete master @s ~ ~ ~ tellraw @a [{"selector":"@s"},{"text":" completed all of Undead_Zeratul's gift advancements!"}] advancement grant @s only nincodedo:player_gifts/undead_gifts/root -give @s player_head{display:{Name:'{"text":"Undead_Zeratul\'s Head","italic":false}'},SkullOwner:{Id:[I;-1980149978,-1222816804,-1641757829,-223005267],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTQ2NjdkN2Y4OTZlNzY3MTNiZmY2OWI4M2Y2YjkxMmFmOGNiNzAxNzEyNTUwNjVmNzBjOGFmNmU2NDJmOTdlZCJ9fX0="}]}}} 1 +give @s minecraft:player_head[minecraft:profile={name:"Undead_Zeratul"}] scoreboard players add @s ocwplayergiftcount 1 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/mark_boat_location.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/mark_boat_location.mcfunction index ade3758e..0947f0cb 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/mark_boat_location.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/mark_boat_location.mcfunction @@ -1,40 +1,50 @@ -item modify entity @s[nbt={Inventory:[{Slot:0b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.0 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:1b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.1 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:2b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.2 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:3b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.3 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:4b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.4 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:5b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.5 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:6b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.6 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:7b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.7 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:8b,tag:{NinUnique:"BoatCompass"}}]}] hotbar.8 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:9b,tag:{NinUnique:"BoatCompass"}}]}] inventory.0 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:10b,tag:{NinUnique:"BoatCompass"}}]}] inventory.1 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:11b,tag:{NinUnique:"BoatCompass"}}]}] inventory.2 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:12b,tag:{NinUnique:"BoatCompass"}}]}] inventory.3 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:13b,tag:{NinUnique:"BoatCompass"}}]}] inventory.4 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:14b,tag:{NinUnique:"BoatCompass"}}]}] inventory.5 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:15b,tag:{NinUnique:"BoatCompass"}}]}] inventory.6 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:16b,tag:{NinUnique:"BoatCompass"}}]}] inventory.7 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:17b,tag:{NinUnique:"BoatCompass"}}]}] inventory.8 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:18b,tag:{NinUnique:"BoatCompass"}}]}] inventory.9 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:19b,tag:{NinUnique:"BoatCompass"}}]}] inventory.10 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:20b,tag:{NinUnique:"BoatCompass"}}]}] inventory.11 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:21b,tag:{NinUnique:"BoatCompass"}}]}] inventory.12 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:22b,tag:{NinUnique:"BoatCompass"}}]}] inventory.13 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:23b,tag:{NinUnique:"BoatCompass"}}]}] inventory.14 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:24b,tag:{NinUnique:"BoatCompass"}}]}] inventory.15 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:25b,tag:{NinUnique:"BoatCompass"}}]}] inventory.16 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:26b,tag:{NinUnique:"BoatCompass"}}]}] inventory.17 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:27b,tag:{NinUnique:"BoatCompass"}}]}] inventory.18 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:28b,tag:{NinUnique:"BoatCompass"}}]}] inventory.19 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:29b,tag:{NinUnique:"BoatCompass"}}]}] inventory.20 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:30b,tag:{NinUnique:"BoatCompass"}}]}] inventory.21 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:31b,tag:{NinUnique:"BoatCompass"}}]}] inventory.22 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:32b,tag:{NinUnique:"BoatCompass"}}]}] inventory.23 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:33b,tag:{NinUnique:"BoatCompass"}}]}] inventory.24 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:34b,tag:{NinUnique:"BoatCompass"}}]}] inventory.25 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:35b,tag:{NinUnique:"BoatCompass"}}]}] inventory.26 nincodedo:set_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:-106b,tag:{NinUnique:"BoatCompass"}}]}] weapon.offhand nincodedo:set_boat_compass +execute store result storage nincodedo:storage boatcompass.x int 1 run data get entity @s Pos[0] +execute store result storage nincodedo:storage boatcompass.y int 1 run data get entity @s Pos[1] +execute store result storage nincodedo:storage boatcompass.z int 1 run data get entity @s Pos[2] + +execute if dimension minecraft:overworld run data modify storage nincodedo:storage boatcompass.dimension set value "minecraft:overworld" +execute if dimension minecraft:the_nether run data modify storage nincodedo:storage boatcompass.dimension set value "minecraft:the_nether" +execute if dimension minecraft:the_end run data modify storage nincodedo:storage boatcompass.dimension set value "minecraft:the_end" + +execute if items entity @s hotbar.0 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.0" +execute if items entity @s hotbar.1 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.1" +execute if items entity @s hotbar.2 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.2" +execute if items entity @s hotbar.3 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.3" +execute if items entity @s hotbar.4 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.4" +execute if items entity @s hotbar.5 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.5" +execute if items entity @s hotbar.6 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.6" +execute if items entity @s hotbar.7 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.7" +execute if items entity @s hotbar.8 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "hotbar.8" +execute if items entity @s inventory.0 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.0" +execute if items entity @s inventory.1 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.1" +execute if items entity @s inventory.2 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.2" +execute if items entity @s inventory.3 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.3" +execute if items entity @s inventory.4 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.4" +execute if items entity @s inventory.5 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.5" +execute if items entity @s inventory.6 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.6" +execute if items entity @s inventory.7 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.7" +execute if items entity @s inventory.8 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.8" +execute if items entity @s inventory.9 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.9" +execute if items entity @s inventory.10 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.10" +execute if items entity @s inventory.11 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.11" +execute if items entity @s inventory.12 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.12" +execute if items entity @s inventory.13 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.13" +execute if items entity @s inventory.14 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.14" +execute if items entity @s inventory.15 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.15" +execute if items entity @s inventory.16 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.16" +execute if items entity @s inventory.17 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.17" +execute if items entity @s inventory.18 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.18" +execute if items entity @s inventory.19 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.19" +execute if items entity @s inventory.20 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.20" +execute if items entity @s inventory.21 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.21" +execute if items entity @s inventory.22 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.22" +execute if items entity @s inventory.23 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.23" +execute if items entity @s inventory.24 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.24" +execute if items entity @s inventory.25 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.25" +execute if items entity @s inventory.26 minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "inventory.26" +execute if items entity @s weapon.offhand minecraft:compass[minecraft:custom_data~{NinUnique:"BoatCompass"}] run data modify storage nincodedo:storage boatcompass.slot set value "weapon.offhand" + +function nincodedo:items/boatcompass/set_pos with storage nincodedo:storage boatcompass advancement revoke @s only nincodedo:items/get_out_of_boat playsound minecraft:item.lodestone_compass.lock block @s diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/set_pos.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/set_pos.mcfunction new file mode 100644 index 00000000..35743d7a --- /dev/null +++ b/datapacks/ocw-stuff/data/nincodedo/functions/items/boatcompass/set_pos.mcfunction @@ -0,0 +1,2 @@ +$item replace entity @s $(slot) with minecraft:compass[minecraft:lodestone_tracker={tracked:0b,target:{pos:[I;$(x),$(y),$(z)],dimension:"$(dimension)"}}] +$item modify entity @s $(slot) nincodedo:set_boat_compass diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/items/multiverse/tools/calculate_mined_blocks.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/items/multiverse/tools/calculate_mined_blocks.mcfunction index d0315bfb..52bfeb62 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/items/multiverse/tools/calculate_mined_blocks.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/items/multiverse/tools/calculate_mined_blocks.mcfunction @@ -14,7 +14,7 @@ scoreboard players operation @s mined_total += @s mined_redstone scoreboard players operation @s mined_total += @s mined_lapis scoreboard players operation @s mined_total += @s mined_emerald -execute store result score @s[tag=holdingcobaltpickaxe] cobalt_momentum run data get entity @s SelectedItem.tag.Enchantments[{id:"minecraft:efficiency"}].lvl +execute store result score @s[tag=holdingcobaltpickaxe] cobalt_momentum run data get entity @s SelectedItem.components."minecraft:enchantments".levels."minecraft:efficiency" execute if score @s[tag=holdingcobaltpickaxe] cobalt_momentum matches ..4 if score @s mined_total matches 3.. run item modify entity @s weapon.mainhand nincodedo:multiverse/tools/increase_efficiency_by_one execute if score @s[tag=holdingcobaltpickaxe] cobalt_momentum matches 1 if score @s cobalt_momentum_prev < @s cobalt_momentum at @s run playsound minecraft:entity.player.levelup player @s ~ ~ ~ 0.5 1.1 execute if score @s[tag=holdingcobaltpickaxe] cobalt_momentum matches 2 if score @s cobalt_momentum_prev < @s cobalt_momentum at @s run playsound minecraft:entity.player.levelup player @s ~ ~ ~ 0.5 1.2 diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/recipes/give_boat_compass.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/recipes/give_boat_compass.mcfunction deleted file mode 100644 index 93375ad3..00000000 --- a/datapacks/ocw-stuff/data/nincodedo/functions/recipes/give_boat_compass.mcfunction +++ /dev/null @@ -1,41 +0,0 @@ -clear @s minecraft:knowledge_book -give @s minecraft:compass{NinUnique:"NewBoatCompass"} -advancement revoke @s only nincodedo:recipes/craft_boat_compass - -item modify entity @s[nbt={Inventory:[{Slot:0b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.0 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:1b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.1 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:2b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.2 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:3b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.3 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:4b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.4 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:5b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.5 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:6b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.6 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:7b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.7 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:8b,tag:{NinUnique:"NewBoatCompass"}}]}] hotbar.8 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:9b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.0 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:10b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.1 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:11b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.2 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:12b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.3 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:13b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.4 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:14b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.5 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:15b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.6 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:16b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.7 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:17b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.8 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:18b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.9 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:19b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.10 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:20b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.11 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:21b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.12 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:22b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.13 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:23b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.14 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:24b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.15 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:25b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.16 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:26b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.17 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:27b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.18 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:28b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.19 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:29b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.20 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:30b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.21 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:31b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.22 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:32b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.23 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:33b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.24 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:34b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.25 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:35b,tag:{NinUnique:"NewBoatCompass"}}]}] inventory.26 nincodedo:remove_boat_compass -item modify entity @s[nbt={Inventory:[{Slot:-106b,tag:{NinUnique:"NewBoatCompass"}}]}] weapon.offhand nincodedo:remove_boat_compass diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/recipes/give_kirby_plushie.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/recipes/give_kirby_plushie.mcfunction deleted file mode 100644 index a2da27cb..00000000 --- a/datapacks/ocw-stuff/data/nincodedo/functions/recipes/give_kirby_plushie.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -clear @s minecraft:knowledge_book -give @s minecraft:player_head{display:{Name:'{"text":"Kirby Plushie"}'},SkullOwner:{Id:[I;769800376,2073248831,-1223666267,548758263],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjIyNDg0NWQ5ODhkNWJjMTliZGE1YzNhYmE4NjQwNTQxNjU1MjA0MDViZDZmMjY3ZWIzOWI3MjcwNDQzNTcxZSJ9fX0="}]}}} 1 -advancement revoke @s only nincodedo:recipes/craft_kirby_plushie diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/rewards/announce.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/rewards/announce.mcfunction index ab210974..527f0776 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/rewards/announce.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/rewards/announce.mcfunction @@ -1,5 +1,5 @@ scoreboard objectives add inventory dummy -execute store result score @s inventory run clear @s #nincodedo:next_attempt_rewards{NinReward:1} 0 +execute store result score @s inventory run clear @s #nincodedo:next_attempt_rewards[minecraft:custom_data={NinReward:1}] 0 tellraw @s[scores={inventory=1}] [{"text":"You got 1 reward from the ","italic":true},{"text":"previous world's advancements","hoverEvent":{"action":"show_text","contents":[{"score":{"name":"@s","objective":"advrewards"}}]}},{"text":"! Nice!"},{"score":{"name":"@s","objective":"ad"}}] tellraw @s[scores={inventory=2..}] [{"text":"You got ","italic":true},{"score":{"name":"@s","objective":"inventory"},"italic":true},{"text":" rewards from the ","italic":true},{"text":"previous world's advancements","hoverEvent":{"action":"show_text","contents":[{"score":{"name":"@s","objective":"advrewards"}}]}},{"text":"! Nice!"},{"score":{"name":"@s","objective":"ad"}}] diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/rewards/removeday1tools.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/rewards/removeday1tools.mcfunction index 968d4ded..414d292b 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/rewards/removeday1tools.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/rewards/removeday1tools.mcfunction @@ -2,7 +2,7 @@ scoreboard objectives add clearday1tools dummy scoreboard players set @s clearday1tools 0 -execute store result score @s clearday1tools run clear @s #nincodedo:day1tools{Enchantments:[{id:"minecraft:vanishing_curse",lvl:2s}]} +execute store result score @s clearday1tools run clear @s #nincodedo:day1tools[minecraft:enchantments={"minecraft:vanishing_curse":2}] tellraw @s[scores={clearday1tools=1}] {"text":"Aww, your Day 1 tool vanished..."} tellraw @s[scores={clearday1tools=2..}] [{"text":"Aww, your "},{"score":{"name":"@s","objective":"clearday1tools"}},{"text":" Day 1 tools vanished..."}] diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/color_ping_block.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/color_ping_block.mcfunction index 20e02833..61ec7186 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/color_ping_block.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/color_ping_block.mcfunction @@ -1,35 +1,35 @@ execute if score @s ping_color matches 1..16 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] Glowing set value true -execute if score @s ping_color matches 1 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:white_stained_glass" -execute if score @s ping_color matches 2 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:light_gray_stained_glass" -execute if score @s ping_color matches 3 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:gray_stained_glass" -execute if score @s ping_color matches 4 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:black_stained_glass" -execute if score @s ping_color matches 5 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:brown_stained_glass" -execute if score @s ping_color matches 6 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:red_stained_glass" -execute if score @s ping_color matches 7 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:orange_stained_glass" -execute if score @s ping_color matches 8 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:yellow_stained_glass" -execute if score @s ping_color matches 9 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:lime_stained_glass" -execute if score @s ping_color matches 10 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:green_stained_glass" -execute if score @s ping_color matches 11 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:cyan_stained_glass" -execute if score @s ping_color matches 12 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:light_blue_stained_glass" -execute if score @s ping_color matches 13 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:blue_stained_glass" -execute if score @s ping_color matches 14 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:purple_stained_glass" -execute if score @s ping_color matches 15 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:magenta_stained_glass" -execute if score @s ping_color matches 16 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set value "minecraft:pink_stained_glass" +execute if score @s ping_color matches 1 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[1].block +execute if score @s ping_color matches 2 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[2].block +execute if score @s ping_color matches 3 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[3].block +execute if score @s ping_color matches 4 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[4].block +execute if score @s ping_color matches 5 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[5].block +execute if score @s ping_color matches 6 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[6].block +execute if score @s ping_color matches 7 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[7].block +execute if score @s ping_color matches 8 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[8].block +execute if score @s ping_color matches 9 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[9].block +execute if score @s ping_color matches 10 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[10].block +execute if score @s ping_color matches 11 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[11].block +execute if score @s ping_color matches 12 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[12].block +execute if score @s ping_color matches 13 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[13].block +execute if score @s ping_color matches 14 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[14].block +execute if score @s ping_color matches 15 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[15].block +execute if score @s ping_color matches 16 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] block_state.Name set from storage nincodedo:storage colors[16].block -execute if score @s ping_color matches 1 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 16777215 -execute if score @s ping_color matches 2 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 13882323 -execute if score @s ping_color matches 3 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 8421504 -execute if score @s ping_color matches 4 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 1315860 -execute if score @s ping_color matches 5 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 9127187 -execute if score @s ping_color matches 6 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 16711680 -execute if score @s ping_color matches 7 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 16753920 -execute if score @s ping_color matches 8 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 16776960 -execute if score @s ping_color matches 9 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 12582656 -execute if score @s ping_color matches 10 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 65280 -execute if score @s ping_color matches 11 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 65535 -execute if score @s ping_color matches 12 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 11393254 -execute if score @s ping_color matches 13 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 255 -execute if score @s ping_color matches 14 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 8388736 -execute if score @s ping_color matches 15 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 16711935 -execute if score @s ping_color matches 16 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set value 16761035 +execute if score @s ping_color matches 1 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[1].glow_color +execute if score @s ping_color matches 2 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[2].glow_color +execute if score @s ping_color matches 3 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[3].glow_color +execute if score @s ping_color matches 4 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[4].glow_color +execute if score @s ping_color matches 5 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[5].glow_color +execute if score @s ping_color matches 6 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[6].glow_color +execute if score @s ping_color matches 7 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[7].glow_color +execute if score @s ping_color matches 8 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[8].glow_color +execute if score @s ping_color matches 9 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[9].glow_color +execute if score @s ping_color matches 10 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[10].glow_color +execute if score @s ping_color matches 11 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[11].glow_color +execute if score @s ping_color matches 12 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[12].glow_color +execute if score @s ping_color matches 13 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[13].glow_color +execute if score @s ping_color matches 14 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[14].glow_color +execute if score @s ping_color matches 15 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[15].glow_color +execute if score @s ping_color matches 16 run data modify entity @e[tag=block_ping,sort=nearest,limit=1] glow_color_override set from storage nincodedo:storage colors[16].glow_color diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/load.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/load.mcfunction index 813cbadf..a14c38d2 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/load.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/load.mcfunction @@ -7,19 +7,22 @@ scoreboard objectives add ping_config trigger scoreboard players set config_ping_ping_lifetime rhcconfig 140 scoreboard players set max_raycast_steps rhcconfig 120 -data modify storage nincodedo:storage colors append value "White" -data modify storage nincodedo:storage colors append value "Light Gray" -data modify storage nincodedo:storage colors append value "Gray" -data modify storage nincodedo:storage colors append value "Black" -data modify storage nincodedo:storage colors append value "Brown" -data modify storage nincodedo:storage colors append value "Red" -data modify storage nincodedo:storage colors append value "Orange" -data modify storage nincodedo:storage colors append value "Yellow" -data modify storage nincodedo:storage colors append value "Lime" -data modify storage nincodedo:storage colors append value "Green" -data modify storage nincodedo:storage colors append value "Cyan" -data modify storage nincodedo:storage colors append value "Light Blue" -data modify storage nincodedo:storage colors append value "Blue" -data modify storage nincodedo:storage colors append value "Purple" -data modify storage nincodedo:storage colors append value "Magenta" -data modify storage nincodedo:storage colors append value "Pink" +data remove storage nincodedo:storage colors + +data modify storage nincodedo:storage colors append value {} +data modify storage nincodedo:storage colors append value {"name": "White", "block": "minecraft:white_stained_glass", "glow_color": 16777215} +data modify storage nincodedo:storage colors append value {"name": "Light Gray", "block": "minecraft:light_gray_stained_glass", "glow_color": 13882323} +data modify storage nincodedo:storage colors append value {"name": "Gray", "block": "minecraft:gray_stained_glass", "glow_color": 8421504} +data modify storage nincodedo:storage colors append value {"name": "Black", "block": "minecraft:black_stained_glass", "glow_color": 1315860} +data modify storage nincodedo:storage colors append value {"name": "Brown", "block": "minecraft:brown_stained_glass", "glow_color": 9127187} +data modify storage nincodedo:storage colors append value {"name": "Red", "block": "minecraft:red_stained_glass", "glow_color": 16711680} +data modify storage nincodedo:storage colors append value {"name": "Orange", "block": "minecraft:orange_stained_glass", "glow_color": 16753920} +data modify storage nincodedo:storage colors append value {"name": "Yellow", "block": "minecraft:yellow_stained_glass", "glow_color": 16776960} +data modify storage nincodedo:storage colors append value {"name": "Lime", "block": "minecraft:lime_stained_glass", "glow_color": 12582656} +data modify storage nincodedo:storage colors append value {"name": "Green", "block": "minecraft:green_stained_glass", "glow_color": 65280} +data modify storage nincodedo:storage colors append value {"name": "Cyan", "block": "minecraft:cyan_stained_glass", "glow_color": 65535} +data modify storage nincodedo:storage colors append value {"name": "Light Blue", "block": "minecraft:light_blue_stained_glass", "glow_color": 11393254} +data modify storage nincodedo:storage colors append value {"name": "Blue", "block": "minecraft:blue_stained_glass", "glow_color": 255} +data modify storage nincodedo:storage colors append value {"name": "Purple", "block": "minecraft:purple_stained_glass", "glow_color": 8388736} +data modify storage nincodedo:storage colors append value {"name": "Magenta", "block": "minecraft:magenta_stained_glass", "glow_color": 16711935} +data modify storage nincodedo:storage colors append value {"name": "Pink", "block": "minecraft:pink_stained_glass", "glow_color": 16761035} diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/show_config.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/show_config.mcfunction index 0709060e..eb1ef377 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/show_config.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/triggers/ping/show_config.mcfunction @@ -1,19 +1,19 @@ -execute if score @s ping_color matches 1 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[0] -execute if score @s ping_color matches 2 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[1] -execute if score @s ping_color matches 3 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[2] -execute if score @s ping_color matches 4 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[3] -execute if score @s ping_color matches 5 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[4] -execute if score @s ping_color matches 6 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[5] -execute if score @s ping_color matches 7 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[6] -execute if score @s ping_color matches 8 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[7] -execute if score @s ping_color matches 9 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[8] -execute if score @s ping_color matches 10 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[9] -execute if score @s ping_color matches 11 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[10] -execute if score @s ping_color matches 12 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[11] -execute if score @s ping_color matches 13 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[12] -execute if score @s ping_color matches 14 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[13] -execute if score @s ping_color matches 15 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[14] -execute if score @s ping_color matches 16 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[15] +execute if score @s ping_color matches 1 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[1].name +execute if score @s ping_color matches 2 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[2].name +execute if score @s ping_color matches 3 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[3].name +execute if score @s ping_color matches 4 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[4].name +execute if score @s ping_color matches 5 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[5].name +execute if score @s ping_color matches 6 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[6].name +execute if score @s ping_color matches 7 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[7].name +execute if score @s ping_color matches 8 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[8].name +execute if score @s ping_color matches 9 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[9].name +execute if score @s ping_color matches 10 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[10].name +execute if score @s ping_color matches 11 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[11].name +execute if score @s ping_color matches 12 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[12].name +execute if score @s ping_color matches 13 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[13].name +execute if score @s ping_color matches 14 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[14].name +execute if score @s ping_color matches 15 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[15].name +execute if score @s ping_color matches 16 run data modify storage nincodedo:storage current_color set from storage nincodedo:storage colors[16].name tellraw @s [{"text":"---Ping Color Config---\n"},{"text":"Click on a color to set your ping block's color.\n"},{"text":"Current ping color: "},{"nbt":"current_color","storage":"nincodedo:storage"},{"text":"\n"},{"text":"White","color":"white","clickEvent":{"action":"run_command","value":"/trigger ping_config set 1"}},{"text":" - "},{"text":"Light Gray","color":"#d3d3d3","clickEvent":{"action":"run_command","value":"/trigger ping_config set 2"}},{"text":" - "},{"text":"Gray","color":"#808080","clickEvent":{"action":"run_command","value":"/trigger ping_config set 3"}},{"text":" - "},{"text":"Black\n","color":"#161616","clickEvent":{"action":"run_command","value":"/trigger ping_config set 4"}},{"text":"Brown","color":"#a52a2a","clickEvent":{"action":"run_command","value":"/trigger ping_config set 5"}},{"text":" - "},{"text":"Red","color":"red","clickEvent":{"action":"run_command","value":"/trigger ping_config set 6"}},{"text":" - "},{"text":"Orange","color":"#ffa500","clickEvent":{"action":"run_command","value":"/trigger ping_config set 7"}},{"text":" - "},{"text":"Yellow\n","color":"yellow","clickEvent":{"action":"run_command","value":"/trigger ping_config set 8"}},{"text":"Lime","color":"green","clickEvent":{"action":"run_command","value":"/trigger ping_config set 9"}},{"text":" - "},{"text":"Green","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger ping_config set 10"}},{"text":" - "},{"text":"Cyan","color":"#1E817F","clickEvent":{"action":"run_command","value":"/trigger ping_config set 11"}},{"text":" - "},{"text":"Light Blue\n","color":"aqua","clickEvent":{"action":"run_command","value":"/trigger ping_config set 12"}},{"text":"Blue","color":"blue","clickEvent":{"action":"run_command","value":"/trigger ping_config set 13"}},{"text":" - "},{"text":"Purple","color":"dark_purple","clickEvent":{"action":"run_command","value":"/trigger ping_config set 14"}},{"text":" - "},{"text":"Magenta","color":"light_purple","clickEvent":{"action":"run_command","value":"/trigger ping_config set 15"}},{"text":" - "},{"text":"Pink","color":"#ffcccc"}] diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/ascend/initial_activate_particles.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/ascend/initial_activate_particles.mcfunction index 37762239..8e466f33 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/ascend/initial_activate_particles.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/ascend/initial_activate_particles.mcfunction @@ -1,5 +1,5 @@ -execute as @e[tag=xSQ] at @s run particle minecraft:dust 0.988 0.961 0.898 1 ~ ~.2 ~ 1 0 0 1 20 -execute as @e[tag=ySQ] at @s run particle minecraft:dust 0.988 0.961 0.898 1 ~ ~.2 ~ 0 0 1 1 20 +execute as @e[tag=xSQ] at @s run particle minecraft:dust{color:[0.988,0.961,0.898],scale:1} ~ ~.2 ~ 1 0 0 1 20 +execute as @e[tag=ySQ] at @s run particle minecraft:dust{color:[0.988,0.961,0.898],scale:1} ~ ~.2 ~ 0 0 1 1 20 execute as @a[scores={ascend_phase=0}] at @s unless entity @e[tag=ascend_north,distance=..10] run summon minecraft:area_effect_cloud ~ ~ ~-1 {Duration:30,Tags:["xSQ","ascend_north"]} execute as @a[scores={ascend_phase=0}] at @s unless entity @e[tag=ascend_south,distance=..10] run summon minecraft:area_effect_cloud ~ ~ ~1 {Duration:30,Tags:["xSQ","ascend_south"]} diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_down.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_down.mcfunction new file mode 100644 index 00000000..a17fe222 --- /dev/null +++ b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_down.mcfunction @@ -0,0 +1,39 @@ +tellraw @a[tag=debug_logging] {"text": "[Debug] Powering down Iridium Rod"} +item modify entity @s hotbar.0 nincodedo:powerdownnr +item modify entity @s hotbar.1 nincodedo:powerdownnr +item modify entity @s hotbar.2 nincodedo:powerdownnr +item modify entity @s hotbar.3 nincodedo:powerdownnr +item modify entity @s hotbar.4 nincodedo:powerdownnr +item modify entity @s hotbar.5 nincodedo:powerdownnr +item modify entity @s hotbar.6 nincodedo:powerdownnr +item modify entity @s hotbar.7 nincodedo:powerdownnr +item modify entity @s hotbar.8 nincodedo:powerdownnr +item modify entity @s inventory.0 nincodedo:powerdownnr +item modify entity @s inventory.1 nincodedo:powerdownnr +item modify entity @s inventory.2 nincodedo:powerdownnr +item modify entity @s inventory.3 nincodedo:powerdownnr +item modify entity @s inventory.4 nincodedo:powerdownnr +item modify entity @s inventory.5 nincodedo:powerdownnr +item modify entity @s inventory.6 nincodedo:powerdownnr +item modify entity @s inventory.7 nincodedo:powerdownnr +item modify entity @s inventory.8 nincodedo:powerdownnr +item modify entity @s inventory.9 nincodedo:powerdownnr +item modify entity @s inventory.10 nincodedo:powerdownnr +item modify entity @s inventory.11 nincodedo:powerdownnr +item modify entity @s inventory.12 nincodedo:powerdownnr +item modify entity @s inventory.13 nincodedo:powerdownnr +item modify entity @s inventory.14 nincodedo:powerdownnr +item modify entity @s inventory.15 nincodedo:powerdownnr +item modify entity @s inventory.16 nincodedo:powerdownnr +item modify entity @s inventory.17 nincodedo:powerdownnr +item modify entity @s inventory.18 nincodedo:powerdownnr +item modify entity @s inventory.19 nincodedo:powerdownnr +item modify entity @s inventory.20 nincodedo:powerdownnr +item modify entity @s inventory.21 nincodedo:powerdownnr +item modify entity @s inventory.22 nincodedo:powerdownnr +item modify entity @s inventory.23 nincodedo:powerdownnr +item modify entity @s inventory.24 nincodedo:powerdownnr +item modify entity @s inventory.25 nincodedo:powerdownnr +item modify entity @s inventory.26 nincodedo:powerdownnr +item modify entity @s armor.head nincodedo:powerdownnr +item modify entity @s weapon.offhand nincodedo:powerdownnr diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_up.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_up.mcfunction new file mode 100644 index 00000000..bf8af32a --- /dev/null +++ b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_up.mcfunction @@ -0,0 +1,39 @@ +tellraw @a[tag=debug_logging] {"text": "[Debug] Powering up Iridium Rod"} +item modify entity @s hotbar.0 nincodedo:powerupnr +item modify entity @s hotbar.1 nincodedo:powerupnr +item modify entity @s hotbar.2 nincodedo:powerupnr +item modify entity @s hotbar.3 nincodedo:powerupnr +item modify entity @s hotbar.4 nincodedo:powerupnr +item modify entity @s hotbar.5 nincodedo:powerupnr +item modify entity @s hotbar.6 nincodedo:powerupnr +item modify entity @s hotbar.7 nincodedo:powerupnr +item modify entity @s hotbar.8 nincodedo:powerupnr +item modify entity @s inventory.0 nincodedo:powerupnr +item modify entity @s inventory.1 nincodedo:powerupnr +item modify entity @s inventory.2 nincodedo:powerupnr +item modify entity @s inventory.3 nincodedo:powerupnr +item modify entity @s inventory.4 nincodedo:powerupnr +item modify entity @s inventory.5 nincodedo:powerupnr +item modify entity @s inventory.6 nincodedo:powerupnr +item modify entity @s inventory.7 nincodedo:powerupnr +item modify entity @s inventory.8 nincodedo:powerupnr +item modify entity @s inventory.9 nincodedo:powerupnr +item modify entity @s inventory.10 nincodedo:powerupnr +item modify entity @s inventory.11 nincodedo:powerupnr +item modify entity @s inventory.12 nincodedo:powerupnr +item modify entity @s inventory.13 nincodedo:powerupnr +item modify entity @s inventory.14 nincodedo:powerupnr +item modify entity @s inventory.15 nincodedo:powerupnr +item modify entity @s inventory.16 nincodedo:powerupnr +item modify entity @s inventory.17 nincodedo:powerupnr +item modify entity @s inventory.18 nincodedo:powerupnr +item modify entity @s inventory.19 nincodedo:powerupnr +item modify entity @s inventory.20 nincodedo:powerupnr +item modify entity @s inventory.21 nincodedo:powerupnr +item modify entity @s inventory.22 nincodedo:powerupnr +item modify entity @s inventory.23 nincodedo:powerupnr +item modify entity @s inventory.24 nincodedo:powerupnr +item modify entity @s inventory.25 nincodedo:powerupnr +item modify entity @s inventory.26 nincodedo:powerupnr +item modify entity @s armor.head nincodedo:powerupnr +item modify entity @s weapon.offhand nincodedo:powerupnr diff --git a/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/iridiumrod.mcfunction b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/iridiumrod.mcfunction index 09cbf1a7..5959280f 100644 --- a/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/iridiumrod.mcfunction +++ b/datapacks/ocw-stuff/data/nincodedo/functions/uniqueitems/iridiumrod.mcfunction @@ -1,118 +1,14 @@ -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:0b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.0 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:1b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.1 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:2b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.2 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:3b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.3 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:4b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.4 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:5b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.5 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:6b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.6 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:7b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.7 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:8b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.8 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:9b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.0 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:10b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.1 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:11b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.2 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:12b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.3 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:13b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.4 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:14b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.5 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:15b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.6 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:16b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.7 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:17b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.8 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:18b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.9 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:19b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.10 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:20b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.11 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:21b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.12 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:22b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.13 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:23b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.14 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:24b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.15 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:25b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.16 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:26b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.17 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:27b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.18 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:28b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.19 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:29b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.20 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:30b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.21 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:31b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.22 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:32b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.23 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:33b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.24 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:34b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.25 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:35b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.26 nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:103b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s armor.head nincodedo:powerupnr -execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:-106b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s weapon.offhand nincodedo:powerupnr +tellraw @a[tag=debug_logging] {"text": "[Debug] Iridium Rod Powered Start"} +execute if entity @s[nbt={Inventory:[{components:{"minecraft:enchantments":{levels:{}},"minecraft:custom_data":{"nincodedo:unique_item":"NR"}}}]}] run data remove storage nincodedo:storage iridium_rod +execute if entity @s[nbt={Inventory:[{components:{"minecraft:enchantments":{levels:{}},"minecraft:custom_data":{"nincodedo:unique_item":"NR"}}}]}] run data modify storage nincodedo:storage iridium_rod set from entity @s Inventory[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR"}}}] -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:0b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.0 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:1b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.1 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:2b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.2 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:3b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.3 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:4b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.4 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:5b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.5 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:6b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.6 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:7b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.7 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:8b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s hotbar.8 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:9b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.0 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:10b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.1 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:11b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.2 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:12b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.3 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:13b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.4 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:14b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.5 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:15b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.6 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:16b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.7 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:17b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.8 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:18b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.9 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:19b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.10 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:20b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.11 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:21b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.12 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:22b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.13 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:23b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.14 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:24b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.15 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:25b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.16 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:26b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.17 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:27b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.18 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:28b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.19 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:29b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.20 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:30b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.21 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:31b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.22 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:32b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.23 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:33b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.24 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:34b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.25 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:35b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s inventory.26 nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:103b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s armor.head nincodedo:powerdownnr -execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{Slot:-106b,tag:{NinUnique:"NR",NinPowered:1}}]}] run item modify entity @s weapon.offhand nincodedo:powerdownnr +execute if entity @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR","nincodedo:powered":0b}}}]}] run tellraw @a[tag=debug_logging] {"text": "[Debug] Powering up Iridium Rod for Nin"} +execute as @s[predicate=nincodedo:isentitynincodedo,nbt={Inventory:[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR","nincodedo:powered":0b}}}]}] run function nincodedo:uniqueitems/abilities/iridiumrod/power_up -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:0b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.0 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:1b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.1 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:2b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.2 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:3b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.3 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:4b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.4 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:5b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.5 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:6b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.6 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:7b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.7 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:8b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s hotbar.8 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:9b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.0 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:10b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.1 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:11b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.2 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:12b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.3 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:13b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.4 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:14b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.5 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:15b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.6 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:16b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.7 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:17b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.8 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:18b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.9 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:19b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.10 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:20b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.11 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:21b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.12 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:22b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.13 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:23b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.14 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:24b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.15 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:25b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.16 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:26b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.17 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:27b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.18 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:28b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.19 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:29b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.20 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:30b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.21 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:31b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.22 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:32b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.23 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:33b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.24 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:34b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.25 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:35b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s inventory.26 nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:103b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s armor.head nincodedo:powerupnr -execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{Slot:-106b,tag:{NinUnique:"NR",NinPowered:0}}]}] run item modify entity @s weapon.offhand nincodedo:powerupnr +execute if entity @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR","nincodedo:powered":1b}}}]}] run tellraw @a[tag=debug_logging] {"text": "[Debug] Powering down Iridium Rod"} +execute as @s[predicate=!nincodedo:isentitynincodedo,nbt={Inventory:[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR","nincodedo:powered":1b}}}]}] run function nincodedo:uniqueitems/abilities/iridiumrod/power_down + +execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR","nincodedo:powered":0b}}}]}] run tellraw @a[tag=debug_logging] {"text": "[Debug] Powering up Iridium Rod for debugging"} +execute if score config_debug rhcconfig matches 1 as @s[nbt={Inventory:[{components:{"minecraft:custom_data":{"nincodedo:unique_item":"NR","nincodedo:powered":0b}}}]}] run function nincodedo:uniqueitems/abilities/iridiumrod/power_up advancement revoke @s only nincodedo:unique_items/iridium_rod/any diff --git a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerdownnr.json b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerdownnr.json index 92e642c5..2f9c4daf 100644 --- a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerdownnr.json +++ b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerdownnr.json @@ -1,28 +1,23 @@ -[ - { - "function": "minecraft:copy_nbt", - "source": "this", - "ops": [ - { - "source": "Inventory[{tag:{NinUnique:\"NR\"}}].tag.AttributeModifiers", - "target": "StoredModifiers", - "op": "replace" +{ + "function": "minecraft:filtered", + "item_filter": { + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "NR" } - ] + } }, - { - "function": "minecraft:copy_nbt", - "source": "this", - "ops": [ - { - "source": "Inventory[{tag:{NinUnique:\"NR\"}}].tag.Enchantments", - "target": "StoredEnchantments", - "op": "replace" + "modifier": [ + { + "function": "minecraft:set_components", + "components": { + "!minecraft:attribute_modifiers": {}, + "!minecraft:enchantments": {}, + "minecraft:custom_data": { + "nincodedo:powered": 0, + "nincodedo:unique_item": "NR" + } } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{Enchantments:[], AttributeModifiers:[], NinPowered:0}" - } -] + } + ] +} diff --git a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerupnr.json b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerupnr.json index 3682f494..53f22abf 100644 --- a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerupnr.json +++ b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/powerupnr.json @@ -1,28 +1,48 @@ [ { - "function": "minecraft:copy_nbt", - "source": "this", - "ops": [ - { - "source": "Inventory[{tag:{NinUnique:\"NR\"}}].tag.StoredModifiers", - "target": "AttributeModifiers", - "op": "replace" + "function": "minecraft:filtered", + "item_filter": { + "predicates": { + "minecraft:custom_data": { + "nincodedo:unique_item": "NR" + } } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "this", - "ops": [ + }, + "modifier": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantments": {} + } + }, { - "source": "Inventory[{tag:{NinUnique:\"NR\"}}].tag.StoredEnchantments", - "target": "Enchantments", - "op": "replace" + "function": "minecraft:reference", + "name": "nincodedo:uniqueitems/iridium_rod_attributes" + }, + { + "function": "minecraft:set_enchantments", + "enchantments": { + "minecraft:lure": { + "type": "minecraft:storage", + "storage": "nincodedo:storage", + "path": "iridium_rod.components.\"minecraft:enchantments\".levels.\"minecraft:lure\"" + }, + "minecraft:luck_of_the_sea": { + "type": "minecraft:storage", + "storage": "nincodedo:storage", + "path": "iridium_rod.components.\"minecraft:enchantments\".levels.\"minecraft:luck_of_the_sea\"" + } + } + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "nincodedo:unique_item": "NR", + "nincodedo:powered": 1 + } + } } ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{NinPowered:1}" } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/set_boat_compass.json b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/set_boat_compass.json index 5d628637..b92328b0 100644 --- a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/set_boat_compass.json +++ b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/set_boat_compass.json @@ -1,68 +1,12 @@ [ { - "function": "minecraft:copy_nbt", - "source": "this", - "ops": [ - { - "source": "Pos[0]", - "target": "LodestonePos.X", - "op": "replace" - }, - { - "source": "Pos[1]", - "target": "LodestonePos.Y", - "op": "replace" - }, - { - "source": "Pos[2]", - "target": "LodestonePos.Z", - "op": "replace" - } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{LodestoneTracked:0b}" - }, - { - "function": "minecraft:set_nbt", - "tag": "{LodestoneDimension:\"minecraft:overworld\"}", - "conditions": [ - { - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:overworld" - } - } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{LodestoneDimension:\"minecraft:the_nether\"}", - "conditions": [ - { - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:the_nether" - } - } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{LodestoneDimension:\"minecraft:the_end\"}", - "conditions": [ - { - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:the_end" - } - } - ] + "function": "minecraft:set_custom_data", + "tag": "{NinUnique: \"BoatCompass\"}" }, { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Your Boat Compass", "italic": false @@ -81,6 +25,6 @@ "color": "gray" } ], - "replace": true + "mode": "replace_all" } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/item_modifiers/uniqueitems/iridium_rod_attributes.json b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/uniqueitems/iridium_rod_attributes.json new file mode 100644 index 00000000..7185b803 --- /dev/null +++ b/datapacks/ocw-stuff/data/nincodedo/item_modifiers/uniqueitems/iridium_rod_attributes.json @@ -0,0 +1,13 @@ +{ + "function": "minecraft:set_attributes", + "modifiers": [ + { + "attribute": "minecraft:generic.luck", + "name": "ExtraLucky", + "amount": 1, + "operation": "add_value", + "id": "ca0df48b-985f-4b72-9648-342c35e9d5b2", + "slot": "mainhand" + } + ] +} diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/cave_base/farm2.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/cave_base/farm2.json index 73b27ba4..fb2967a3 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/cave_base/farm2.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/cave_base/farm2.json @@ -109,7 +109,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/iridiumrod", + "value": "nincodedo:uniqueitems/iridiumrod", "conditions": [ { "condition": "minecraft:value_check", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/docs/faq_book.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/docs/faq_book.json index 2ca6a32e..0e351035 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/docs/faq_book.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/docs/faq_book.json @@ -6,16 +6,29 @@ "entries": [ { "type": "minecraft:item", - "weight": 4, "name": "minecraft:written_book", + "weight": 4, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'[{\"text\":\"OCW RHC FAQ \",\"italic\":false},{\"text\":\"v2\",\"color\":\"blue\"}]',Lore:['{\"text\":\"Last Updated: June 7th 2023\"}']},title:\"OCW RHC FAQ v2\",author:\"Nincodedo\",generation:1,resolved:1b,pages:['{\"text\":\"How do I get a free banner for mapping a specific location?\\\\n\\\\nUse the command `/trigger bannerplz`\"}','[{\"text\":\"What kind of structures can I get free banners for?\\\\nVillage: \"},{\"text\":\"Yellow\",\"color\":\"yellow\"},{\"text\":\"\\\\nRuined Portal: \"},{\"text\":\"Magenta\",\"color\":\"light_purple\"},{\"text\":\"\\\\nStronghold: \"},{\"text\":\"Green\",\"color\":\"dark_green\"},{\"text\":\"\\\\nSpawner: \"},{\"text\":\"Orange\",\"color\":\"#FFAA00\"},{\"text\":\"\\\\nAmethyst Geode: \"},{\"text\":\"Purple\",\"color\":\"dark_purple\"},{\"text\":\"\\\\nDesert Pyramid: \"},{\"text\":\"Cyan\",\"color\":\"aqua\"},{\"text\":\"\\\\nWoodland Mansion: \"},{\"text\":\"Brown\",\"color\":\"#964B00\"},{\"text\":\"\\\\n[NEW]\",\"bold\":true},{\"text\":\"OCW Structure: \"},{\"text\":\"Light Blue\",\"color\":\"#00829F\"}]','[{\"text\":\"Special non-Vanilla Game Mechanics\",\"underlined\":true},{\"text\":\"\\\\nBone Meal on Sugar Cane\",\"bold\":true,\"underlined\":false},{\"text\":\"\\\\nPlayers can use bone meal on sugar cane to make it grow. Dispensers filled with bone meal can grow sugar cane too.\",\"underlined\":false}]','[{\"text\":\"Poisonous Potatoes in Composter\",\"bold\":true},{\"text\":\"\\\\nPlayers can put poisonous potatoes into composters. Hoppers work too.\",\"bold\":false}]']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "OCW RHC FAQ v2", + "author": "Nincodedo", + "generation": 1, + "pages": [ + "[{\"text\":\"How do I get a free banner for mapping a specific location?\\n\\nUse the command `/trigger bannerplz`\"}]", + "[{\"text\":\"What kind of structures can I get free banners for?\\nVillage: \",\"extra\":[{\"text\":\"Yellow\",\"color\":\"yellow\"}]},{\"text\":\"\\nRuined Portal: \",\"extra\":[{\"text\":\"Magenta\",\"color\":\"light_purple\"}]},{\"text\":\"\\nStronghold: \",\"extra\":[{\"text\":\"Green\",\"color\":\"dark_green\"}]},{\"text\":\"\\nSpawner: \",\"extra\":[{\"text\":\"Orange\",\"color\":\"#FFAA00\"}]},{\"text\":\"\\nAmethyst Geode: \",\"extra\":[{\"text\":\"Purple\",\"color\":\"dark_purple\"}]},{\"text\":\"\\nDesert Pyramid: \",\"extra\":[{\"text\":\"Cyan\",\"color\":\"aqua\"}]},{\"text\":\"\\nWoodland Mansion: \",\"extra\":[{\"text\":\"Brown\",\"color\":\"#964B00\"}]},{\"text\":\"\\nOCW Structure: \",\"extra\":[{\"text\":\"Light Blue\",\"color\":\"#00829F\"}]}]", + "[{\"text\":\"Special non-Vanilla Game Mechanics\",\"underlined\":true},{\"text\":\"\\n\\nBone Meal on Sugar Cane\",\"bold\":true,\"underlined\":false},{\"text\":\"\\nPlayers can use bone meal on sugar cane to make it grow. Dispensers filled with bone meal can also grow sugar cane.\",\"underlined\":false}]", + "[{\"text\":\"Special non-Vanilla Game Mechanics\",\"underlined\":true},{\"text\":\"\\n\\nPoisonous Potatoes in Composter\",\"bold\":true,\"underlined\":false},{\"text\":\"\\nPlayers can put poisonous potatoes into composters. Hoppers work too.\",\"underlined\":false}]" + ], + "resolved": true + } + } } ] }, @@ -28,8 +41,17 @@ "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{display:{Name:'[{\"text\":\"OCW RHC FAQ: \",\"italic\":false},{\"text\":\"Special Edition\",\"color\":\"gold\",\"bold\":true,\"italic\":true}]'},title:\"OCW RHC FAQ: Special Edition\",author:\"Nincodedo\",generation:1,resolved:1b,pages:['[{\"text\":\"How do I become successful in this game?\\\\n\\\\n\"},{\"text\":\"Don\\'t die\",\"bold\":true}]']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "OCW RHC FAQ: Special Edition", + "author": "Nincodedo", + "generation": 1, + "pages": [ + "[{\"text\":\"How do I become successful in this game?\\n\\n\"},{\"text\":\"Don't die\",\"bold\":true}]" + ] + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/items/multiverse/tools/cobalt_pickaxe.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/items/multiverse/tools/cobalt_pickaxe.json index 30ee73bc..5e4e5457 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/items/multiverse/tools/cobalt_pickaxe.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/items/multiverse/tools/cobalt_pickaxe.json @@ -8,16 +8,15 @@ "name": "minecraft:diamond_pickaxe", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{HideFlags:1,RepairCost:40,CustomModelData:1010101,NinUnique:\"CobaltPickaxe\",Enchantments:[{}]}" - }, - { - "function": "minecraft:set_name", - "entity": "this", - "name": { - "text": "Cobalt Pickaxe", - "color": "blue", - "italic": false + "function": "minecraft:set_components", + "components": { + "minecraft:custom_model_data": 1010101, + "minecraft:repair_cost": 40, + "minecraft:enchantment_glint_override": true, + "minecraft:custom_data": { + "NinUnique": "CobaltPickaxe" + }, + "minecraft:item_name": "{\"text\":\"Cobalt Pickaxe\"}" } }, { @@ -39,7 +38,8 @@ "color": "gray", "italic": false } - ] + ], + "mode": "replace_all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/big2.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/big2.json index 2dd40488..b77bc6f5 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/big2.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/big2.json @@ -61,8 +61,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 1, "name": "minecraft:diamond", + "weight": 1, "functions": [ { "function": "minecraft:set_count", @@ -81,8 +81,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:iron_chestplate", + "weight": 2, "functions": [ { "function": "minecraft:enchant_with_levels", @@ -96,8 +96,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:iron_helmet", + "weight": 2, "functions": [ { "function": "minecraft:enchant_with_levels", @@ -144,7 +144,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/all" + "value": "nincodedo:uniqueitems/all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/stairs.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/stairs.json index e5af7015..64bce2aa 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/stairs.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/stairs.json @@ -16,7 +16,8 @@ { "text": "Bro, u lost?" } - ] + ], + "mode": "replace_all" } ] }, @@ -31,7 +32,8 @@ { "text": "Bro, u lost?" } - ] + ], + "mode": "replace_all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/terminator2.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/terminator2.json index 442666d4..7fc29f7d 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/terminator2.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/library/terminator2.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 2, "name": "minecraft:gold_ingot", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 4, "name": "minecraft:paper", + "weight": 4, "functions": [ { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/crafting.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/crafting.json index ba47ab45..b62ced2e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/crafting.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/crafting.json @@ -86,7 +86,7 @@ "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.5 + "chance": 0.75 } ] } @@ -123,7 +123,7 @@ "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.5 + "chance": 0.75 } ] } @@ -144,7 +144,7 @@ "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.5 + "chance": 0.75 } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/kitchen.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/kitchen.json index 9ffad434..7635d428 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/kitchen.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/kitchen.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 15, "name": "minecraft:apple", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -27,18 +27,18 @@ }, { "type": "minecraft:item", - "weight": 5, - "name": "minecraft:rotten_flesh" + "name": "minecraft:rotten_flesh", + "weight": 5 }, { "type": "minecraft:item", - "weight": 10, - "name": "minecraft:carrot" + "name": "minecraft:carrot", + "weight": 10 }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:wheat", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -83,7 +83,7 @@ } ] ], - "replace": true + "mode": "replace_all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/treasure2.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/treasure2.json index aa86434f..3512fe47 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/treasure2.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/metallinkhouse/treasure2.json @@ -11,63 +11,63 @@ "entries": [ { "type": "minecraft:item", - "weight": 6, - "name": "minecraft:chainmail_helmet" + "name": "minecraft:chainmail_helmet", + "weight": 6 }, { "type": "minecraft:item", - "weight": 6, - "name": "minecraft:chainmail_chestplate" + "name": "minecraft:chainmail_chestplate", + "weight": 6 }, { "type": "minecraft:item", - "weight": 6, - "name": "minecraft:chainmail_leggings" + "name": "minecraft:chainmail_leggings", + "weight": 6 }, { "type": "minecraft:item", - "weight": 6, - "name": "minecraft:chainmail_boots" + "name": "minecraft:chainmail_boots", + "weight": 6 }, { "type": "minecraft:item", - "weight": 4, - "name": "minecraft:iron_helmet" + "name": "minecraft:iron_helmet", + "weight": 4 }, { "type": "minecraft:item", - "weight": 4, - "name": "minecraft:iron_chestplate" + "name": "minecraft:iron_chestplate", + "weight": 4 }, { "type": "minecraft:item", - "weight": 4, - "name": "minecraft:iron_leggings" + "name": "minecraft:iron_leggings", + "weight": 4 }, { "type": "minecraft:item", - "weight": 4, - "name": "minecraft:iron_boots" + "name": "minecraft:iron_boots", + "weight": 4 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:diamond_helmet" + "name": "minecraft:diamond_helmet", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:diamond_chestplate" + "name": "minecraft:diamond_chestplate", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:diamond_leggings" + "name": "minecraft:diamond_leggings", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:diamond_boots" + "name": "minecraft:diamond_boots", + "weight": 2 } ], "functions": [ diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/advanced_furnace_recipes.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/advanced_furnace_recipes.json index c052e492..2c5a10a8 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/advanced_furnace_recipes.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/advanced_furnace_recipes.json @@ -9,12 +9,15 @@ "name": "minecraft:knowledge_book", "functions": [ { - "function": "minecraft:set_name", - "name": "Advanced Blast Furnace Recipes" - }, - { - "function": "minecraft:set_nbt", - "tag": "{Recipes:[\"nincodedo:copper_block_from_blasting_raw_copper_block\", \"nincodedo:gold_block_from_blasting_raw_gold_block\", \"nincodedo:iron_block_from_blasting_raw_iron_block\"]}" + "function": "minecraft:set_components", + "components": { + "minecraft:recipes": [ + "nincodedo:copper_block_from_blasting_raw_copper_block", + "nincodedo:gold_block_from_blasting_raw_gold_block", + "nincodedo:iron_block_from_blasting_raw_iron_block" + ], + "minecraft:item_name": "{\"text\":\"Advanced Blast Furnace Recipes\"}" + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/day_based.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/day_based.json index ad61864c..a6a233bf 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/day_based.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw/day_based.json @@ -22,8 +22,8 @@ }, { "type": "minecraft:item", - "weight": 16, - "name": "minecraft:shield" + "name": "minecraft:shield", + "weight": 16 } ], "conditions": [ diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_books.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_books.json index 47ce523b..216f89e1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_books.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_books.json @@ -6,91 +6,177 @@ "entries": [ { "type": "minecraft:item", - "weight": 1, "name": "minecraft:written_book", + "weight": 1, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{title:\"HappenedExtended\",author:\"Zedar\",generation:3,resolved:1b,pages:['{\"text\":\"Long ago, the gods of OCW Minecraft blessed a select few followers with great power, charging them with overseeing their world and maintaining it. One such follower was Greg, who had become close friends with another known as Zedar, who had not been\"}','{\"text\":\"chosen for a blessing. In time, however, the gods acknowledged him, and made him an equal with Greg. However, despite their friendship, Greg was angry at this decision, thinking Zedar unworthy of the power, though he held his tongue. For a time, peace\"}','{\"text\":\"prevailed in the world. That is, until the day Greg learned that Zedar had committed an act of great evil against him. Their friendship was broken, and Greg\\'s relationship with the gods was also strained, as they did not see fit to exile Zedar for his\"}','{\"text\":\"crime. After many weeks and much pleading on Zedar\\'s part, Greg was persuaded to relent, though the friendship was far from repaired. In time, things slowly began to return to normal, but new problems were brewing. Zedar acted foolishly, all unawares,\"}','{\"text\":\"which served to anger Greg, who still held his tongue. Beyond that, Zedar had become bored with the world he was charged to take care of, and began to misuse his powers for amusement at the expense of the inhabitants, and often to the unspoken\"}','{\"text\":\"exasperation of the gods. Finally, the foolishness became too much to bear, and Greg once again swore to never associate with Zedar, or the gods, again. Still not realizing his fault, Zedar tried many times to appease his former friend, to no avail,\"}','{\"text\":\"though Greg\\'s relationship with the gods was slowly re-established. As that year was drawing to a close, Zedar, finally realizing his fault and overcome with remorse, tried one last time to beg forgiveness from Greg. For reasons unknown even to\"}','{\"text\":\"himself, Greg chose to relent, one last time. Once again, the friendship was renewed, slowly at first, but within a month it was almost as if nothing had come between the two. Zedar proved himself to have changed for the better, though he had long since\"}','{\"text\":\"left the world of Minecraft behind, as even the cruel amusements had become tiresome. Months passed, and the gods began to prepare the world for change. Greg joined them in this, but warned them that Zedar would certainly return soon,\"}','{\"text\":\"no doubt wreaking havoc as he had the previous year. As predicted, Zedar appeared a short time before the changes were to take place, but it soon became clear that he had no intention of returning to his old ways. Pleased by this, the gods chose not to\"}','{\"text\":\"strip Zedar of his power, as Greg had counseled. When the changes took place and the world renewed, Zedar was absent for a time. When he finally reappeared, he retained his power, much to Greg\\'s anger. Unaware that the gods had relented, Greg\"}','{\"text\":\"vented his rage at Zedar, claiming that he was despised by all the gods and their other followers, which had been true before, but no longer. Zedar said nothing, but simply waited. However, Greg\\'s wrath only increased. Since the gods had not acted, Greg\"}','{\"text\":\"chose to pass judgement in their stead. He stripped Zedar of his power, in addition to two others for whom he held distaste. Still Zedar made no response, except to inform the gods of what had happened. In that instant the wrath of the gods was kindled\"}','{\"text\":\"against Greg, and he was forever banished from the land. However, Zedar asked for mercy, since his previous behavior was the cause of Greg\\'s wrath. The gods relented, and Greg was allowed to return, though only with diminished power. Upon his return,\"}','{\"text\":\"however, Greg paid no heed to the mercy granted to him, only choosing to see the punishment. After exchanging heated words with the gods, Greg did the unthinkable. Certain that he would never return in any case, Greg unleashed the ancient, forbidden\"}','{\"text\":\"power known as Vulcan upon the city of OCWville, the first and only settlement in the new world. In a fury, he pulverized the marketplace, also catching the tavern and the smithy in the blast. The gods quickly retaliated, banishing Greg once more. There\"}','{\"text\":\"would be no more mercy. However, the damage had already been done. The market was a smoking ruin, and the other buildings had to be completely rebuilt. Fortunately, Greg had not had time to turn his attention to the rest of the town, so the process of\"}','{\"text\":\"rebuilding was relatively short. The friendship between Greg and Zedar, however, was broken once more, as was the link between him and the gods. It is thought to be highly unlikely for either to be repaired. The gods were adamant that the second\"}','{\"text\":\"banishment be permanent, and Greg\\'s actions did not endear him to his now-former friend. Nonetheless, reconciliation may be possible after some time, but this event, this Happened, will not soon be forgotten.\"}']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "HappenedExtended", + "author": "Zedar", + "generation": 3, + "pages": [ + "[{\"text\":\"Long ago, the gods of OCW Minecraft blessed a select few followers with great power, charging them with overseeing their world and maintaining it. One such follower was Greg, who had become close friends with another known as Zedar, who had not been\"}]", + "[{\"text\":\"chosen for a blessing. In time, however, the gods acknowledged him, and made him an equal with Greg. However, despite their friendship, Greg was angry at this decision, thinking Zedar unworthy of the power, though he held his tongue. For a time, peace\"}]", + "[{\"text\":\"prevailed in the world. That is, until the day Greg learned that Zedar had committed an act of great evil against him. Their friendship was broken, and Greg's relationship with the gods was also strained, as they did not see fit to exile Zedar for his\"}]", + "[{\"text\":\"crime. After many weeks and much pleading on Zedar's part, Greg was persuaded to relent, though the friendship was far from repaired. In time, things slowly began to return to normal, but new problems were brewing. Zedar acted foolishly, all unawares,\"}]", + "[{\"text\":\"which served to anger Greg, who still held his tongue. Beyond that, Zedar had become bored with the world he was charged to take care of, and began to misuse his powers for amusement at the expense of the inhabitants, and often to the unspoken\"}]", + "[{\"text\":\"exasperation of the gods. Finally, the foolishness became too much to bear, and Greg once again swore to never associate with Zedar, or the gods, again. Still not realizing his fault, Zedar tried many times to appease his former friend, to no avail,\"}]", + "[{\"text\":\"though Greg's relationship with the gods was slowly re-established. As that year was drawing to a close, Zedar, finally realizing his fault and overcome with remorse, tried one last time to beg forgiveness from Greg. For reasons unknown even to\"}]", + "[{\"text\":\"himself, Greg chose to relent, one last time. Once again, the friendship was renewed, slowly at first, but within a month it was almost as if nothing had come between the two. Zedar proved himself to have changed for the better, though he had long since\"}]", + "[{\"text\":\"left the world of Minecraft behind, as even the cruel amusements had become tiresome. Months passed, and the gods began to prepare the world for change. Greg joined them in this, but warned them that Zedar would certainly return soon,\"}]", + "[{\"text\":\"no doubt wreaking havoc as he had the previous year. As predicted, Zedar appeared a short time before the changes were to take place, but it soon became clear that he had no intention of returning to his old ways. Pleased by this, the gods chose not to\"}]", + "[{\"text\":\"strip Zedar of his power, as Greg had counseled. When the changes took place and the world renewed, Zedar was absent for a time. When he finally reappeared, he retained his power, much to Greg's anger. Unaware that the gods had relented, Greg\"}]", + "[{\"text\":\"vented his rage at Zedar, claiming that he was despised by all the gods and their other followers, which had been true before, but no longer. Zedar said nothing, but simply waited. However, Greg's wrath only increased. Since the gods had not acted, Greg\"}]", + "[{\"text\":\"chose to pass judgement in their stead. He stripped Zedar of his power, in addition to two others for whom he held distaste. Still Zedar made no response, except to inform the gods of what had happened. In that instant the wrath of the gods was kindled\"}]", + "[{\"text\":\"against Greg, and he was forever banished from the land. However, Zedar asked for mercy, since his previous behavior was the cause of Greg's wrath. The gods relented, and Greg was allowed to return, though only with diminished power. Upon his return,\"}]", + "[{\"text\":\"however, Greg paid no heed to the mercy granted to him, only choosing to see the punishment. After exchanging heated words with the gods, Greg did the unthinkable. Certain that he would never return in any case, Greg unleashed the ancient, forbidden\"}]", + "[{\"text\":\"power known as Vulcan upon the city of OCWville, the first and only settlement in the new world. In a fury, he pulverized the marketplace, also catching the tavern and the smithy in the blast. The gods quickly retaliated, banishing Greg once more. There\"}]", + "[{\"text\":\"would be no more mercy. However, the damage had already been done. The market was a smoking ruin, and the other buildings had to be completely rebuilt. Fortunately, Greg had not had time to turn his attention to the rest of the town, so the process of\"}]", + "[{\"text\":\"rebuilding was relatively short. The friendship between Greg and Zedar, however, was broken once more, as was the link between him and the gods. It is thought to be highly unlikely for either to be repaired. The gods were adamant that the second\"}]", + "[{\"text\":\"banishment be permanent, and Greg's actions did not endear him to his now-former friend. Nonetheless, reconciliation may be possible after some time, but this event, this Happened, will not soon be forgotten.\"}]" + ], + "resolved": true + } + } } ] }, { "type": "minecraft:item", - "weight": 1, "name": "minecraft:written_book", + "weight": 1, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{title:\"Caving 101\",author:\"Ace Jon\",generation:3,resolved:1b,pages:['{\"text\":\"When you\\'re in a cave, put torches on the left so you and future spelunkers don\\'t get lost! Duh.\"}']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "Caving 101", + "author": "Ace Jon", + "generation": 3, + "pages": [ + "[{\"text\":\"When you're in a cave, put torches on the left so you and future spelunkers don't get lost! Duh.\"}]" + ], + "resolved": true + } + } } ] }, { "type": "minecraft:item", - "weight": 1, "name": "minecraft:written_book", + "weight": 1, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{title:\"Lost Knowledge Vol 1\",author:\"???\",generation:3,resolved:1b,pages:['[{\"text\":\"Hidden Recipes\n\"},{\"text\":\"| p | p | p |\n| p | p | p |\n| r | p | r |\n\"},{\"text\":\"\np = Pink Woll\nr = Red Woll\n\nI think that blue fellow would like one of these...\"}]']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "Lost Knowledge Vol 1", + "author": "???", + "generation": 3, + "pages": [ + "[{\"text\":\"Hidden Recipes\\n\"},{\"text\":\"| p | p | p |\\n| p | p | p |\\n| r | p | r |\\n\"},{\"text\":\"\\np = Pink Woll\\nr = Red Woll\\n\\nI think that blue fellow would like one of these...\"}]" + ], + "resolved": true + } + } } ] }, { "type": "minecraft:item", - "weight": 1, "name": "minecraft:written_book", + "weight": 1, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{title:\"Forbidden Wing\",author:\"Zedar\",generation:3,resolved:1b,pages:['{\"text\":\"It is a little-known fact that the library you now stand in is not the first library to exist in this location.\nBefore the arrival of the OCWers, when Skyfort Mishrak was still a mighty stronghold, a great library, perhaps ten times the size of the\"}','{\"text\":\"present structure, stood here. Its vast wings contained the sum of all the knowledge of the ancient civilizations. Unfortunately, the surrounding earth proved to be unstable, and the building was demolished beyond any hope of repair, with only a small\"}','{\"text\":\"section escaping unscathed, forming\nthe library as we know it today.\nYet rumors persist of another surviving section, known as The Forbidden Wing. It is said that this dark wing was hidden in the deepest depths of the ancient library, filled with \"}','{\"text\":\"knowledge of the oldest magic. The wing housed many powerful relics and thousands of tomes, waiting to give up their secrets to those with a lust for power and the skill to bend the magic to their will.\nHowever, it must be stated that the existence of The\"}','{\"text\":\"Forbidden Wing, much less its survival, is still only a rumor at this point. However, if it is still intact, it may not be far from the library.\nTo those who would seek it out, take caution. Having been buried in darkness for so long, it would no doubt be\"}','{\"text\":\"crawling with foul creatures. For those brave enough to face the danger, however, The Forbidden Wing, if it exists, may prove to be a great source of knowledge, and perhaps even greater treasure.\"}']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "Forbidden Wing", + "author": "Zedar", + "generation": 3, + "pages": [ + "[{\"text\":\"It is a little-known fact that the library you now stand in is not the first library to exist in this location.\\nBefore the arrival of the OCWers, when Skyfort Mishrak was still a mighty stronghold, a great library, perhaps ten times the size of the\"}]", + "[{\"text\":\"present structure, stood here. Its vast wings contained the sum of all the knowledge of the ancient civilizations. Unfortunately, the surrounding earth proved to be unstable, and the building was demolished beyond any hope of repair, with only a small\"}]", + "[{\"text\":\"section escaping unscathed, forming\\nthe library as we know it today.\\nYet rumors persist of another surviving section, known as The Forbidden Wing. It is said that this dark wing was hidden in the deepest depths of the ancient library, filled with \"}]", + "[{\"text\":\"knowledge of the oldest magic. The wing housed many powerful relics and thousands of tomes, waiting to give up their secrets to those with a lust for power and the skill to bend the magic to their will.\\nHowever, it must be stated that the existence of The\"}]", + "[{\"text\":\"Forbidden Wing, much less its survival, is still only a rumor at this point. However, if it is still intact, it may not be far from the library.\\nTo those who would seek it out, take caution. Having been buried in darkness for so long, it would no doubt be\"}]", + "[{\"text\":\"crawling with foul creatures. For those brave enough to face the danger, however, The Forbidden Wing, if it exists, may prove to be a great source of knowledge, and perhaps even greater treasure.\"}]" + ], + "resolved": true + } + } } ] }, { "type": "minecraft:item", - "weight": 1, "name": "minecraft:written_book", + "weight": 1, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{title:\"The Power of The Forbidden Wing\",author:\"???\",generation:2,resolved:1b,pages:['{\"text\":\"The Forbidden Wing of the library had long been ignored by the OCWers. They were off to different worlds and adventures. However, the dark magic in that wing of the library had never been defeated. In fact it was growing. Expanding.\"}','{\"text\":\"The Forbidden Wing expanded out in all directions, attempting to reclaim its former glory, restore its power, and get revenge on the OCWers that abandoned it.\"}','[{\"text\":\"Map to The Forbidden Wing\n\n\n\"},{\"text\":\"(Tear out the map? Click here)\",\"italic\":true,\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/function nincodedo:quests/librarymap\"}}]']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "The Power of The Forbidden Wing", + "author": "???", + "generation": 2, + "pages": [ + "[{\"text\":\"The Forbidden Wing of the library had long been ignored by the OCWers. They were off to different worlds and adventures. However, the dark magic in that wing of the library had never been defeated. In fact it was growing. Expanding.\"}]", + "[{\"text\":\"The Forbidden Wing expanded out in all directions, attempting to reclaim its former glory, restore its power, and get revenge on the OCWers that abandoned it.\"}]", + "[[{\"text\":\"Map to The Forbidden Wing\\n\\n\\n\"},{\"text\":\"(Tear out the map? Click here)\",\"italic\":true,\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/function nincodedo:quests/librarymap\"}}]]" + ], + "resolved": true + } + } } ] }, { "type": "minecraft:item", - "weight": 1, "name": "minecraft:written_book", + "weight": 1, "functions": [ { "function": "minecraft:set_count", "count": 1 }, { - "function": "minecraft:set_nbt", - "tag": "{title:\"Lost Knowledge Vol 4\",author:\"The Inventor\",generation:1,resolved:1b,pages:['[{\"text\":\"My latest creation! The \\\\\"\"},{\"text\":\"Find The Boat You Just Got Out Of 5000\",\"italic\":true},{\"text\":\".\\\\\" The name might need some work. I have a Name Guy, they\\'ll come up with something good. They always do. Anyways, you just gotta surround a compass with boats in a crafting table and BAM. \",\"italic\":false}]','[{\"text\":\"Find The Boat You Just Got Out Of 5000\",\"italic\":true},{\"text\":\". \",\"italic\":false},{\"italic\":false,\"text\":\"Name Guy is on it. It\\'ll be great.\"}]']}" + "function": "minecraft:set_components", + "components": { + "minecraft:written_book_content": { + "title": "Lost Knowledge Vol 4", + "author": "The Inventor", + "generation": 1, + "pages": [ + "[{\"text\":\"My latest creation! The \\\"\"},{\"text\":\"Find The Boat You Just Got Out Of 5000\",\"italic\":true},{\"text\":\"\\\". The name might need some work. I have a Name Guy, they'll come up with something good. They always do. Anyways, you just gotta surround a compass with boats in a crafting table and BAM. \",\"italic\":false}]", + "[{\"text\":\"Find The Boat You Just Got Out Of 5000\",\"italic\":true},{\"text\":\"Name Guy is on it. It'll be great.\",\"italic\":false}]" + ], + "resolved": true + } + } } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_library_map.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_library_map.json index e7fa4470..36cbc334 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_library_map.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_library_map.json @@ -36,7 +36,8 @@ { "text": "bunch of books drawn on it." } - ] + ], + "mode": "replace_all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_map.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_map.json index 1834d293..cfea5fd3 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_map.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_map.json @@ -22,6 +22,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Ancient OCW Structure Map", "italic": false @@ -37,7 +38,8 @@ { "text": "blue blob thing on the back of the map." } - ] + ], + "mode": "replace_all" } ] }, @@ -59,6 +61,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Ancient OCW Structure Map", "italic": false @@ -71,7 +74,8 @@ { "text": "The entire map is covered in sand." } - ] + ], + "mode": "replace_all" } ] }, @@ -93,6 +97,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Ancient OCW Structure Map", "italic": false @@ -115,7 +120,8 @@ "color": "gold", "italic": false } - ] + ], + "mode": "replace_all" } ] }, @@ -137,6 +143,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Ancient OCW Structure Map", "italic": false @@ -162,21 +169,24 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Ancient OCW Structure Map", "italic": false } }, { - "function": "minecraft:set_nbt", - "tag": "{Enchantments:[{id:\"minecraft:fire_protection\",lvl:1s}]}" + "function": "minecraft:set_enchantments", + "enchantments": { + "minecraft:fire_protection": 1 + } } ] }, { "type": "minecraft:item", - "quality": 5, "name": "minecraft:map", + "quality": 5, "functions": [ { "function": "minecraft:reference", @@ -191,6 +201,7 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "text": "Ancient OCW Structure Map", "color": "gold", @@ -207,7 +218,8 @@ { "text": "bunch of books drawn on it." } - ] + ], + "mode": "replace_all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/large.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/large.json index ef7c39e9..91e848d1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/large.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/large.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 5, "name": "minecraft:diamond", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:iron_ingot", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -43,8 +43,8 @@ }, { "type": "minecraft:item", - "weight": 12, "name": "minecraft:gold_ingot", + "weight": 12, "functions": [ { "function": "minecraft:set_count", @@ -59,8 +59,8 @@ }, { "type": "minecraft:item", - "weight": 5, "name": "minecraft:emerald", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -75,8 +75,8 @@ }, { "type": "minecraft:item", - "weight": 12, "name": "minecraft:cooked_beef", + "weight": 12, "functions": [ { "function": "minecraft:set_count", @@ -91,9 +91,9 @@ }, { "type": "minecraft:item", + "name": "minecraft:book", "weight": 9, "quality": 10, - "name": "minecraft:book", "functions": [ { "function": "minecraft:enchant_with_levels", @@ -104,9 +104,9 @@ }, { "type": "minecraft:item", + "name": "minecraft:netherite_scrap", "weight": 3, "quality": 10, - "name": "minecraft:netherite_scrap", "functions": [ { "function": "minecraft:set_count", @@ -119,8 +119,8 @@ }, { "type": "minecraft:item", - "quality": 15, - "name": "minecraft:diamond_block" + "name": "minecraft:diamond_block", + "quality": 15 } ] }, @@ -129,7 +129,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw/day_based" + "value": "nincodedo:ocw/day_based" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/medium.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/medium.json index 8f85ac7d..041e3145 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/medium.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/medium.json @@ -15,8 +15,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 3, "name": "minecraft:diamond", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -31,8 +31,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:iron_ingot", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -47,8 +47,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:gold_ingot", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -63,8 +63,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:bamboo", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -79,8 +79,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:emerald", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -95,8 +95,8 @@ }, { "type": "minecraft:item", - "weight": 20, "name": "minecraft:bone", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -111,8 +111,8 @@ }, { "type": "minecraft:item", - "weight": 16, "name": "minecraft:apple", + "weight": 16, "functions": [ { "function": "minecraft:set_count", @@ -127,8 +127,8 @@ }, { "type": "minecraft:item", - "weight": 3, - "name": "minecraft:saddle" + "name": "minecraft:saddle", + "weight": 3 }, { "type": "minecraft:item", @@ -144,8 +144,8 @@ }, { "type": "minecraft:item", - "quality": 10, "name": "minecraft:book", + "quality": 10, "functions": [ { "function": "minecraft:enchant_with_levels", @@ -161,7 +161,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw/day_based" + "value": "nincodedo:ocw/day_based" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/small.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/small.json index 379289df..c0568724 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/small.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_struct/small.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 4, "name": "minecraft:redstone", + "weight": 4, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 7, "name": "minecraft:bread", + "weight": 7, "functions": [ { "function": "minecraft:set_count", @@ -43,8 +43,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:lapis_lazuli", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -59,8 +59,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:gold_ingot", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -75,8 +75,8 @@ }, { "type": "minecraft:item", - "weight": 2, "name": "minecraft:emerald", + "weight": 2, "functions": [ { "function": "minecraft:set_count", @@ -116,7 +116,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:ocw/day_based" + "value": "nincodedo:ocw/day_based" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_tavern.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_tavern.json index 8fbd7826..4bbec18e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_tavern.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/ocw_tavern.json @@ -11,9 +11,9 @@ "entries": [ { "type": "minecraft:item", + "name": "minecraft:emerald", "weight": 1, "quality": 5, - "name": "minecraft:emerald", "functions": [ { "function": "minecraft:set_count", @@ -28,8 +28,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:cooked_porkchop", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -44,8 +44,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:bread", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -60,8 +60,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:cooked_beef", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -76,8 +76,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:cooked_mutton", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -92,8 +92,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:cooked_cod", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -108,8 +108,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:cooked_salmon", + "weight": 3, "functions": [ { "function": "minecraft:set_count", @@ -124,8 +124,8 @@ }, { "type": "minecraft:item", - "weight": 3, "name": "minecraft:cookie", + "weight": 3, "functions": [ { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/adventure/kill_a_mob.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/adventure/kill_a_mob.json index c6f93e28..804e7a5e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/adventure/kill_a_mob.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/adventure/kill_a_mob.json @@ -52,7 +52,7 @@ ], "functions": [ { - "function": "minecraft:copy_nbt", + "function": "minecraft:copy_custom_data", "source": { "type": "minecraft:storage", "source": "nincodedo:storage" @@ -68,6 +68,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Day 1 Sword", "italic": false @@ -96,7 +97,7 @@ "min": 0, "max": 2 }, - "minecraft:sweeping": { + "minecraft:sweeping_edge": { "min": 0, "max": 3 }, @@ -120,7 +121,8 @@ { "text": "Reward from killing a mob." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/end/root.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/end/root.json index bb59adc6..7b5650d5 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/end/root.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/end/root.json @@ -9,8 +9,12 @@ "name": "minecraft:ender_eye", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_count", @@ -32,7 +36,8 @@ { "text": "Reward from going to The End." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/cats.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/cats.json index d29c0a7d..1e434e0b 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/cats.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/cats.json @@ -15,8 +15,12 @@ ], "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_count", @@ -32,7 +36,8 @@ { "text": "Reward from breeding cats." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/deforestation.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/deforestation.json index aea60736..dcf80d0d 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/deforestation.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/deforestation.json @@ -9,8 +9,12 @@ "name": "minecraft:golden_axe", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:enchant_with_levels", @@ -24,6 +28,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Day 1 Axe", "italic": false @@ -43,7 +48,8 @@ { "text": "Reward from cutting down trees." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/first_day_shield.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/first_day_shield.json index 3a96ce46..de7c3575 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/first_day_shield.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/first_day_shield.json @@ -11,8 +11,12 @@ ], "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_count", @@ -28,7 +32,8 @@ { "text": "Reward from crafting a shield." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice.json index aeef8cf9..da23d144 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice.json @@ -9,7 +9,7 @@ "children": [ { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/1", + "value": "nincodedo:rewards/goodgoals/nice/1", "conditions": [ { "condition": "minecraft:random_chance", @@ -19,7 +19,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/2", + "value": "nincodedo:rewards/goodgoals/nice/2", "conditions": [ { "condition": "minecraft:random_chance", @@ -29,7 +29,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/3", + "value": "nincodedo:rewards/goodgoals/nice/3", "conditions": [ { "condition": "minecraft:random_chance", @@ -39,7 +39,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/4", + "value": "nincodedo:rewards/goodgoals/nice/4", "conditions": [ { "condition": "minecraft:random_chance", @@ -52,8 +52,12 @@ "name": "minecraft:stone_hoe", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -73,7 +77,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -94,7 +99,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/6", + "value": "nincodedo:rewards/goodgoals/nice/6", "conditions": [ { "condition": "minecraft:random_chance", @@ -104,7 +109,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/7", + "value": "nincodedo:rewards/goodgoals/nice/7", "conditions": [ { "condition": "minecraft:random_chance", @@ -114,7 +119,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/8", + "value": "nincodedo:rewards/goodgoals/nice/8", "conditions": [ { "condition": "minecraft:random_chance", @@ -124,7 +129,7 @@ }, { "type": "minecraft:loot_table", - "name": "nincodedo:rewards/goodgoals/nice/9" + "value": "nincodedo:rewards/goodgoals/nice/9" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/1.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/1.json index e4df85ce..c6be9d3f 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/1.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/1.json @@ -9,8 +9,12 @@ "name": "minecraft:poisonous_potato", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:poisonous_potato", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/2.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/2.json index 395b1932..e5ac6792 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/2.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/2.json @@ -9,8 +9,12 @@ "name": "minecraft:dead_bush", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:dead_bush", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/3.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/3.json index 0e469794..59c60ed1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/3.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/3.json @@ -9,8 +9,12 @@ "name": "minecraft:clay_ball", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:clay_ball", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/4.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/4.json index b9054acc..8cf76c09 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/4.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/4.json @@ -9,8 +9,12 @@ "name": "minecraft:brick", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:brick", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/6.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/6.json index c5b8db85..5dfbf03b 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/6.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/6.json @@ -9,8 +9,12 @@ "name": "minecraft:dirt", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:dirt", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/7.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/7.json index 98c655aa..3724b9f7 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/7.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/7.json @@ -9,8 +9,12 @@ "name": "minecraft:cobblestone", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:cobblestone", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/8.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/8.json index 756b338f..9401ad96 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/8.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/8.json @@ -9,8 +9,12 @@ "name": "minecraft:raw_iron", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:raw_iron", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/9.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/9.json index 44251f55..4cbb5ad1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/9.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/nice/9.json @@ -9,8 +9,12 @@ "name": "minecraft:diamond", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -30,7 +34,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", @@ -48,8 +53,12 @@ "name": "minecraft:diamond", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -69,7 +78,8 @@ } ] } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/structures/any.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/structures/any.json index b2e3d24e..e1fec286 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/structures/any.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/goodgoals/structures/any.json @@ -9,8 +9,12 @@ "name": "minecraft:golden_boots", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_attributes", @@ -19,7 +23,7 @@ "attribute": "minecraft:generic.movement_speed", "name": "woosh", "amount": 0.12, - "operation": "multiply_total", + "operation": "add_multiplied_total", "id": "141b494c-0c8c-449f-8999-68d42b10945a", "slot": "feet" } @@ -37,6 +41,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Day 1 Boots", "italic": false @@ -56,7 +61,8 @@ { "text": "Reward from going to any OCW structure." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/husbandry/plant_seed.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/husbandry/plant_seed.json index eb75db2e..95207e25 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/husbandry/plant_seed.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/husbandry/plant_seed.json @@ -9,8 +9,12 @@ "name": "minecraft:golden_hoe", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:enchant_with_levels", @@ -24,6 +28,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Day 1 Hoe", "italic": false @@ -43,7 +48,8 @@ { "text": "Reward from planting a seed." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enchant_item.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enchant_item.json index dcb780c2..28abffdb 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enchant_item.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enchant_item.json @@ -8,8 +8,12 @@ "name": "minecraft:lapis_lazuli", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_count", @@ -25,7 +29,8 @@ { "text": "Reward from enchanting an item." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enter_the_nether.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enter_the_nether.json index 889c2693..9f55aea1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enter_the_nether.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/enter_the_nether.json @@ -8,8 +8,12 @@ "name": "minecraft:lava_bucket", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -18,7 +22,8 @@ { "text": "Reward from going to The Nether." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/lava_bucket.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/lava_bucket.json index 10dedb2d..48305367 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/lava_bucket.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/lava_bucket.json @@ -8,8 +8,12 @@ "name": "minecraft:coal", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_count", @@ -25,7 +29,8 @@ { "text": "Reward from getting a lava bucket." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/mine_diamond.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/mine_diamond.json index 791cc350..1187421a 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/mine_diamond.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/mine_diamond.json @@ -9,8 +9,12 @@ "name": "minecraft:iron_pickaxe", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_lore", @@ -19,7 +23,8 @@ { "text": "Reward from getting diamonds." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/upgrade_tools.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/upgrade_tools.json index 9a288726..ee551429 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/upgrade_tools.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/story/upgrade_tools.json @@ -9,8 +9,12 @@ "name": "minecraft:golden_pickaxe", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:enchant_with_levels", @@ -24,6 +28,7 @@ { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Day 1 Pickaxe", "italic": false @@ -51,7 +56,8 @@ { "text": "Reward from getting an iron pickaxe." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/you_should_be_dead.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/you_should_be_dead.json index 74b0869f..86ad8fbe 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/you_should_be_dead.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/rewards/you_should_be_dead.json @@ -9,8 +9,12 @@ "name": "minecraft:enchanted_book", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinReward:1}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": { + "NinReward": 1 + } + } }, { "function": "minecraft:set_enchantments", @@ -29,7 +33,8 @@ { "text": "Reward from \"You should have died\" advancement." } - ] + ], + "mode": "replace_all" }, { "function": "minecraft:reference", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/towers/regular.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/towers/regular.json index 04eca56b..8a3f63d2 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/towers/regular.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/towers/regular.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 5, "name": "minecraft:diamond", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:iron_ingot", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -43,8 +43,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:gold_ingot", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -59,8 +59,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:emerald", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -75,8 +75,8 @@ }, { "type": "minecraft:item", - "weight": 20, "name": "minecraft:book", + "weight": 20, "functions": [ { "function": "minecraft:enchant_randomly" @@ -85,13 +85,13 @@ }, { "type": "minecraft:item", - "weight": 20, - "name": "minecraft:golden_apple" + "name": "minecraft:golden_apple", + "weight": 20 }, { "type": "minecraft:item", - "weight": 2, - "name": "minecraft:enchanted_golden_apple" + "name": "minecraft:enchanted_golden_apple", + "weight": 2 }, { "type": "minecraft:empty", @@ -104,7 +104,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/torchbow" + "value": "nincodedo:uniqueitems/torchbow" } ] }, diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/triggers/banners.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/triggers/banners.json index 842a484c..717cbf5e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/triggers/banners.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/triggers/banners.json @@ -16,31 +16,31 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:village_desert" + "structures": "minecraft:village_desert" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:village_plains" + "structures": "minecraft:village_plains" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:village_savanna" + "structures": "minecraft:village_savanna" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:village_snowy" + "structures": "minecraft:village_snowy" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:village_taiga" + "structures": "minecraft:village_taiga" } } ] @@ -57,43 +57,43 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal" + "structures": "minecraft:ruined_portal" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal_desert" + "structures": "minecraft:ruined_portal_desert" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal_jungle" + "structures": "minecraft:ruined_portal_jungle" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal_mountain" + "structures": "minecraft:ruined_portal_mountain" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal_nether" + "structures": "minecraft:ruined_portal_nether" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal_ocean" + "structures": "minecraft:ruined_portal_ocean" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ruined_portal_swamp" + "structures": "minecraft:ruined_portal_swamp" } } ] @@ -107,7 +107,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:stronghold" + "structures": "minecraft:stronghold" } } ] @@ -156,7 +156,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:desert_pyramid" + "structures": "minecraft:desert_pyramid" } } ] @@ -168,7 +168,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:mansion" + "structures": "minecraft:mansion" } } ] @@ -190,7 +190,7 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "minecraft:ancient_city" + "structures": "minecraft:ancient_city" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/basement.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/basement.json index 6f66a044..0aded007 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/basement.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/basement.json @@ -5,14 +5,14 @@ "rolls": { "type": "minecraft:uniform", "min": 1, - "max": 1 + "max": 2 }, "bonus_rolls": 2, "entries": [ { "type": "minecraft:item", - "weight": 3, - "name": "minecraft:iron_pickaxe" + "name": "minecraft:iron_pickaxe", + "weight": 2 }, { "type": "minecraft:item", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_left.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_left.json index e1163c64..e004c7e8 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_left.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_left.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 20, "name": "minecraft:book", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 20, "name": "minecraft:paper", + "weight": 20, "functions": [ { "function": "minecraft:set_count", @@ -51,8 +51,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:book", + "weight": 10, "functions": [ { "function": "minecraft:enchant_with_levels", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_right.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_right.json index 71cb294c..4b33568e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_right.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/fireplace_right.json @@ -30,7 +30,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/nightvision", + "value": "nincodedo:uniqueitems/nightvision", "conditions": [ { "condition": "minecraft:value_check", @@ -53,7 +53,7 @@ "entries": [ { "type": "minecraft:loot_table", - "name": "nincodedo:uniqueitems/moondagger", + "value": "nincodedo:uniqueitems/moondagger", "conditions": [ { "condition": "minecraft:value_check", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/rafters.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/rafters.json index 765d1f15..f774e239 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/rafters.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/undeadcottage/rafters.json @@ -11,8 +11,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 5, "name": "minecraft:diamond", + "weight": 5, "functions": [ { "function": "minecraft:set_count", @@ -27,8 +27,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:iron_ingot", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -43,8 +43,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:gold_ingot", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -59,8 +59,8 @@ }, { "type": "minecraft:item", - "weight": 15, "name": "minecraft:emerald", + "weight": 15, "functions": [ { "function": "minecraft:set_count", @@ -75,8 +75,8 @@ }, { "type": "minecraft:item", - "weight": 25, "name": "minecraft:bone", + "weight": 25, "functions": [ { "function": "minecraft:set_count", @@ -91,8 +91,8 @@ }, { "type": "minecraft:item", - "weight": 25, "name": "minecraft:rotten_flesh", + "weight": 25, "functions": [ { "function": "minecraft:set_count", @@ -107,8 +107,8 @@ }, { "type": "minecraft:item", - "weight": 20, "name": "minecraft:book", + "weight": 20, "functions": [ { "function": "minecraft:enchant_randomly" @@ -127,8 +127,8 @@ "entries": [ { "type": "minecraft:item", - "weight": 10, "name": "minecraft:bone", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -143,8 +143,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:gunpowder", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -159,8 +159,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:rotten_flesh", + "weight": 10, "functions": [ { "function": "minecraft:set_count", @@ -175,8 +175,8 @@ }, { "type": "minecraft:item", - "weight": 10, "name": "minecraft:string", + "weight": 10, "functions": [ { "function": "minecraft:set_count", diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/ascend.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/ascend.json index 778ffd94..02913199 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/ascend.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/ascend.json @@ -8,12 +8,23 @@ "name": "minecraft:carrot_on_a_stick", "functions": [ { - "function": "minecraft:set_nbt", - "tag": "{NinPowered:1,NinUnique:\"Ascend\",Enchantments:[{}],CustomModelData:1,Unbreakable:1b}" + "function": "minecraft:set_components", + "components": { + "minecraft:unbreakable": { + "show_in_tooltip": false + }, + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": 1, + "minecraft:custom_data": { + "nincodedo:powered": 1, + "nincodedo:unique_item": "Ascend" + } + } }, { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Ascend", "color": "green", @@ -39,11 +50,12 @@ "color": "gray", "extra": [ { - "text": ": Initially Activate Ascend" + "text": ": Activate Ascend" } ] } - ] + ], + "mode": "replace_all" } ] } diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/iridiumrod.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/iridiumrod.json index 97ac882b..46b8568f 100644 --- a/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/iridiumrod.json +++ b/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/iridiumrod.json @@ -9,25 +9,26 @@ "name": "minecraft:fishing_rod", "functions": [ { - "function": "minecraft:set_attributes", - "modifiers": [ - { - "attribute": "minecraft:generic.luck", - "name": "ExtraLucky", - "amount": 1, - "operation": "addition", - "id": "ca0df48b-985f-4b72-9648-342c35e9d5b2", - "slot": "mainhand" - } - ] + "function": "minecraft:reference", + "name": "nincodedo:uniqueitems/iridium_rod_attributes" }, { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:1010101,NinUnique:\"NR\",NinPowered:1,Unbreakable:1b}" + "function": "minecraft:set_components", + "components": { + "minecraft:custom_model_data": 1010101, + "minecraft:unbreakable": { + "show_in_tooltip": false + }, + "minecraft:custom_data": { + "nincodedo:unique_item": "NR", + "nincodedo:powered": 1 + } + } }, { "function": "minecraft:set_name", "entity": "this", + "target": "item_name", "name": { "text": "Nin's Iridium Fishing Rod", "color": "dark_purple", @@ -49,7 +50,7 @@ "text": "Only Nin can use this." } ], - "replace": true + "mode": "replace_all" }, { "function": "minecraft:set_enchantments", diff --git a/datapacks/ocw-stuff/data/nincodedo/predicates/any_ocw_structure.json b/datapacks/ocw-stuff/data/nincodedo/predicates/any_ocw_structure.json index 2b42a924..6909ee3a 100644 --- a/datapacks/ocw-stuff/data/nincodedo/predicates/any_ocw_structure.json +++ b/datapacks/ocw-stuff/data/nincodedo/predicates/any_ocw_structure.json @@ -4,49 +4,49 @@ { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:cave_base_roof" + "structures": "nincodedo:cave_base_roof" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:metal_link_house" + "structures": "nincodedo:metal_link_house" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:library_hidden_wing" + "structures": "nincodedo:library_hidden_wing" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:mountacemore" + "structures": "nincodedo:mountacemore" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:small_library" + "structures": "nincodedo:small_library" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:the_happened_tavern" + "structures": "nincodedo:the_happened_tavern" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:sheep_farm" + "structures": "nincodedo:sheep_farm" } }, { "condition": "minecraft:location_check", "predicate": { - "structure": "nincodedo:undeadcottage" + "structures": "nincodedo:undeadcottage" } } ] diff --git a/datapacks/ocw-stuff/data/nincodedo/predicates/feature_locations/metal_link_house.json b/datapacks/ocw-stuff/data/nincodedo/predicates/feature_locations/metal_link_house.json index 214d9e83..7ed3790b 100644 --- a/datapacks/ocw-stuff/data/nincodedo/predicates/feature_locations/metal_link_house.json +++ b/datapacks/ocw-stuff/data/nincodedo/predicates/feature_locations/metal_link_house.json @@ -3,7 +3,7 @@ "entity": "this", "predicate": { "location": { - "structure": "nincodedo:metal_link_house" + "structures": "nincodedo:metal_link_house" } } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/bell_recipe.json b/datapacks/ocw-stuff/data/nincodedo/recipes/bell_recipe.json index 55ed6701..5157408a 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/bell_recipe.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/bell_recipe.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "minecraft:bell", + "id": "minecraft:bell", "count": 1 } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/boat_compass.json b/datapacks/ocw-stuff/data/nincodedo/recipes/boat_compass.json index 5881b733..58c8708e 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/boat_compass.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/boat_compass.json @@ -14,7 +14,17 @@ } }, "result": { - "item": "minecraft:knowledge_book", - "count": 1 + "id": "minecraft:compass", + "count": 1, + "components": { + "minecraft:item_name": "{\"text\":\"Your Boat Compass\"}", + "minecraft:lore": [ + "{\"text\": \"Keeps track of your boat's\",\"color\": \"gray\"}", + "{\"text\": \"location when you get out.\",\"color\": \"gray\"}" + ], + "minecraft:custom_data": { + "NinUnique": "BoatCompass" + } + } } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/copper_block_from_blasting_raw_copper_block.json b/datapacks/ocw-stuff/data/nincodedo/recipes/copper_block_from_blasting_raw_copper_block.json index 7f802693..4d50d7bd 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/copper_block_from_blasting_raw_copper_block.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/copper_block_from_blasting_raw_copper_block.json @@ -4,7 +4,9 @@ "ingredient": { "item": "minecraft:raw_copper_block" }, - "result": "minecraft:copper_block", + "result": { + "id": "minecraft:copper_block" + }, "experience": 0.7, "cookingtime": 900 } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/gold_block_from_blasting_raw_gold_block.json b/datapacks/ocw-stuff/data/nincodedo/recipes/gold_block_from_blasting_raw_gold_block.json index a6622df8..2e4e5a78 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/gold_block_from_blasting_raw_gold_block.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/gold_block_from_blasting_raw_gold_block.json @@ -4,7 +4,9 @@ "ingredient": { "item": "minecraft:raw_gold_block" }, - "result": "minecraft:gold_block", - "experience": 1.0, + "result": { + "id": "minecraft:gold_block" + }, + "experience": 1, "cookingtime": 900 } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/iron_block_from_blasting_raw_iron_block.json b/datapacks/ocw-stuff/data/nincodedo/recipes/iron_block_from_blasting_raw_iron_block.json index fd8f313d..a88a15a1 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/iron_block_from_blasting_raw_iron_block.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/iron_block_from_blasting_raw_iron_block.json @@ -4,7 +4,9 @@ "ingredient": { "item": "minecraft:raw_iron_block" }, - "result": "minecraft:iron_block", + "result": { + "id": "minecraft:iron_block" + }, "experience": 0.7, "cookingtime": 900 } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/kirby_plushie.json b/datapacks/ocw-stuff/data/nincodedo/recipes/kirby_plushie.json index 98af477e..0fc3e373 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/kirby_plushie.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/kirby_plushie.json @@ -14,7 +14,24 @@ } }, "result": { - "item": "minecraft:knowledge_book", - "count": 1 + "id": "minecraft:player_head", + "count": 1, + "components": { + "minecraft:item_name": "{\"text\":\"Kirby Plushie\"}", + "minecraft:profile": { + "id": [ + 769800376, + 2073248831, + -1223666267, + 548758263 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjIyNDg0NWQ5ODhkNWJjMTliZGE1YzNhYmE4NjQwNTQxNjU1MjA0MDViZDZmMjY3ZWIzOWI3MjcwNDQzNTcxZSJ9fX0=" + } + ] + } + } } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_chest.json b/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_chest.json index afa7efe5..75546464 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_chest.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_chest.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "minecraft:chest", + "id": "minecraft:chest", "count": 4 } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_ladder.json b/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_ladder.json index 556aad63..f26ad792 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_ladder.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/logs_to_ladder.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "minecraft:ladder", + "id": "minecraft:ladder", "count": 24 } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/saddle_to_leather.json b/datapacks/ocw-stuff/data/nincodedo/recipes/saddle_to_leather.json index 41af030f..dcfd0eb4 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/saddle_to_leather.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/saddle_to_leather.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "minecraft:leather", + "id": "minecraft:leather", "count": 2 } } diff --git a/datapacks/ocw-stuff/data/nincodedo/recipes/wool_to_string.json b/datapacks/ocw-stuff/data/nincodedo/recipes/wool_to_string.json index 4404035e..7b2fa920 100644 --- a/datapacks/ocw-stuff/data/nincodedo/recipes/wool_to_string.json +++ b/datapacks/ocw-stuff/data/nincodedo/recipes/wool_to_string.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "minecraft:string", + "id": "minecraft:string", "count": 4 } } diff --git a/datapacks/ocw-stuff/pack.mcmeta b/datapacks/ocw-stuff/pack.mcmeta index cc2814d2..3b5ce937 100644 --- a/datapacks/ocw-stuff/pack.mcmeta +++ b/datapacks/ocw-stuff/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 26, + "pack_format": 41, "description": "OCW Stuff" }, "features": { diff --git a/datapacks/who-did-this/data/youdidthis/advancements/player_kills_player.json b/datapacks/who-did-this/data/youdidthis/advancements/player_kills_player.json index 8c1d2c9a..0b07f86b 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/player_kills_player.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/player_kills_player.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:pufferfish" + "id": "minecraft:pufferfish" }, "title": "gALAXY bRAIN", "description": "wow, you did this in the worst way", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/root.json b/datapacks/who-did-this/data/youdidthis/advancements/root.json index fb95ea71..5a98ba37 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/root.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/root.json @@ -1,8 +1,23 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt": "{SkullOwner:{Id:[I;494443864,-350796260,-1925633719,472495106],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTM1OWQ5MTI3NzI0MmZjMDFjMzA5YWNjYjg3YjUzM2YxOTI5YmUxNzZlY2JhMmNkZTYzYmY2MzVlMDVlNjk5YiJ9fX0=\"}]}}}" + "id": "minecraft:player_head", + "components": { + "minecraft:profile": { + "id": [ + 494443864, + -350796260, + -1925633719, + 472495106 + ], + "properties": [ + { + "name": "textures", + "value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTM1OWQ5MTI3NzI0MmZjMDFjMzA5YWNjYjg3YjUzM2YxOTI5YmUxNzZlY2JhMmNkZTYzYmY2MzVlMDVlNjk5YiJ9fX0=" + } + ] + } + } }, "title": "Who Did This?", "description": "Anyone dying resets the world!", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/you_almost_did_this.json b/datapacks/who-did-this/data/youdidthis/advancements/you_almost_did_this.json index ee91d154..663e5840 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/you_almost_did_this.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/you_almost_did_this.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:totem_of_undying" + "id": "minecraft:totem_of_undying" }, "title": "You... almost did this", "description": "Close one, bud", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/you_did_this.json b/datapacks/who-did-this/data/youdidthis/advancements/you_did_this.json index 72fb05c9..5a1433f6 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/you_did_this.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/you_did_this.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:bone" + "id": "minecraft:bone" }, "title": "You did this", "description": "How could you", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this.json b/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this.json index 1c82bd4a..2cb24577 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:dragon_head" + "id": "minecraft:dragon_head" }, "title": "You... Did this.", "description": "Killed the Ender Dragon", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this_wither.json b/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this_wither.json index f6303b7c..df65222a 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this_wither.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/you_ended_this_wither.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:wither_rose" + "id": "minecraft:wither_rose" }, "title": "You... Did this!", "description": "Killed the Wither", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/you_should_be_dead.json b/datapacks/who-did-this/data/youdidthis/advancements/you_should_be_dead.json index 8fa857c5..92fc1413 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/you_should_be_dead.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/you_should_be_dead.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:totem_of_undying" + "id": "minecraft:totem_of_undying" }, "title": { "text": "You could have ", diff --git a/datapacks/who-did-this/data/youdidthis/advancements/you_started_this.json b/datapacks/who-did-this/data/youdidthis/advancements/you_started_this.json index 22f28778..0900570a 100644 --- a/datapacks/who-did-this/data/youdidthis/advancements/you_started_this.json +++ b/datapacks/who-did-this/data/youdidthis/advancements/you_started_this.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "minecraft:wither_skeleton_skull" + "id": "minecraft:wither_skeleton_skull" }, "title": "You started this", "description": "Hope you're ready, you gonna die", diff --git a/datapacks/who-did-this/data/youdidthis/functions/create_end_countdown.mcfunction b/datapacks/who-did-this/data/youdidthis/functions/create_end_countdown.mcfunction index d52debe0..26bd3279 100644 --- a/datapacks/who-did-this/data/youdidthis/functions/create_end_countdown.mcfunction +++ b/datapacks/who-did-this/data/youdidthis/functions/create_end_countdown.mcfunction @@ -1,5 +1,5 @@ title @a title {"text":"you did this", "color": "blue"} -execute positioned as @e[distance=..50] run summon firework_rocket ~ ~10 ~ {LifeTime:30,FireworksItem:{id:"minecraft:firework_rocket",Count:1,tag:{Fireworks:{Flight:3,Explosions:[{Type:4,Flicker:1,Trail:1,Colors:[I;2437522],FadeColors:[I;15790320]}]}}}} +execute positioned as @e[distance=..50] run summon firework_rocket ~ ~10 ~ {LifeTime:30,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"large_ball",has_twinkle:true,has_trail:true,colors:[I;2437522],fade_colors:[I;15790320]}]}}}} bossbar add endthegame {"text": "The End Is Here"} bossbar set endthegame color blue bossbar set endthegame max 60 diff --git a/datapacks/who-did-this/data/youdidthis/functions/small_celebration.mcfunction b/datapacks/who-did-this/data/youdidthis/functions/small_celebration.mcfunction index 57977eee..625c033c 100644 --- a/datapacks/who-did-this/data/youdidthis/functions/small_celebration.mcfunction +++ b/datapacks/who-did-this/data/youdidthis/functions/small_celebration.mcfunction @@ -1,2 +1,2 @@ title @a title {"text":"you did this", "color": "blue"} -execute positioned as @e[distance=..50] run summon firework_rocket ~ ~10 ~ {LifeTime:30,FireworksItem:{id:"minecraft:firework_rocket",Count:1,tag:{Fireworks:{Flight:3,Explosions:[{Type:4,Flicker:1,Trail:1,Colors:[I;2437522],FadeColors:[I;15790320]}]}}}} +execute as @a at @s positioned as @e[distance=..50] run summon firework_rocket ~ ~10 ~ {LifeTime:30,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"large_ball",has_twinkle:true,has_trail:true,colors:[I;2437522],fade_colors:[I;15790320]}]}}}} diff --git a/datapacks/who-did-this/pack.mcmeta b/datapacks/who-did-this/pack.mcmeta index e752385d..e28b0452 100644 --- a/datapacks/who-did-this/pack.mcmeta +++ b/datapacks/who-did-this/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 26, + "pack_format": 41, "description": "Who Did This?" } } diff --git a/docker-compose.yaml b/docker-compose.yaml index 74f1d3f9..0f0dc840 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,7 @@ services: build: context: . dockerfile: Dockerfile-mc - image: ghcr.io/nincodedo/rhc-ocw-mc:6.5.0 + image: ghcr.io/nincodedo/rhc-ocw-mc:6.6.0 env_file: - motd_override.env - docker.env @@ -28,7 +28,7 @@ services: AUTOPAUSE_TIMEOUT_INIT: '120' TYPE: 'FABRIC' REMOVE_OLD_MODS: 'true' - VERSION: '1.20.4' + VERSION: '1.20.5' INITIAL_ENABLED_PACKS: 'bundle,trade_rebalance,update_1_21' RCON_CMDS_STARTUP: |- gamerule doDaylightCycle false @@ -51,7 +51,7 @@ services: dev.nincodedo.gameservercommander.game: "Minecraft" dev.nincodedo.gameservercommander.group: "MC-RHC" dev.nincodedo.gameservercommander.name: "OCW Minecraft RHC" - dev.nincodedo.gameservercommander.description: "OCW Radical Hardcore 6.5.0 - Minecraft 1.20.4" + dev.nincodedo.gameservercommander.description: "OCW Radical Hardcore 6.6.0 - Minecraft 1.20.5" dev.nincodedo.gameservercommander.connection_info: "games.nincodedo.dev" com.centurylinklabs.watchtower.enable: false log-watcher: @@ -60,7 +60,7 @@ services: dockerfile: Dockerfile-log-watcher labels: - "com.centurylinklabs.watchtower.enable=false" - image: ghcr.io/nincodedo/rhc-ocw:6.5.0 + image: ghcr.io/nincodedo/rhc-ocw:6.6.0 container_name: log-watcher env_file: - docker.env @@ -102,7 +102,7 @@ services: AUTOPAUSE_TIMEOUT_INIT: '120' TYPE: 'FABRIC' REMOVE_OLD_MODS: 'true' - VERSION: '1.20.4' + VERSION: '1.20.5' INITIAL_ENABLED_PACKS: 'bundle,trade_rebalance,update_1_21' RESOURCE_PACK: 'https://ocw-rhc.services.nincodedo.dev/v1/resource-pack?type=beta' RCON_CMDS_STARTUP: |-