Merge pull request #11 from Lucaa8/8-improve-the-required-others-message

V1.1.5: Small fix to accept client v1.3.0 and clarify messages for mo…

Author: Lucaa8

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ch.luca008</groupId>
     <artifactId>Challenges</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 
     <name>Uni-Challenges</name>
     <description>Custom challenges for Skyblock</description>
@@ -22,7 +22,7 @@
         <!-- For the SpigotApi dependency -->
         <repository>
             <id>dev-mc</id>
-            <url>https://mvn.luca-dc.ch/nexus/content/repositories/dev-mc/</url>
+            <url>https://mvn.luca-dc.ch/repository/dev-mc/</url>
         </repository>
         <!-- For the github vault dependency -->
         <repository>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>ch.luca008</groupId>
             <artifactId>SpigotApi</artifactId>
-            <version>2.1</version>
+            <version>2.1.3</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

src/main/java/ch/luca008/Challenges.java

@@ -42,7 +42,7 @@ public class Challenges extends JavaPlugin implements Listener {
     private Economy economy;
     private Reset reset;
     private SessionManager editor;
-    public final static String clientVersion = "1.2.0";
+    public final static String clientVersion = "1.3.0";
 
     private void commandsRegister(){
         this.getCommand("challenge").setExecutor(new ChallengeCommand());
@@ -64,6 +64,7 @@ public void onEnable() {
         commandsRegister();
         eventsRegister();
         challenges.load();
+        areChallengesEnabled = getStateFile();
         lang = Lang.getInstance(new File(getDataFolder(),"Lang"));
         inventoryManager = new ChallengesInventory();
         setupEconomy();

src/main/java/ch/luca008/ChallengesManager/Required/Others.java

@@ -187,7 +187,8 @@ public JSONObject toJson(){
         }
         public String toLore(UniPlayer player){
             if(count<=0)return "";
-            return "§f -§b " + count + " §a" +Challenges.getGlobalConfig().getCurrencyName()+(delete?"\n"+player.getChallengeMessage("Challenge-Item-Required-Others-Money-Delete"):"");
+            String warning = "\n" + player.getChallengeMessage("Challenge-Item-Required-Others-Money" + (delete ? "-Delete" : ""));
+            return "§f -§b " + count + " §a" +Challenges.getGlobalConfig().getCurrencyName()+warning;
         }
         @Override
         public String toString() {
@@ -270,7 +271,8 @@ public JSONObject toJson(){
         }
         public String toLore(UniPlayer player){
             if(count<=0)return "";
-            return "§f -§b " + count + " §a" +player.getChallengeMessage(type.getLangKey())+(delete?"\n"+player.getChallengeMessage("Challenge-Item-Required-Others-Exp-Delete"):"");
+            String warning = "\n" + player.getChallengeMessage("Challenge-Item-Required-Others-Exp" + (delete ? "-Delete" : ""));
+            return "§f -§b " + count + " §a" +player.getChallengeMessage(type.getLangKey())+warning;
         }
         public UUID getUuid(){
             return uuid;

src/main/java/ch/luca008/Commands/ChallengeCommand.java

@@ -17,7 +17,6 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Skeleton;
 
 import java.util.List;
 import java.util.Map;