Changelog for v2.7.6-RC1

rlf · Aug 6, 2018 · 6053fe6 · 6053fe6
1 parent 5617e54
commit 6053fe6
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 34 deletions.
diff --git 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
@@ -41,7 +41,7 @@ public synchronized String diff(Collection<ItemStack> 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
@@ -47,6 +47,7 @@ static Type from(String s) {
     private final List<String> requiredItems;
     private final List<EntityMatch> requiredEntities;
     private final List<String> 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<String> requiredItems,
-                     List<EntityMatch> requiredEntities, List<String> requiredChallenges, Rank rank, int resetInHours,
+                     List<EntityMatch> requiredEntities, List<String> 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<ItemStack> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+version: 101