From 36ba1b6dd6df00f2c504d0015278d16ac3908494 Mon Sep 17 00:00:00 2001 From: PyvesB Date: Sat, 3 Oct 2020 11:04:24 +0100 Subject: [PATCH] Remove spurious whitespaces --- .../src/main/resources/config-CN.yml | 110 ++++++++-------- .../src/main/resources/config.yml | 123 +++++++++--------- .../src/main/resources/plugin.yml | 4 +- 3 files changed, 119 insertions(+), 118 deletions(-) diff --git a/advanced-achievements-plugin/src/main/resources/config-CN.yml b/advanced-achievements-plugin/src/main/resources/config-CN.yml index 82f771aa6..5b3fba599 100644 --- a/advanced-achievements-plugin/src/main/resources/config-CN.yml +++ b/advanced-achievements-plugin/src/main/resources/config-CN.yml @@ -231,11 +231,11 @@ TablePrefix: "" AdditionalConnectionOptions: "" # 连接到MySQL或PostgreSQL数据库的设置 -# 一个PostgreSQL数据库应当使用类似于：jdbc:postgresql://localhost:5432/minecraft 的地址 +# 一个PostgreSQL数据库应当使用类似于：jdbc:postgresql://localhost:5432/minecraft 的地址 DatabaseAddress: "jdbc:mysql://localhost:3306/minecraft" DatabaseUser: root DatabasePassword: root - + #============================OO=OO============================# # IV-------------------------------------------------------IV # # | 表现上的设置 | # @@ -257,7 +257,7 @@ DistanceTaskInterval: 5 #============================ooooo============================# # 当一个特定的方块被放置 （可用材料名称：github.com/PyvesB/advanced-achievements/wiki/Material-names） -Places: +Places: chest: 5: # 可选，当未获得成就时使用/aach list 或在成就详情中显示。 @@ -291,7 +291,7 @@ Places: # 当一种特定方块被破坏（可用材料名称：github.com/PyvesB/advanced-achievements/wiki/Material-names） # 你可以在1.13之前的Minecraft版本使用如sand:1这样的编辑来给予带有值1的沙子（红沙） -Breaks: +Breaks: ice: 10: Goal: 破坏10个冰块 @@ -331,7 +331,7 @@ Kills: Name: kills_1_zombie DisplayName: 活 死 人 Reward: - Money: 1 + Money: 1 Item: diamond 1 # Mythic Mobs 精英怪 'Display' 参数. 将 & 改为 §. §2Skeletal Knight: @@ -348,7 +348,7 @@ Kills: DisplayName: 作 者 不 再 Reward: IncreaseMaxHealth: 1 - + # 当一个指定目标被投掷物射击（但是没必要杀死） # 有效方块类型: github.com/PyvesB/advanced-achievements/wiki/Material-names # 有效实体类型: github.com/PyvesB/advanced-achievements/wiki/Entity-names @@ -369,21 +369,21 @@ TargetsShot: # 一个特定物品被合成 （可用材料名称： github.com/PyvesB/advanced-achievements/wiki/Material-names） Crafts: diamond_sword: - 1: + 1: Goal: 合成一把钻石剑 Message: 你第一次合成一把钻石剑 Name: craft_1_blade DisplayName: 武器大师 Reward: Money: 2 - 100: + 100: Goal: 合成100把钻石剑 Message: 下一次造啥？Excalibur？ Name: craft_100_blade DisplayName: 无 限 剑 制 Reward: Experience: 500 - + # 当一个玩家使用一项特定指令时 （指定不带斜杠的小写命令前缀） # 如一个指令 /awf add world 来自 AntiWorldFly 插件 就可以使用子类 “awf add” # 给定指令的缩写也会被计入 @@ -398,7 +398,7 @@ PlayerCommands: Commands: Execute: say §7PLAYER 成为了 带 统 计 学 家 Display: Broadcast - + # 喂动物 (可用实体名称: github.com/PyvesB/advanced-achievements/wiki/Entity-names). Breeding: sheep: @@ -407,7 +407,7 @@ Breeding: Message: 你第一次繁殖羊！ Name: breeding_1_sheep DisplayName: 春天来了 - + #===========================OOO=OOO===========================# # VI-------------------------------------------------------VI # # | 简单行为成就 | # @@ -432,7 +432,7 @@ Deaths: Reward: # 在材料名称和数量后的文字为材料的自定义名称，会显示在/aach list和真正受到奖励时 Item: stone 5 垫脚石 - + # 当射出箭矢 Arrows: 50: @@ -440,7 +440,7 @@ Arrows: Message: 什么嘛，你射的还挺准的 Name: arrows_50 DisplayName: 希望の花 - + # 当雪球被丢出时 Snowballs: 1000: @@ -451,15 +451,15 @@ Snowballs: Reward: # 30代表氧气条中的1个气泡 IncreaseMaxOxygen: 30 - -# 当鸡蛋被丢出时 + +# 当鸡蛋被丢出时 Eggs: 1000: Goal: 丢1000个鸡蛋 Message: 你丢了1000个鸡蛋！母鸡哭了 Name: eggs_1000 DisplayName: 蛋蛋的忧伤 - + # 当抓到一条鱼 Fish: 1: @@ -467,7 +467,7 @@ Fish: Message: 你第一次钓到鱼 Name: fish_1 DisplayName: 是时候做炸鱼薯条了！ #译者注：作者是英国人 - + # 当用鱼竿获得一个宝藏 Treasures: 1: @@ -490,8 +490,8 @@ EatenItems: Goal: 吃点啥 Message: 吃点零食吧！ Name: eatenitems_1 - DisplayName: 第一个零食 - + DisplayName: 第一个零食 + # 剪羊毛 Shear: 100: @@ -509,7 +509,7 @@ Milk: DisplayName: 第一次挤奶 Reward: Experience: 100 - + # 用桶接岩浆 LavaBuckets: 10: @@ -517,23 +517,23 @@ LavaBuckets: Message: 接了10桶岩浆！ Name: lavabuckets_10 DisplayName: 多喝岩浆！ - + # 用桶接水 WaterBuckets: 15: Goal: 接15桶水 Message: 接了15桶水 Name: waterbuckets_15 - DisplayName: 消防员 - + DisplayName: 消防员 + # 和村民交易 Trades: 1: Goal: 和村民交易 Message: 和村民第一次交易！ Name: trades_1 - DisplayName: 首次被宰 - + DisplayName: 首次被宰 + # 使用铁砧 AnvilsUsed: 1: @@ -541,7 +541,7 @@ AnvilsUsed: Message: 你第一次修复了一样物品 Name: anvilsused_1 DisplayName: 初次修复 - + # 附魔 Enchantments: 5: @@ -549,31 +549,31 @@ Enchantments: Message: 给5样东西附魔了！ Name: enchantments_5 DisplayName: §5巫师 #事英式幽默 - + # 使用床 -Beds: +Beds: 5: Goal: 睡5觉 Message: 你睡了五觉 Name: bed_5 - DisplayName: 好困 - -# 最大等级 -MaxLevel: + DisplayName: 好困 + +# 最大等级 +MaxLevel: 10: Goal: 达到10级 Message: 10级啦！ Name: maxlevel_10 DisplayName: §4加油升级！ - + # 使用药水 ConsumedPotions: 100: Goal: 喝100瓶药水 Message: 喝了100瓶药水 Name: consumedpotions_100 - DisplayName: 酒鬼！ - + DisplayName: 酒鬼！ + # 在服务器中玩的时间（单位：小时，且为整数） PlayedTime: 1: @@ -581,7 +581,7 @@ PlayedTime: Message: 在服务器的第一个小时 Name: playedtime_1 DisplayName: 第一个小时 - + # 步行的距离 DistanceFoot: 1000: @@ -589,7 +589,7 @@ DistanceFoot: Message: 你步行了一千格！ Name: distancefoot_1000 DisplayName: 抱歉,今天步行 - + # 骑猪的距离 DistancePig: 100: @@ -597,7 +597,7 @@ DistancePig: Message: 你骑猪走过了100格！ Name: distancepig_100 DisplayName: 猪 突 猛 进 - + # 骑马的距离 DistanceHorse: 500: @@ -605,7 +605,7 @@ DistanceHorse: Message: 你骑马走过了500格！ Name: distancehorse_500 DisplayName: 爱 马 仕 - + # 坐矿车的距离 DistanceMinecart: 100: @@ -630,7 +630,7 @@ DistanceGliding: Message: 你用鞘翅飞了100格！ Name: distancegliding_100 DisplayName: 鸟 人 - + # 坐在羊驼上移动的距离 # 1.11之前版本请忽略本项 DistanceLlama: @@ -647,7 +647,7 @@ ItemDrops: Message: §c你在乱丢垃圾！罚款！ Name: itemdrops_15 DisplayName: 污染者 - + # 从地上捡起东西 ItemPickups: 40: @@ -655,7 +655,7 @@ ItemPickups: Message: 保护环境√ Name: itempickups_40 DisplayName: 环保主义者 - + # 耕地 HoePlowings: 10: @@ -663,9 +663,9 @@ HoePlowings: Message: 你耕地了10次！ Name: hoeplowings_10 DisplayName: 农民 - Reward: + Reward: Item: cookie 15 - + # 使用骨粉催熟植物 Fertilising: 15: @@ -673,14 +673,14 @@ Fertilising: Message: 你用骨粉催熟了15次！ Name: fertilising_15 DisplayName: 辣骨催花 - + # 驯服动物 Taming: 1: Goal: 驯服一个动物 Message: 你驯服了第一只小动物 Name: taming_1 - DisplayName: 铲屎官 + DisplayName: 铲屎官 # 酿造药水 Brewing: @@ -689,7 +689,7 @@ Brewing: Message: 你酿造了一瓶药水！ Name: brewing_1 DisplayName: 炼金术师 - + # 发射烟火 Fireworks: 10: @@ -715,7 +715,7 @@ EnderPearls: Message: 已经用末影珍珠传送10次了！ Name: enderpearls_10 DisplayName: 小心脚下 - + # 当一个玩家把宠物交给另一个玩家 (需要前置插件Pet Master版本1.4以上) PetMasterGive: 3: @@ -731,7 +731,7 @@ PetMasterReceive: Message: 从朋友那里得到了10只宠物 Name: petmasterreceive_10 DisplayName: 白嫖怪 - + # 用熔炉熔炼 Smelting: 250: @@ -770,19 +770,19 @@ AdvancementsCompleted: Goal: 完成20个成就 Message: 成功完成20个成就！ Name: advancements_20 - DisplayName: + DisplayName: Reward: Item: diamond 8; cake 1 - + #===========================OOOOOOO===========================# # VII-----------------------------------------------------VII # # | 指令给予成就 | # # 7---------------------------------------------------------7 # #===========================ooooooo===========================# - + # 允许多次奖励指令成就 MultiCommand: true - + # 拥有 achievement.give 权限的玩家（后台） 可以使用/aach give yourAch1 PLAYER来给予 # yourAch1 成就给 PLAYER。 /aach give指令对其他类型成就无效 Commands: @@ -791,7 +791,7 @@ Commands: Message: 你参加了活动-WDNMD Name: yourAch1 DisplayName: 特别活动成就！ - + # 当用指令 /aach add 调用这项成就 Custom: votes: @@ -801,7 +801,7 @@ Custom: DisplayName: 超级粉丝 Reward: Money: 5 - + #==========================OOOO=OOOO==========================# # VIII-------------------------0-------------------------VIII # # | 新插件版本更新的参数将会添加在这里 汉化by Fur_Xia | # diff --git a/advanced-achievements-plugin/src/main/resources/config.yml b/advanced-achievements-plugin/src/main/resources/config.yml index 1d6a04eb9..88078647a 100644 --- a/advanced-achievements-plugin/src/main/resources/config.yml +++ b/advanced-achievements-plugin/src/main/resources/config.yml @@ -40,7 +40,7 @@ TopList: 5 # /aach top, week or month when ranked in the top list. AdditionalEffects: true -# Set to true to activate sounds when performing /aach book, /aach stats with all achievements and /aach top, +# Set to true to activate sounds when performing /aach book, /aach stats with all achievements and /aach top, # week or month when ranked in the top list. Sound: true @@ -225,7 +225,7 @@ DatabaseType: h2 # the plugin will attempt an automatic renaming. Otherwise you have to rename your tables manually. # Do a full server restart for this to take effect. TablePrefix: "" - + # Specify additional options when opening a connection to a MySQL/PostgreSQL database. Start each option with &, # for instance "&useUnicode=yes&characterEncoding=UTF-8". Make sure the key-value pairs themselves are URL encoded. AdditionalConnectionOptions: "" @@ -260,7 +260,7 @@ BungeeMode: false #============================ooooo============================# # When a specific block is placed (available names: github.com/PyvesB/advanced-achievements/wiki/Material-names). -Places: +Places: chest: 5: # Optional, used in /aach list when achievement not yet received, and in advancements. @@ -294,7 +294,7 @@ Places: # When a specific block is broken (available names: github.com/PyvesB/advanced-achievements/wiki/Material-names). # You can use notations such as sand:1 for pre-1.13 versions, which means sand item with metadata 1 (red sand). -Breaks: +Breaks: ice: 10: Goal: Break 10 ice blocks. @@ -334,7 +334,7 @@ Kills: Name: kills_1_zombie DisplayName: The Walking Dead Reward: - Money: 1 + Money: 1 Item: diamond 1 # Mythic Mobs 'Display' parameter. Change & to §. §2Skeletal Knight: @@ -351,7 +351,7 @@ Kills: DisplayName: No More DarkPyves Reward: IncreaseMaxHealth: 1 - + # When a specific target is shot (but not necessarily killed) with a projectile. # Available target block names: github.com/PyvesB/advanced-achievements/wiki/Material-names # Available target entity names: github.com/PyvesB/advanced-achievements/wiki/Entity-names @@ -372,21 +372,21 @@ TargetsShot: # When a specific item is crafted (available names: github.com/PyvesB/advanced-achievements/wiki/Material-names). Crafts: diamond_sword: - 1: + 1: Goal: Craft a sword. Message: The first time you crafted a blade! Name: craft_1_blade DisplayName: Blacksmith Apprentice Reward: Money: 2 - 100: + 100: Goal: Craft 100 swords. Message: Next craft, Excalibur? Name: craft_100_blade DisplayName: Blacksmith Legend Reward: Experience: 500 - + # When a player enters a specific command (specify command prefixes in lower case without initial slash). # For instance a command /awf add world from the AntiWorldFly plugin matches with subcategory 'awf add'. # Aliases of a given command will also be taken into account. @@ -401,7 +401,7 @@ PlayerCommands: Commands: Execute: say §7PLAYER is now a statistician Display: Broadcast - + # When animals breed (available names: github.com/PyvesB/advanced-achievements/wiki/Entity-names). Breeding: sheep: @@ -410,7 +410,7 @@ Breeding: Message: You bred your first sheep! Name: breeding_1_sheep DisplayName: Breeder - + #===========================OOO=OOO===========================# # VI-------------------------------------------------------VI # # | Normal action achievements | # @@ -435,7 +435,7 @@ Deaths: Reward: # Text after the material and quantity is interpreted as a custom name, shown in /aach list and when receiving the reward. Item: stone 5 Tombstone - + # When an arrow is shot. Arrows: 50: @@ -443,34 +443,34 @@ Arrows: Message: 50 arrows shot! Name: arrows_50 DisplayName: Arrows Around the Place - -# When a snowball is thrown. + +# When a snowball is thrown. Snowballs: 1000: Goal: Throw 1000 snowballs. Message: 1000 snowballs thrown. That's the spirit! Name: snowballs_1000 - DisplayName: Winter Addict + DisplayName: Winter Addict Reward: # 30 corresponds to one bubble in the oxygen bar. IncreaseMaxOxygen: 30 - -# When an egg is thrown. + +# When an egg is thrown. Eggs: 1000: Goal: Throw 1000 eggs. Message: 1000 eggs thrown! Name: eggs_1000 - DisplayName: Omelet Addict - -# When a fish is caught. + DisplayName: Omelet Addict + +# When a fish is caught. Fish: 1: Goal: Fish a fish. Message: The first time you caught a fish! Name: fish_1 DisplayName: Time for Fish and Chips - + # When a treasure is caught with a fishing rod. Treasures: 1: @@ -479,7 +479,7 @@ Treasures: Name: treasure_1 DisplayName: Treasure Hunter -# When a tool/armor/weapon is broken. +# When a tool/armor/weapon is broken. ItemBreaks: 1: Goal: Let an item break. @@ -493,8 +493,8 @@ EatenItems: Goal: Eat something. Message: Just had a snack! Name: eatenitems_1 - DisplayName: First Snack - + DisplayName: First Snack + # When a sheep is sheared. Shear: 100: @@ -512,7 +512,7 @@ Milk: DisplayName: First Milk Reward: Experience: 100 - + # When a bucket is filled with lava. LavaBuckets: 10: @@ -520,31 +520,31 @@ LavaBuckets: Message: 10 buckets filled with lava! Name: lavabuckets_10 DisplayName: Pyroman - + # When a bucket is filled with water. WaterBuckets: 15: Goal: Fill 10 buckets with water. Message: 15 buckets filled with water! Name: waterbuckets_15 - DisplayName: Fireman - + DisplayName: Fireman + # When a trade with a villager is made. Trades: 1: Goal: Trade with a villager. Message: Doing business with your first villager! Name: trades_1 - DisplayName: First Trade - + DisplayName: First Trade + # When an anvil is used. AnvilsUsed: 1: Goal: Repair an item. Message: You just repaired your first item! Name: anvilsused_1 - DisplayName: First Repair - + DisplayName: First Repair + # When an enchantment is performed. Enchantments: 5: @@ -552,31 +552,31 @@ Enchantments: Message: 5 objects enchanted! Name: enchantments_5 DisplayName: §5Wizard - -# When a bed is entered. -Beds: + +# When a bed is entered. +Beds: 5: Goal: Sleep 5 times. Message: You entered a bed 5 times! Name: bed_5 - DisplayName: Sleepy Guy - -# Maximum level reached. -MaxLevel: + DisplayName: Sleepy Guy + +# Maximum level reached. +MaxLevel: 10: Goal: Reach level 10. Message: Level 10 reached! Name: maxlevel_10 DisplayName: §4Rookie - + # When a potion is consumed. ConsumedPotions: 100: Goal: Drink 100 potions. Message: Drinking weird beverages all the time... Name: consumedpotions_100 - DisplayName: Alcoholic - + DisplayName: Alcoholic + # Amount of time played on the server (in hours, use integers). PlayedTime: 1: @@ -584,15 +584,15 @@ PlayedTime: Message: You played for one hour on the server! Name: playedtime_1 DisplayName: First Hour - + # When a distance is traveled by foot. DistanceFoot: 1000: Goal: Travel 1000 Blocks with your feet. Message: You traveled 1000 blocks by foot! Name: distancefoot_1000 - DisplayName: Big Walker - + DisplayName: Big Walker + # When a distance is traveled on a pig. DistancePig: 100: @@ -600,7 +600,7 @@ DistancePig: Message: You traveled 100 blocks on a pig! Name: distancepig_100 DisplayName: Carrot on a Stick Master - + # When a distance is traveled on a horse. DistanceHorse: 500: @@ -608,7 +608,7 @@ DistanceHorse: Message: You traveled 500 blocks on a horse! Name: distancehorse_500 DisplayName: The Avener - + # When a distance is traveled in a minecart. DistanceMinecart: 100: @@ -633,7 +633,7 @@ DistanceGliding: Message: You traveled 100 blocks with elytra! Name: distancegliding_100 DisplayName: Angel - + # When a distance is traveled on a llama. # Ignored on Minecraft versions prior to 1.11. DistanceLlama: @@ -658,7 +658,7 @@ ItemDrops: Message: §cYou're killing the planet! Name: itemdrops_15 DisplayName: Polluter - + # When an item is picked up from the ground. ItemPickups: 40: @@ -666,7 +666,7 @@ ItemPickups: Message: You're saving the planet! Name: itempickups_40 DisplayName: Environmentalist - + # When soil is plowed with a hoe. HoePlowings: 10: @@ -674,9 +674,9 @@ HoePlowings: Message: You plowed the ground 10 times! Name: hoeplowings_10 DisplayName: Farmer - Reward: + Reward: Item: cookie 15 - + # When bone meal is used to fertilise plants. Fertilising: 15: @@ -684,7 +684,7 @@ Fertilising: Message: You used bone meal on plants 15 times! Name: fertilising_15 DisplayName: Gardener - + # When an animal is tamed. Taming: 1: @@ -700,7 +700,7 @@ Brewing: Message: You brewed your first potion! Name: brewing_1 DisplayName: Alchemist - + # When a firework is launched. Fireworks: 10: @@ -726,7 +726,7 @@ EnderPearls: Message: 10 teleportations with ender pearls! Name: enderpearls_10 DisplayName: Teleport Man - + # When a player gives a pet to another player (requires Pet Master plugin version 1.4 or above). PetMasterGive: 3: @@ -742,7 +742,7 @@ PetMasterReceive: Message: 10 pets received from friends! Name: petmasterreceive_10 DisplayName: Receiver - + # When an item is smelt in a furnace. Smelting: 250: @@ -775,6 +775,7 @@ Riptides: Message: You've mastered the powers of the sea! Name: riptides_1 DisplayName: Poseidon + # When an a certain amount of advancements are completed. AdvancementsCompleted: 20: @@ -785,16 +786,16 @@ AdvancementsCompleted: # Use semicolons for multiple item rewards as well. The below example will reward 8 diamond and 1 cake Reward: Item: diamond 8; cake 1 - + #===========================OOOOOOO===========================# # VII-----------------------------------------------------VII # # | Command-based achievements | # # 7---------------------------------------------------------7 # #===========================ooooooo===========================# - + # Allow Commands achievement to be awarded several times. MultiCommand: true - + # A player with achievement.give (or the console) can use /aach give yourAch1 PLAYER to give # yourAch1 achievement to PLAYER. The /aach give command does NOT work with other achievements. Commands: @@ -803,7 +804,7 @@ Commands: Message: You took part in the special event! Name: your_ach1 DisplayName: Special Event Achievement! - + # When the command /aach add is called for this category. Custom: votes: @@ -813,7 +814,7 @@ Custom: DisplayName: Server fan Reward: Money: 5 - + #==========================OOOO=OOOO==========================# # VIII-------------------------0-------------------------VIII # # | Parameters in future plugin versions will appear here | # diff --git a/advanced-achievements-plugin/src/main/resources/plugin.yml b/advanced-achievements-plugin/src/main/resources/plugin.yml index f6a991f5e..0c60ddb4e 100644 --- a/advanced-achievements-plugin/src/main/resources/plugin.yml +++ b/advanced-achievements-plugin/src/main/resources/plugin.yml @@ -9,7 +9,7 @@ website: https://github.com/PyvesB/advanced-achievements api-version: 1.13 commands: aach: - description: Main Advanced Achievements command, use it to list sub-commands. + description: Main Advanced Achievements command, use it to list sub-commands. aliases: [advancedachievements,aachievements,aa] usage: / permissions: @@ -151,7 +151,7 @@ permissions: default: true achievement.count.consumedpotions: description: Allows consumed potions statistics in database to increase. - default: true + default: true achievement.count.eatenitems: description: Allows eaten item statistics in database to increase. default: true