From aab0f7ee822f167efbefc745cb88719ab4ef5d7e Mon Sep 17 00:00:00 2001 From: brickmaster5001 Date: Fri, 27 Oct 2023 11:27:34 -0700 Subject: [PATCH] made almost all [redacted] use translations --- .../club/bouncer/kick_out_non_member.mcfunction | 4 ++-- .../functions/club/bouncer/trap_idiot.mcfunction | 4 ++-- .../functions/club/dev/create_bartender.mcfunction | 2 +- .../functions/club/dev/summon_bouncer.mcfunction | 2 +- data/lt/functions/club/door/deny.mcfunction | 2 +- data/lt/functions/club/get_invite_1.mcfunction | 8 ++++---- data/lt/functions/club/get_invite_2.mcfunction | 10 +++++----- .../functions/club/gibnut/accept_leave.mcfunction | 2 +- .../club/gibnut/accept_on_tick.mcfunction | 14 +++++++------- .../functions/club/gibnut/reject_leave.mcfunction | 2 +- .../club/gibnut/reject_on_tick.mcfunction | 8 ++++---- .../club/introduction/existing_member.mcfunction | 4 ++-- .../functions/club/introduction/start.mcfunction | 3 +-- .../functions/club/introduction/unlock.mcfunction | 4 ++-- .../collectible/give/eternal_elytra.mcfunction | 0 15 files changed, 34 insertions(+), 35 deletions(-) create mode 100644 data/lt/functions/collectible/give/eternal_elytra.mcfunction diff --git a/data/lt/functions/club/bouncer/kick_out_non_member.mcfunction b/data/lt/functions/club/bouncer/kick_out_non_member.mcfunction index 1769d93a..0602803a 100644 --- a/data/lt/functions/club/bouncer/kick_out_non_member.mcfunction +++ b/data/lt/functions/club/bouncer/kick_out_non_member.mcfunction @@ -1,6 +1,6 @@ title @s times 0t 3t 0t -title @s title {"text": "! NON MEMBER !","color": "dark_red","bold": true} -title @s subtitle {"text": "You shouldn't be here - Bouncers inbound!","color": "red"} +title @s title {"translate": "lt.club.title.non_member","color": "dark_red","bold": true} +title @s subtitle {"translate": "lt.club.subtitle.non_member","color": "red"} effect give @s blindness 2 60 true effect give @s slowness 1 5 true playsound minecraft:block.note_block.bit master @s ~ ~ ~ 0.5 0.5 diff --git a/data/lt/functions/club/bouncer/trap_idiot.mcfunction b/data/lt/functions/club/bouncer/trap_idiot.mcfunction index ce3a4a20..73c9d93c 100644 --- a/data/lt/functions/club/bouncer/trap_idiot.mcfunction +++ b/data/lt/functions/club/bouncer/trap_idiot.mcfunction @@ -1,6 +1,6 @@ title @s times 0t 3t 0t -title @s title {"text": "DISGUISE REMOVED","color": "dark_red","bold": true} -title @s subtitle {"text": "Reequip your disguise - Bouncers inbound!","color": "red"} +title @s title {"translate": "lt.club.title.idiot_member","color": "dark_red","bold": true} +title @s subtitle {"translate": "lt.club.subtitle.idiot_member","color": "red"} effect give @s slowness 1 5 true playsound minecraft:block.note_block.bit master @s ~ ~ ~ 0.5 0.5 damage @e[tag=club.bouncer,limit=1,sort=nearest] 1 minecraft:out_of_world by @s \ No newline at end of file diff --git a/data/lt/functions/club/dev/create_bartender.mcfunction b/data/lt/functions/club/dev/create_bartender.mcfunction index 869a80cd..f7a82d4e 100644 --- a/data/lt/functions/club/dev/create_bartender.mcfunction +++ b/data/lt/functions/club/dev/create_bartender.mcfunction @@ -1 +1 @@ -summon villager ~ ~ ~ {NoGravity:1b,Invulnerable:1b,CustomNameVisible:1b,PersistenceRequired:1b,Health:100f,Tags:["club.bartender"],CustomName:'{"translate":"lt.club.bartender_name","fallback":"Dave: Bartender"}',Attributes:[{Name:generic.max_health,Base:100},{Name:generic.knockback_resistance,Base:1},{Name:generic.movement_speed,Base:0}],VillagerData:{level:99,profession:"minecraft:cleric",type:"minecraft:jungle"},Offers:{Recipes:[{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:coconut_water",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:black_coffee",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:pina_colada",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:mai_tai",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:lemonade",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:orangeade",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:4b},sell:{id:"tropicraft:limeade",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:caipirinha",Count:1b}}]}} \ No newline at end of file +summon villager ~ ~ ~ {NoGravity:1b,Invulnerable:1b,CustomNameVisible:1b,PersistenceRequired:1b,Health:100f,Tags:["club.bartender"],CustomName:'{"translate":"lt.club.entity.dave.name"}',Attributes:[{Name:generic.max_health,Base:100},{Name:generic.knockback_resistance,Base:1},{Name:generic.movement_speed,Base:0}],VillagerData:{level:99,profession:"minecraft:cleric",type:"minecraft:jungle"},Offers:{Recipes:[{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:coconut_water",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:black_coffee",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:pina_colada",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:mai_tai",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:lemonade",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:orangeade",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:4b},sell:{id:"tropicraft:limeade",Count:1b}},{rewardExp:0b,maxUses:2147483647,xp:0,buy:{id:"ltextras:tropicoin",Count:2b},sell:{id:"tropicraft:caipirinha",Count:1b}}]}} \ No newline at end of file diff --git a/data/lt/functions/club/dev/summon_bouncer.mcfunction b/data/lt/functions/club/dev/summon_bouncer.mcfunction index a911d404..cca2a05e 100644 --- a/data/lt/functions/club/dev/summon_bouncer.mcfunction +++ b/data/lt/functions/club/dev/summon_bouncer.mcfunction @@ -1,2 +1,2 @@ -summon vindicator ~ ~ ~ {Silent:1b,Invulnerable:1b,CustomNameVisible:0b,Team:"club.hideNames",PersistenceRequired:1b,CanPickUpLoot:0b,Health:1000f,Johnny:0b,PatrolLeader:0b,Patrolling:0b,CanJoinRaid:0b,Tags:["club.bouncer"],CustomName:'{"text":"way of their inability to follow club rules.","color":"white"}',Attributes:[{Name:generic.max_health,Base:1000},{Name:generic.knockback_resistance,Base:1},{Name:generic.movement_speed,Base:0.35},{Name:generic.attack_damage,Base:25},{Name:generic.attack_knockback,Base:0}]} +summon vindicator ~ ~ ~ {Silent:1b,Invulnerable:1b,CustomNameVisible:0b,Team:"club.hideNames",PersistenceRequired:1b,CanPickUpLoot:0b,Health:1000f,Johnny:0b,PatrolLeader:0b,Patrolling:0b,CanJoinRaid:0b,Tags:["club.bouncer"],CustomName:'{"translate":"lt.club.entity.bouncer.name","color":"white"}',Attributes:[{Name:generic.max_health,Base:1000},{Name:generic.knockback_resistance,Base:1},{Name:generic.movement_speed,Base:0.35},{Name:generic.attack_damage,Base:25},{Name:generic.attack_knockback,Base:0}]} effect give @e[tag=club.bouncer] regeneration infinite 10 true \ No newline at end of file diff --git a/data/lt/functions/club/door/deny.mcfunction b/data/lt/functions/club/door/deny.mcfunction index 7c2c52f5..95310306 100644 --- a/data/lt/functions/club/door/deny.mcfunction +++ b/data/lt/functions/club/door/deny.mcfunction @@ -1,2 +1,2 @@ teleport @s ~-2 ~ ~ -tellraw @s {"text":"Now why would you walk into lava without protection?","color":"gray","italic":true} \ No newline at end of file +tellraw @s {"translate": "lt.club.message.door.scold","color": "gray"} \ No newline at end of file diff --git a/data/lt/functions/club/get_invite_1.mcfunction b/data/lt/functions/club/get_invite_1.mcfunction index 3b4da913..c81d9a2b 100644 --- a/data/lt/functions/club/get_invite_1.mcfunction +++ b/data/lt/functions/club/get_invite_1.mcfunction @@ -2,10 +2,10 @@ tag @s add club.has_enough_disguises # Try giving item directly -give @s ltextras:invite{clubInviteOne:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_1.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 1 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'}} +give @s ltextras:invite{clubInviteOne:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_1.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 1 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'}text:[{align_horizontal:"center",align_vertical:"end",line_spacing:18.0f,max_width:125.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_1.top"},x:287.0f,y:153.0f},{align_horizontal:"center",align_vertical:"start",line_spacing:18.0f,max_width:125.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_1.bottom"},x:287.0f,y:191.0f}]} # Add item to collectibles menu -collectible give @s ltextras:invite{clubInviteOne:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_1.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 1 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'}} +collectible give @s ltextras:invite{clubInviteOne:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_1.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 1 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'}text:[{align_horizontal:"center",align_vertical:"end",line_spacing:18.0f,max_width:125.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_1.top"},x:287.0f,y:153.0f},{align_horizontal:"center",align_vertical:"start",line_spacing:18.0f,max_width:125.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_1.bottom"},x:287.0f,y:191.0f}]} # Reset invCheck obj scoreboard players reset @s club.invCheck @@ -14,11 +14,11 @@ scoreboard players reset @s club.invCheck execute store success score @s club.invCheck run data get entity @s Inventory[{tag:{clubInviteOne:1b}}] # CASE: Player got invite -execute if score @s club.invCheck matches 1 run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"text":": You've been given an item. Try holding it. We look forward to not knowing you.","color":"gray","italic":true,"obfuscated":false}] +execute if score @s club.invCheck matches 1 run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"translate": "lt.club.message.invite_1.succeed","color": "gray"}] execute if score @s club.invCheck matches 1 run playsound minecraft:block.note_block.iron_xylophone master @s ~ ~ ~ 2 1 # CASE: Player didn't get invite -execute if score @s club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteOne:1b}}},distance=..3] run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"text":": We tried to give you an item, but your inventory was full. You can now find it in your collectibles basket. Try holding it. We look forward to not knowing you.","color":"gray","italic":true,"obfuscated":false}] +execute if score @s club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteOne:1b}}},distance=..3] run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"translate": "lt.club.message.invite_1.fail","color": "gray"}] execute if score @s club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteOne:1b}}},distance=..3] run playsound minecraft:block.note_block.snare master @s ~ ~ ~ 2 1 execute if score @s club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteOne:1b}}},distance=..3] run tag @s add club.full_inventory execute if score @s club.invCheck matches 0 run kill @e[type=item,nbt={Item:{tag:{clubInviteOne:1b}}}] diff --git a/data/lt/functions/club/get_invite_2.mcfunction b/data/lt/functions/club/get_invite_2.mcfunction index 9d98139f..f0ba007d 100644 --- a/data/lt/functions/club/get_invite_2.mcfunction +++ b/data/lt/functions/club/get_invite_2.mcfunction @@ -5,10 +5,10 @@ tag @s add club.can_enter tag @s remove club.needs_invite_2 # Try giving item directly -give @s ltextras:invite{clubInviteTwo:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_2.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 2 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'}} +give @s ltextras:invite{clubInviteTwo:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_2.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 2 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'},text:[{align_horizontal:"center",align_vertical:"end",line_spacing:18.0f,max_width:125.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_2.top"},x:287.0f,y:153.0f},{align_horizontal:"center",align_vertical:"start",line_spacing:18.0f,max_width:135.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_2.bottom"},x:287.0f,y:191.0f}]} # Add item to collectibles menu -collectible give @s ltextras:invite{clubInviteTwo:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_2.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 2 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'}} +collectible give @s ltextras:invite{clubInviteTwo:1b,image:{width:371.0f,height:292.0f,texture:"ltextras:textures/images/ccfucc_invite_2.png"},display:{Name:'[{"text":"xxx","color":"white","italic":false,"obfuscated":true},{"text":" 2 ","color":"dark_purple","italic":false,"obfuscated":false},{"text":"xxx","color":"white","italic":false,"obfuscated":true}]'},text:[{align_horizontal:"center",align_vertical:"end",line_spacing:18.0f,max_width:125.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_2.top"},x:287.0f,y:153.0f},{align_horizontal:"center",align_vertical:"start",line_spacing:18.0f,max_width:135.0f,text:{color:"#D6B3E0",translate:"invite.ltextras.club_2.bottom"},x:287.0f,y:191.0f}]} # Reset invCheck obj scoreboard players reset @s club.invCheck @@ -17,12 +17,12 @@ scoreboard players reset @s club.invCheck execute store success score @s club.invCheck run data get entity @s Inventory[{tag:{clubInviteTwo:1b}}] # CASE: Player got invite -execute if score @s club.invCheck matches 1 run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"text":": We're glad you've come this far. Another item has been given to you.","color":"gray","italic":true,"obfuscated":false}] +execute if score @s club.invCheck matches 1 run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"translate": "lt.club.message.invite_2.succeed","color": "gray"}] execute if score @s club.invCheck matches 1 run playsound minecraft:block.note_block.iron_xylophone master @s ~ ~ ~ 2 1 # CASE: Player didn't get invite -execute if score @s[tag=!club.full_inventory] club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteTwo:1b}}},distance=..3] run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"text":": We tried to give you another item, but your inventory was full. You can now find a second item in your collectible basket. We're glad you've come this far.","color":"gray","italic":true,"obfuscated":false}] -execute if score @s[tag=club.full_inventory] club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteTwo:1b}}},distance=..3] run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"text":": We're glad you've come this far but for the love of disguises clean up your inventory a bit! That's TWICE! IN A ROW! Y'know how much it costs to send these messages?! No, wait, you don't get to know! You're probably doing this on purpose to bankrupt us! You're lucky we're not allowed to reject members. You can now find a second item in your stupid collectible basket ...","color":"gray","italic":true,"obfuscated":false}] +execute if score @s[tag=!club.full_inventory] club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteTwo:1b}}},distance=..3] run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"translate": "lt.club.message.invite_2.fail","color": "gray"}] +execute if score @s[tag=club.full_inventory] club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteTwo:1b}}},distance=..3] run tellraw @s [{"text":"Club","color":"dark_purple","obfuscated":true},{"translate": "lt.club.message.invite_2.special","color": "gray"}] execute if score @s club.invCheck matches 0 if entity @e[type=item,nbt={Item:{tag:{clubInviteTwo:1b}}},distance=..3] run playsound minecraft:block.note_block.snare master @s ~ ~ ~ 2 1 execute if score @s club.invCheck matches 0 run kill @e[type=item,nbt={Item:{tag:{clubInviteTwo:1b}}}] diff --git a/data/lt/functions/club/gibnut/accept_leave.mcfunction b/data/lt/functions/club/gibnut/accept_leave.mcfunction index 73a9cd85..ee9d6eb8 100644 --- a/data/lt/functions/club/gibnut/accept_leave.mcfunction +++ b/data/lt/functions/club/gibnut/accept_leave.mcfunction @@ -1,4 +1,4 @@ -tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Hey! I wasn't done talking, where are you going! Who raised you?! Whatever ... I'll pass the word along to ","color": "gray"},{"text": "them ","italic": true,"color": "gray"},{"text": "that you're ready. Oh and take these coins. I think you'll find them helpful.","italic": false,"color": "gray"}] +tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.leave","color": "gray"}] tag @s remove club.speaking_with_gibnut tag @s add club.spoken_with_gibnut tag @s add club.needs_invite_2 diff --git a/data/lt/functions/club/gibnut/accept_on_tick.mcfunction b/data/lt/functions/club/gibnut/accept_on_tick.mcfunction index 8f9bae1f..47dd742f 100644 --- a/data/lt/functions/club/gibnut/accept_on_tick.mcfunction +++ b/data/lt/functions/club/gibnut/accept_on_tick.mcfunction @@ -5,18 +5,18 @@ scoreboard players add @s club.dialogueTime 1 execute unless entity @e[tag=club.gibnut,distance=..12] run function lt:club/gibnut/accept_leave # chat lines -execute if score @s club.dialogueTime matches 1 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Ahh, welcome!","color": "gray"}] +execute if score @s club.dialogueTime matches 1 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.1","color": "gray"}] execute if score @s club.dialogueTime matches 1 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 40 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": I was told to expect your company.","color": "gray"}] +execute if score @s club.dialogueTime matches 40 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.2","color": "gray"}] execute if score @s club.dialogueTime matches 40 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 105 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": That disguise is marvelous, an excellent choice.","color": "gray"}] +execute if score @s club.dialogueTime matches 105 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.3","color": "gray"}] execute if score @s club.dialogueTime matches 105 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 190 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": But here's me blathering on, knowing full well in your shoes I'd have little care for the meandering of an old man.","color": "gray"}] +execute if score @s club.dialogueTime matches 190 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.4","color": "gray"}] execute if score @s club.dialogueTime matches 190 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 240 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Bah! So be it then. I won't keep you much longer.","color": "gray"}] +execute if score @s club.dialogueTime matches 240 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.5","color": "gray"}] execute if score @s club.dialogueTime matches 240 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 320 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": You'll want to take these coins. Oh and keep them close, yeah? You'll be needing them.","color": "gray"}] +execute if score @s club.dialogueTime matches 320 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.6","color": "gray"}] execute if score @s club.dialogueTime matches 320 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 400 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Well now, unless you have something, I'll let ","color": "gray"},{"text": "them ","italic": true,"color": "gray"},{"text": "know you're ready. Farewell.","italic": false,"color": "gray"}] +execute if score @s club.dialogueTime matches 400 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.accept.7","color": "gray"}] execute if score @s club.dialogueTime matches 400 run playsound minecraft:entity.illusioner.ambient master @s execute if score @s club.dialogueTime matches 400 run function lt:club/gibnut/accept_end \ No newline at end of file diff --git a/data/lt/functions/club/gibnut/reject_leave.mcfunction b/data/lt/functions/club/gibnut/reject_leave.mcfunction index ce8f94a3..a32374a7 100644 --- a/data/lt/functions/club/gibnut/reject_leave.mcfunction +++ b/data/lt/functions/club/gibnut/reject_leave.mcfunction @@ -1,4 +1,4 @@ -tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Hey! I wasn't done talking, where are you going! Who raised you?! Whatever ... I don't think you'll find enough disguises anyways.","color": "gray"}] +tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.reject.leave","color": "gray"}] tag @s remove club.speaking_with_gibnut tag @s add club.gibnut_rejected playsound minecraft:entity.llama.spit master @s ~ ~ ~ 1 1 diff --git a/data/lt/functions/club/gibnut/reject_on_tick.mcfunction b/data/lt/functions/club/gibnut/reject_on_tick.mcfunction index c5e012bf..a05d9b47 100644 --- a/data/lt/functions/club/gibnut/reject_on_tick.mcfunction +++ b/data/lt/functions/club/gibnut/reject_on_tick.mcfunction @@ -5,12 +5,12 @@ scoreboard players add @s club.dialogueTime 1 execute unless entity @e[tag=club.gibnut,distance=..12] run function lt:club/gibnut/reject_leave # chat lines -execute if score @s club.dialogueTime matches 1 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Hmm, curious.","color": "gray"}] +execute if score @s club.dialogueTime matches 1 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.reject.1","color": "gray"}] execute if score @s club.dialogueTime matches 1 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 40 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": You've made it all the way here yet you lack what is needed.","color": "gray"}] +execute if score @s club.dialogueTime matches 40 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.reject.2","color": "gray"}] execute if score @s club.dialogueTime matches 40 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 130 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": That simply won't do.","color": "gray"}] +execute if score @s club.dialogueTime matches 130 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.reject.3","color": "gray"}] execute if score @s club.dialogueTime matches 130 run playsound minecraft:entity.illusioner.ambient master @s -execute if score @s club.dialogueTime matches 180 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"text": ": Until the time you return with five, non-milestone disguises, I will speak no further.","color": "gray"}] +execute if score @s club.dialogueTime matches 180 run tellraw @s [{"text":"Ser Gibsworth","color":"gold"},{"translate": "lt.club.dialogue.gibnut.reject.4","color": "gray"}] execute if score @s club.dialogueTime matches 180 run playsound minecraft:entity.illusioner.ambient master @s execute if score @s club.dialogueTime matches 180 run function lt:club/gibnut/reject_end \ No newline at end of file diff --git a/data/lt/functions/club/introduction/existing_member.mcfunction b/data/lt/functions/club/introduction/existing_member.mcfunction index 0067fa70..c58238ba 100644 --- a/data/lt/functions/club/introduction/existing_member.mcfunction +++ b/data/lt/functions/club/introduction/existing_member.mcfunction @@ -1,7 +1,7 @@ # Show titles title @s times 5t 4s 5t -title @s title [{"text":"Welcome Back!","color":"dark_purple","bold":true}] -title @s subtitle [{"text":"To the Covert Club for Undercover Clubbers","color":"light_purple"}] +title @s title [{"translate":"lt.club.title.returning","color":"dark_purple","bold":true}] +title @s subtitle [{"translate":"lt.club.subtitle.welcome","color":"light_purple"}] # Teleport player tp @s @e[tag=club.normal_spawn,limit=1] diff --git a/data/lt/functions/club/introduction/start.mcfunction b/data/lt/functions/club/introduction/start.mcfunction index 053eb453..76829e7f 100644 --- a/data/lt/functions/club/introduction/start.mcfunction +++ b/data/lt/functions/club/introduction/start.mcfunction @@ -1,7 +1,6 @@ # Show titles title @s times 1t 5s 5t -title @s title [{"text":"🔒 ","color":"red"},{"text":"Welcome","color":"gray","bold":true,"obfuscated":true},{"text":" 🔒","color":"red"}] -title @s subtitle [{"text":"Covert Club for Undercover Clubbers","color":"dark_gray","obfuscated":true}] +title @s title [{"text":"🔒 ","color":"red"},{"translate":"lt.club.title.welcome","color":"gray","bold":true,"obfuscated":true},{"text":" 🔒","color":"red"}] # Set scores scoreboard players set @s club.joinClock 100 diff --git a/data/lt/functions/club/introduction/unlock.mcfunction b/data/lt/functions/club/introduction/unlock.mcfunction index a1cabeb9..bcb67f74 100644 --- a/data/lt/functions/club/introduction/unlock.mcfunction +++ b/data/lt/functions/club/introduction/unlock.mcfunction @@ -1,7 +1,7 @@ # Show titles title @s times 1t 5s 5t -title @s title [{"text":"🔓 ","color":"gray"},{"text":"Welcome","color":"dark_purple","bold":true},{"text":" 🔓","color":"gray"}] -title @s subtitle [{"text":"To the Covert Club for Undercover Clubbers","color":"light_purple"}] +title @s title [{"text":"🔓 ","color":"gray"},{"translate":"lt.club.title.welcome","color":"dark_purple","bold":true},{"text":" 🔓","color":"gray"}] +title @s subtitle [{"translate":"lt.club.subtitle.welcome","color":"light_purple"}] # Clear blindness effect clear @s blindness diff --git a/data/lt/functions/collectible/give/eternal_elytra.mcfunction b/data/lt/functions/collectible/give/eternal_elytra.mcfunction new file mode 100644 index 00000000..e69de29b