Skip to content

Commit

Permalink
made almost all [redacted] use translations
Browse files Browse the repository at this point in the history
  • Loading branch information
Brickmaster5001 committed Oct 27, 2023
1 parent 356eac6 commit aab0f7e
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 35 deletions.
4 changes: 2 additions & 2 deletions data/lt/functions/club/bouncer/kick_out_non_member.mcfunction
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/lt/functions/club/bouncer/trap_idiot.mcfunction
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion data/lt/functions/club/dev/create_bartender.mcfunction
Original file line number Diff line number Diff line change
@@ -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}}]}}
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}}]}}
2 changes: 1 addition & 1 deletion data/lt/functions/club/dev/summon_bouncer.mcfunction
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion data/lt/functions/club/door/deny.mcfunction
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
teleport @s ~-2 ~ ~
tellraw @s {"text":"Now why would you walk into lava without protection?","color":"gray","italic":true}
tellraw @s {"translate": "lt.club.message.door.scold","color": "gray"}
8 changes: 4 additions & 4 deletions data/lt/functions/club/get_invite_1.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}}]
Expand Down
10 changes: 5 additions & 5 deletions data/lt/functions/club/get_invite_2.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}}]

Expand Down
2 changes: 1 addition & 1 deletion data/lt/functions/club/gibnut/accept_leave.mcfunction
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 7 additions & 7 deletions data/lt/functions/club/gibnut/accept_on_tick.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion data/lt/functions/club/gibnut/reject_leave.mcfunction
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit aab0f7e

Please sign in to comment.