Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable

# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

Changelog.txt

@@ -155,6 +155,11 @@ Version 2.2.0
     Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition
     Added API method to check if a skill was being level capped
 
+Version 2.1.38
+    Roll XP cooldown down from 60 seconds to 10
+    Updated pt_BR localization (thanks FabioZumbi12)
+    NOTE: The XP Cooldown will be configurable in 2.2 which is nearing the finish line
+
 Version 2.1.37
     Fixed a potential IndexOutOfBoundsException when informing a disconnected player that their Blast Mining was off CD
     Updated hu_HU locale (thanks andris)

README.md

@@ -10,7 +10,7 @@ I plan to post links to our new wiki (its still under development), downloads, a
 
 
 ### Builds
-Currently, you can obtain our builds via the Spigot resource page: https://spigot.mcmmo.org
+Currently, you can obtain our builds via the Spigot resource page: http://spigot.mcmmo.org
 
 ### Brief Description
 The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
@@ -47,4 +47,4 @@ Required Libraries:
 * Bukkit
 * JUnit
 
-https://spigot.mcmmo.org for more up to date information.
+http://spigot.mcmmo.org for more up to date information.

src/main/java/com/gmail/nossr50/config/hocon/SalvageableSerializer.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.config.hocon;
 
-import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
 import com.google.common.reflect.TypeToken;
 import ninja.leaping.configurate.ConfigurationNode;
@@ -8,7 +7,6 @@ import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
 import ninja.leaping.configurate.util.EnumLookup;
 
-import java.util.List;
 import java.util.Optional;
 
 public class SalvageableSerializer implements TypeSerializer<Salvageable> {

src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitAcrobatics.java

@@ -9,7 +9,7 @@ public class ConfigSectionExploitAcrobatics {
     private static final int ACROBATIC_LOCATION_LIMIT_DEFAULT = 50;
     private static final boolean PREVENT_ACROBATICS_ABUSE_DEFAULT = true;
     private static final int TELEPORT_COOLDOWN_DEFAULT = 30;
-    private static final int ROLL_XP_GAIN_CD_DEFAULT = 60;
+    private static final int ROLL_XP_GAIN_CD_DEFAULT = 10;
 
     @Setting(value = "Player-Fall-Location-Tracking",
             comment = "The amount of locations to keep track of for player falls." +

src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.skills.acrobatics;
 
-import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -28,7 +27,7 @@ public class AcrobaticsManager extends SkillManager {
     }
 
     private long rollXPCooldown = 0;
-    private long rollXPInterval; //1 Minute
+    private long rollXPInterval;
     private long rollXPIntervalLengthen = (1000 * 10); //10 Seconds
 
     public boolean canGainRollXP()

src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java

@@ -1,12 +1,10 @@
 package com.gmail.nossr50.skills.mining;
 
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.RankUtils;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;

src/main/java/com/gmail/nossr50/skills/mining/Mining.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.ItemUtils;
 import com.gmail.nossr50.util.Misc;
-import net.royawesome.jlibnoise.module.combiner.Min;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -11,7 +11,10 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.skills.AbilityCooldownTask;
 import com.gmail.nossr50.skills.SkillManager;
-import com.gmail.nossr50.util.*;
+import com.gmail.nossr50.util.BlockUtils;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.RankUtils;

src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.datatypes.skills.ItemType;
 import com.gmail.nossr50.util.ItemUtils;
 import org.bukkit.Material;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java

@@ -5,8 +5,6 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Entity;
 
-import java.io.IOException;
-
 public class NullChunkManager implements ChunkManager {
 
     @Override