Skip to content

Commit

Permalink
updated for 1.16 and small fixes
Browse files Browse the repository at this point in the history
- updated for 1.16 ("Renamed `generic.movementSpeed` to
  `generic.movement_speed`.")
- Fixed Y coordinates for villager, trader, and doggo spawn
- Fixed Y coordinates for manual function invocation vs button
- Added top lanterns to prevent mob spawns
  • Loading branch information
TimidRobot committed Jan 17, 2021
1 parent 3c5ce05 commit da97121
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion data/trz/functions/build_tent.mcfunction
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ~0 ~0 ~0 should be south-west (diagonal)
# from the south-west corner of the build area
setblock ~0 ~-1 ~0 chiseled_stone_bricks
execute positioned ~1 ~-1 ~-2 run function trz:tent/construct
execute positioned ~1 ~-0.5 ~-2 run function trz:tent/construct
10 changes: 8 additions & 2 deletions data/trz/functions/tent/beam.mcfunction
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# Create oak_log supporting beam down length (north/south) of tent
# with hanging lanterns
# with oak_stairs end caps
# with top lanterns to prevent spawns, decorative hanging lanterns, and
# decorative oak_stairs end caps
fill ~0 ~0 ~-1 ~0 ~0 ~-17 oak_log[axis=z]
execute positioned ~0 ~1 ~-5 run kill @e[distance=..3,type=item,nbt={Item:{id:"minecraft:lantern"}}]
execute positioned ~0 ~1 ~-9 run kill @e[distance=..3,type=item,nbt={Item:{id:"minecraft:lantern"}}]
execute positioned ~0 ~1 ~-13 run kill @e[distance=..3,type=item,nbt={Item:{id:"minecraft:lantern"}}]
setblock ~0 ~1 ~-5 lantern
setblock ~0 ~1 ~-9 lantern
setblock ~0 ~1 ~-13 lantern
execute if block ~0 ~-1 ~-1 air run setblock ~0 ~-1 ~-1 lantern[hanging=true]
execute if block ~0 ~-1 ~-17 air run setblock ~0 ~-1 ~-17 lantern[hanging=true]
setblock ~0 ~0 ~0 oak_stairs[facing=north,half=top]
Expand Down
2 changes: 1 addition & 1 deletion data/trz/functions/tent/booth_armorsmith.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ summon item_frame ~3 ~2 ~-3 {Invulnerable:1b,Facing:5,ItemDropChance:0.0,Item:{i

# Armorsmith Villager
execute positioned ~1 ~0 ~-1 run tp @e[distance=..3,type=villager,tag=TrzTentArmorsmith] ~0 -10 ~0
summon villager ~1 ~-0.5 ~-2 {CustomName:"\"Rarsaer Smeltgut\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:armorer,type:snow},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:diamond_helmet,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:aqua_affinity,lvl:1},{id:respiration,lvl:3},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Helm\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:40},sell:{id:diamond_chestplate,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Chestplate\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:diamond_leggings,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Leggings\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:diamond_boots,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:depth_strider,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Boots\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:shield,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Shield\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:bell,Count:1,xp:0}},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:diamond_horse_armor,Count:1},xp:0}]},Tags:["TrzTentArmorsmith"]}
summon villager ~1 ~0.5 ~-2 {CustomName:"\"Rarsaer Smeltgut\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:armorer,type:snow},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:diamond_helmet,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:aqua_affinity,lvl:1},{id:respiration,lvl:3},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Helm\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:40},sell:{id:diamond_chestplate,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Chestplate\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:diamond_leggings,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Leggings\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:diamond_boots,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:protection,lvl:5},{id:depth_strider,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Boots\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:shield,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Shield\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:bell,Count:1,xp:0}},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:diamond_horse_armor,Count:1},xp:0}]},Tags:["TrzTentArmorsmith"]}
2 changes: 1 addition & 1 deletion data/trz/functions/tent/booth_eggmonger.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ summon item_frame ~2 ~4 ~-1 {Invulnerable:1b,Facing:3,ItemDropChance:0.0,Item:{i

# Villager Eggmonger
execute positioned ~1 ~0 ~-1 run tp @e[distance=..3,type=villager,tag=TrzTentEggmonger] ~0 -10 ~0
summon villager ~1 ~-0.5 ~-1 {CustomName:"\"Skye Eggmonger\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:butcher,type:taiga},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:8},sell:{id:bee_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:chicken_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:cat_spawn_egg ,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:cow_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:donkey_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:fox_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:horse_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:llama_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:56},sell:{id:mooshroom_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:mule_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:ocelot_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:panda_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:parrot_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:pig_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:polar_bear_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:rabbit_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:sheep_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:turtle_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:wolf_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald_block,Count:2},sell:{id:villager_spawn_egg,Count:1},xp:0}]},Tags:["TrzTentEggmonger"],Passengers:[{id:chicken,CustomName:"\"Skye Eggmonger\"",PersistenceRequired:1}]}
summon villager ~1 ~0.5 ~-1 {CustomName:"\"Skye Eggmonger\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:butcher,type:taiga},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:8},sell:{id:bee_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:chicken_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:cat_spawn_egg ,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:cow_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:donkey_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:fox_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:horse_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:llama_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:56},sell:{id:mooshroom_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:mule_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:ocelot_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:panda_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:parrot_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:pig_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:polar_bear_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:rabbit_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:sheep_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:16},sell:{id:turtle_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:32},sell:{id:wolf_spawn_egg,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald_block,Count:2},sell:{id:villager_spawn_egg,Count:1},xp:0}]},Tags:["TrzTentEggmonger"],Passengers:[{id:chicken,CustomName:"\"Skye Eggmonger\"",PersistenceRequired:1}]}
2 changes: 1 addition & 1 deletion data/trz/functions/tent/booth_gardener.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ summon item_frame ~-1 ~2 ~0 {Invulnerable:1b,Facing:4,ItemDropChance:0.0,Item:{i

# Gardener Villager
execute positioned ~1 ~0 ~-1 run tp @e[distance=..3,type=villager,tag=TrzTentGardener] ~0 -10 ~0
summon villager ~1 ~-0.5 ~-1 {CustomName:"\"Genofeva Bottomhill\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:farmer,type:swamp},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:wheat_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:melon_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:pumpkin_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:beetroot_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:carrot,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:potato,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:sweet_berries,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:cocoa_beans,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:oak_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:birch_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:spruce_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:jungle_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:acacia_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:dark_oak_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:3},sell:{id:cactus,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:lily_pad,Count:2},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:bamboo,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:sugar_cane,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:vine,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:3},sell:{id:kelp,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:brown_mushroom,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:red_mushroom,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:allium,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:azure_bluet,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:cornflower,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:dandelion,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:lilac,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:lily_of_the_valley,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:oxeye_daisy,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:peony,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:poppy,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:rose_bush,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:sunflower,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:orange_tulip,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:red_tulip,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:pink_tulip,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:white_tulip,Count:1},xp:0}]},Attributes:[{Base:0.0,Name:"generic.movementSpeed"}],Tags:["TrzTentGardener"]}
summon villager ~1 ~0.5 ~-1 {CustomName:"\"Genofeva Bottomhill\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:farmer,type:swamp},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:wheat_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:melon_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:pumpkin_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:beetroot_seeds,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:carrot,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:potato,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:sweet_berries,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:cocoa_beans,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:oak_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:birch_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:spruce_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:jungle_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:acacia_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:dark_oak_sapling,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:3},sell:{id:cactus,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:lily_pad,Count:2},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:bamboo,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:sugar_cane,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:vine,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:3},sell:{id:kelp,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:brown_mushroom,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:red_mushroom,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:allium,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:azure_bluet,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:cornflower,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:dandelion,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:lilac,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:lily_of_the_valley,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:oxeye_daisy,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:peony,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:poppy,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:rose_bush,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:sunflower,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:orange_tulip,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:red_tulip,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:pink_tulip,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:1},sell:{id:white_tulip,Count:1},xp:0}]},Attributes:[{Base:0.0,Name:"generic.movement_speed"}],Tags:["TrzTentGardener"]}
2 changes: 1 addition & 1 deletion data/trz/functions/tent/booth_toolsmith.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ summon item_frame ~-1 ~2 ~0 {Invulnerable:1b,Facing:4,ItemDropChance:0.0,Item:{i

# Toolsmith Villager
execute positioned ~1 ~0 ~-1 run tp @e[distance=..3,type=villager,tag=TrzTentToolsmith] ~0 -10 ~0
summon villager ~1 ~-0.5 ~-1 {CustomName:"\"Brudwilda Kegaxe\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:toolsmith,type:jungle},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:2},sell:{id:compass,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:36},sell:{id:diamond_pickaxe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:5},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Pickaxe\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:diamond_shovel,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:2},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Shovel\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:36},sell:{id:diamond_axe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:4},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Axe\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:diamond_hoe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:5},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Hoe\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:40},sell:{id:golden_pickaxe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:5},{id:silk_touch,lvl:1}],Unbreakable:1b,display:{Name:"\"Silken Pickaxe\"",Lore:['{"text":"snow averse"}']}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:12},sell:{id:shears,Count:1,tag:{Enchantments:[{id:unbreaking,lvl:3},{id:vanishing_curse,lvl:1}],display:{Name:"\"Wonder Shears\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:4},sell:{id:clock,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:4},sell:{id:flint_and_steel,Count:1,tag:{Enchantments:[{id:unbreaking,lvl:3},{id:vanishing_curse,lvl:1}],display:{Name:"\"Wonder Flint & Steel\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:lead,Count:1},xp:0}]},Tags:["TrzTentToolsmith"]}
summon villager ~1 ~0.5 ~-1 {CustomName:"\"Brudwilda Kegaxe\"",CustomNameVisible:0,PersistenceRequired:1,VillagerData:{level:5,profession:toolsmith,type:jungle},Offers:{Recipes:[{rewardExp:0,maxUses:99,buy:{id:emerald,Count:2},sell:{id:compass,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:36},sell:{id:diamond_pickaxe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:5},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Pickaxe\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:diamond_shovel,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:2},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Shovel\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:36},sell:{id:diamond_axe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:4},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Axe\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:24},sell:{id:diamond_hoe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:5},{id:fortune,lvl:3},{id:mending,lvl:1},{id:unbreaking,lvl:3}],display:{Name:"\"Wonder Hoe\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:40},sell:{id:golden_pickaxe,Count:1,tag:{Enchantments:[{id:vanishing_curse,lvl:1},{id:efficiency,lvl:5},{id:silk_touch,lvl:1}],Unbreakable:1b,display:{Name:"\"Silken Pickaxe\"",Lore:['{"text":"snow averse"}']}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:12},sell:{id:shears,Count:1,tag:{Enchantments:[{id:unbreaking,lvl:3},{id:vanishing_curse,lvl:1}],display:{Name:"\"Wonder Shears\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:4},sell:{id:clock,Count:1},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:4},sell:{id:flint_and_steel,Count:1,tag:{Enchantments:[{id:unbreaking,lvl:3},{id:vanishing_curse,lvl:1}],display:{Name:"\"Wonder Flint & Steel\""}}},xp:0},{rewardExp:0,maxUses:99,buy:{id:emerald,Count:5},sell:{id:lead,Count:1},xp:0}]},Tags:["TrzTentToolsmith"]}
Loading

0 comments on commit da97121

Please sign in to comment.