diff --git a/changelog.md b/changelog.md index 26fa4a5f7..32fa78080 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -## Change Log for v2.7.6..v2.7.6-RC1 +## Change Log for v2.7.6..v2.7.6-RC2 ## Translations diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/block/BlockCollection.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/block/BlockCollection.java index 6f582d255..68a7e3d6e 100644 --- a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/block/BlockCollection.java +++ b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/block/BlockCollection.java @@ -41,7 +41,7 @@ public synchronized String diff(Collection itemStacks) { diff = item.getAmount() - count(item.getType()); } if (diff > 0) { - sb.append(tr(" \u00a7f{0}x \u00a7{1}", diff, VaultHandler.getItemName(item))); + sb.append(tr(" \u00a7f{0}x \u00a77{1}", diff, VaultHandler.getItemName(item))); } } if (sb.toString().trim().isEmpty()) { diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java index 8fa100c52..03cf2fc21 100644 --- a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java +++ b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java @@ -47,6 +47,7 @@ static Type from(String s) { private final List requiredItems; private final List requiredEntities; private final List requiredChallenges; + private double requiredLevel; private final Rank rank; private final int resetInHours; private final ItemStack displayItem; @@ -60,7 +61,7 @@ static Type from(String s) { private final int repeatLimit; public Challenge(String name, String displayName, String description, Type type, List requiredItems, - List requiredEntities, List requiredChallenges, Rank rank, int resetInHours, + List requiredEntities, List requiredChallenges, double requiredLevel, Rank rank, int resetInHours, ItemStack displayItem, String tool, ItemStack lockedItem, int offset, boolean takeItems, int radius, Reward reward, Reward repeatReward, int repeatLimit) { this.name = name; @@ -69,6 +70,7 @@ public Challenge(String name, String displayName, String description, Type type, this.requiredItems = requiredItems; this.requiredEntities = requiredEntities; this.requiredChallenges = requiredChallenges; + this.requiredLevel = requiredLevel; this.rank = rank; this.resetInHours = resetInHours; this.displayItem = displayItem; @@ -107,11 +109,8 @@ public int getRadius() { return radius; } - public int getRequiredLevel() { - if (type == Type.ISLAND_LEVEL && requiredItems.size() == 1) { - return Integer.parseInt(requiredItems.get(0), 10); - } - return 0; + public double getRequiredLevel() { + return requiredLevel; } public List getRequiredItems(int timesCompleted) { diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeFactory.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeFactory.java index b44a782e4..ba7e2172e 100644 --- a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeFactory.java +++ b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeFactory.java @@ -70,7 +70,7 @@ public static Challenge createChallenge(Rank rank, ConfigurationSection section, int offset = section.getInt("offset", 0); int repeatLimit = section.getInt("repeatLimit", 0); return new Challenge(name, displayName, description, type, - requiredItems, requiredEntities, requiredChallenges, rank, + requiredItems, requiredEntities, requiredChallenges, section.getDouble("requiredLevel", 0d), rank, resetInHours, displayItem, section.getString("tool", null), lockedItem, offset, takeItems, radius, reward, repeatReward, repeatLimit); } diff --git a/uSkyBlock-Core/src/main/po/cs.po b/uSkyBlock-Core/src/main/po/cs.po index a3bb8e879..6cf97cfe6 100644 --- a/uSkyBlock-Core/src/main/po/cs.po +++ b/uSkyBlock-Core/src/main/po/cs.po @@ -76,7 +76,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/da.po b/uSkyBlock-Core/src/main/po/da.po index f0be3e350..d0304482e 100644 --- a/uSkyBlock-Core/src/main/po/da.po +++ b/uSkyBlock-Core/src/main/po/da.po @@ -81,7 +81,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/de.po b/uSkyBlock-Core/src/main/po/de.po index 65bb0868b..708dc1b2a 100644 --- a/uSkyBlock-Core/src/main/po/de.po +++ b/uSkyBlock-Core/src/main/po/de.po @@ -85,7 +85,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/en_GB.po b/uSkyBlock-Core/src/main/po/en_GB.po index ee8b9c406..0e57baa81 100644 --- a/uSkyBlock-Core/src/main/po/en_GB.po +++ b/uSkyBlock-Core/src/main/po/en_GB.po @@ -77,7 +77,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/es.po b/uSkyBlock-Core/src/main/po/es.po index 15a54ea09..5339290b4 100644 --- a/uSkyBlock-Core/src/main/po/es.po +++ b/uSkyBlock-Core/src/main/po/es.po @@ -78,7 +78,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/fr.po b/uSkyBlock-Core/src/main/po/fr.po index e79da5c74..2e16413aa 100644 --- a/uSkyBlock-Core/src/main/po/fr.po +++ b/uSkyBlock-Core/src/main/po/fr.po @@ -81,7 +81,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/it.po b/uSkyBlock-Core/src/main/po/it.po index 2770759a7..e9487fb1e 100644 --- a/uSkyBlock-Core/src/main/po/it.po +++ b/uSkyBlock-Core/src/main/po/it.po @@ -77,7 +77,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/keys.pot b/uSkyBlock-Core/src/main/po/keys.pot index d49ddea20..2a289200a 100644 --- a/uSkyBlock-Core/src/main/po/keys.pot +++ b/uSkyBlock-Core/src/main/po/keys.pot @@ -81,7 +81,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/ko.po b/uSkyBlock-Core/src/main/po/ko.po index a797083e7..830c78cdd 100644 --- a/uSkyBlock-Core/src/main/po/ko.po +++ b/uSkyBlock-Core/src/main/po/ko.po @@ -76,7 +76,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/nl.po b/uSkyBlock-Core/src/main/po/nl.po index 435b8f3da..6179ce2b1 100644 --- a/uSkyBlock-Core/src/main/po/nl.po +++ b/uSkyBlock-Core/src/main/po/nl.po @@ -82,7 +82,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/pt_BR.po b/uSkyBlock-Core/src/main/po/pt_BR.po index eef7ed1a0..f395e61c3 100644 --- a/uSkyBlock-Core/src/main/po/pt_BR.po +++ b/uSkyBlock-Core/src/main/po/pt_BR.po @@ -81,7 +81,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/ru.po b/uSkyBlock-Core/src/main/po/ru.po index ae721bb8d..98e5bd380 100644 --- a/uSkyBlock-Core/src/main/po/ru.po +++ b/uSkyBlock-Core/src/main/po/ru.po @@ -81,7 +81,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/sv.po b/uSkyBlock-Core/src/main/po/sv.po index ace92e5b7..0356054d9 100644 --- a/uSkyBlock-Core/src/main/po/sv.po +++ b/uSkyBlock-Core/src/main/po/sv.po @@ -90,7 +90,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/vi_VN.po b/uSkyBlock-Core/src/main/po/vi_VN.po index 20c3b42fa..2b450752f 100644 --- a/uSkyBlock-Core/src/main/po/vi_VN.po +++ b/uSkyBlock-Core/src/main/po/vi_VN.po @@ -77,7 +77,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/xx_PIRATE.po b/uSkyBlock-Core/src/main/po/xx_PIRATE.po index 469a74364..a39a61db7 100644 --- a/uSkyBlock-Core/src/main/po/xx_PIRATE.po +++ b/uSkyBlock-Core/src/main/po/xx_PIRATE.po @@ -75,7 +75,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/xx_lol_US.po b/uSkyBlock-Core/src/main/po/xx_lol_US.po index a9ccf965f..f2edeebd8 100644 --- a/uSkyBlock-Core/src/main/po/xx_lol_US.po +++ b/uSkyBlock-Core/src/main/po/xx_lol_US.po @@ -75,7 +75,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/po/zh_CN.po b/uSkyBlock-Core/src/main/po/zh_CN.po index af7a71aa8..6ea87a650 100644 --- a/uSkyBlock-Core/src/main/po/zh_CN.po +++ b/uSkyBlock-Core/src/main/po/zh_CN.po @@ -80,7 +80,7 @@ msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "" #, java-format -msgid " §f{0}x §{1}" +msgid " §f{0}x §7{1}" msgstr "" #, java-format diff --git a/uSkyBlock-Core/src/main/resources/challenges.yml b/uSkyBlock-Core/src/main/resources/challenges.yml index 385973658..1427aa0bd 100644 --- a/uSkyBlock-Core/src/main/resources/challenges.yml +++ b/uSkyBlock-Core/src/main/resources/challenges.yml @@ -84,7 +84,7 @@ ranks: currency: 10 xp: 10 commands: - - op:effect {player} regeneration + - op:effect give {player} regeneration repeatReward: text: 1 leather, 10% chance to get a book items: @@ -256,7 +256,7 @@ ranks: name: '&7Novice Builder' description: Reach island level 20. type: islandLevel - requiredItems: [] + requiredLevel: 20 displayItem: COAL_ORE reward: text: 8 dirt, 8 sand, 5 emeralds @@ -268,12 +268,12 @@ ranks: currency: 20 xp: 20 commands: - - op:effect {party} regeneration + - op:effect give {party} regeneration adeptbuilder: name: '&aAdept Builder' description: Reach island level 50. type: islandLevel - requiredItems: [] + requiredLevel: 50 displayItem: IRON_ORE offset: -1 reward: @@ -288,7 +288,7 @@ ranks: name: '&eExpert Builder' description: Reach island level 100. type: islandLevel - requiredItems: [] + requiredLevel: 100 displayItem: GOLD_ORE offset: -1 reward: @@ -304,7 +304,7 @@ ranks: name: '&cMaster Builder' description: Reach island level 250. type: islandLevel - requiredItems: [] + requiredLevel: 250 displayItem: DIAMOND_ORE offset: -1 reward: @@ -320,7 +320,7 @@ ranks: name: '&4Sky Lord' description: Reach island level 500. type: islandLevel - requiredItems: [] + requiredLevel: 500 displayItem: EMERALD_ORE offset: -1 reward: @@ -1687,4 +1687,4 @@ ranks: # All commented settings (#) in the above challenges (not the explanation) can be removed to clean up the challenges.yml. # # DO NOT CHANGE! -version: 100 \ No newline at end of file +version: 101 \ No newline at end of file