Updated API other minor changes

Author: MikeTheShadow

.idea/jarRepositories.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.miketheshadow</groupId>
     <artifactId>complexproficiencies</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <name>ComplexProficiencies</name>
 
     <description>Complex Proficiencies for minecraft.</description>

pom.xml

@@ -41,7 +41,6 @@ public ComplexProficiencies setInstance() {
     @Override
     public void onEnable() {
 
-
         if (!setupEconomy()) {
             this.getLogger().severe("Disabled due to no Vault dependency found!");
             Bukkit.getPluginManager().disablePlugin(this);
@@ -91,9 +90,7 @@ public void onEnable() {
         this.getCommand("addexperience").setExecutor(new ExperienceCommandListener(this));
         LaborThread thread = new LaborThread();
         thread.start("Labor Thread");
-        Bukkit.getScheduler().scheduleSyncRepeatingTask(this, () -> {
-
-        }, 0L, 6000L);
+        //Bukkit.getScheduler().scheduleSyncRepeatingTask(this, () -> { }, 0L, 6000L);
     }
 
     private boolean setupEconomy() {
@@ -143,8 +140,7 @@ public void onDisable() {
             }
         }
     }
-
-
+    
     public void loadLevelConfig() {
         levelConfig = new Json("config", this.getDataFolder().getPath());
 

src/main/java/com/miketheshadow/complexproficiencies/ComplexProficiencies.java

@@ -2,14 +2,24 @@
 
 import com.miketheshadow.complexproficiencies.utils.CustomUser;
 import com.miketheshadow.complexproficiencies.utils.DBHandlers.UserDBHandler;
+import me.realized.duels.api.user.User;
 import org.bukkit.entity.Player;
 
 public class UserAPI {
 
+    @Deprecated
     public static CustomUser getUser(Player player){
         return UserDBHandler.getPlayer(player);
     }
 
+    public static boolean userHasLabor(Player player,int amount) {
+        return UserDBHandler.getPlayer(player).getLabor() > amount;
+    }
+
+    public static void updateExperience(Player player,String prof,int amount) {
+        UserDBHandler.getPlayer(player).addExperience(prof,amount,player);
+    }
+
     public static void updateUser(CustomUser user){
         UserDBHandler.updatePlayer(user);
     }

src/main/java/com/miketheshadow/complexproficiencies/api/UserAPI.java

@@ -15,7 +15,7 @@ public class EntityDeathListener implements Listener {
     public void onEntityDeath(EntityDeathEvent event) {
         if(event.getEntity().getType() == EntityType.DONKEY) {
             List<ItemStack> drops = event.getDrops();
-            drops = new ArrayList<>();;
+            drops = new ArrayList<>();
             event.setDroppedExp(0);
         }
     }

src/main/java/com/miketheshadow/complexproficiencies/listener/EntityDeathListener.java

@@ -25,8 +25,7 @@
 public class PlayerAttacksListener implements Listener
 {
     @EventHandler(priority =  EventPriority.LOWEST)
-    public void onEntityAttacksEntity(EntityDamageByEntityEvent event)
-    {
+    public void onEntityAttacksEntity(EntityDamageByEntityEvent event) {
         if (!(event.getDamager() instanceof Player && event.getEntity() instanceof Player)) return;
         int levelDif = levelConfig.getInt("settings.levelDifference");
         //WORLDGUARD BS

src/main/java/com/miketheshadow/complexproficiencies/listener/PlayerAttacksListener.java

@@ -99,6 +99,8 @@ public Document toDocument() {
     }
 
     public void addExperience(String profName, int amount, Player player) {
+
+        labor -= amount;
         if(this.professions.get(profName) == null) {
             this.professions.put(profName,0);
             UserDBHandler.updatePlayer(this);
@@ -114,8 +116,9 @@ public void addExperience(String profName, int amount, Player player) {
         gainMessage += (ChatColor.GRAY + " [" + ChatColor.GREEN + exp + ChatColor.GRAY + "/" + ChatColor.GREEN + nextlevel + ChatColor.GRAY + "]");
 
         player.sendMessage(gainMessage);
-        if (before != after)
-            player.sendMessage(ChatColor.GRAY + "Your " + ChatColor.GOLD + profName.toLowerCase() + ChatColor.GRAY + " has reached level " + ChatColor.GREEN + after);
+        if (before != after) player.sendMessage(ChatColor.GRAY + "Your " + ChatColor.GOLD + profName.toLowerCase() + ChatColor.GRAY + " has reached level " + ChatColor.GREEN + after);
+        player.sendMessage(ChatColor.YELLOW + "You currently have [" + ChatColor.GOLD + (getLabor()) + ChatColor.GRAY + "/" + ChatColor.GOLD + "2000" + ChatColor.GRAY + "]" + ChatColor.YELLOW + " labor!");
+        UserDBHandler.updatePlayer(this);
     }
 
     public int getLevelFromTotal(int totalExperience) {

src/main/java/com/miketheshadow/complexproficiencies/utils/CustomUser.java

@@ -4,7 +4,6 @@
 import com.miketheshadow.complexproficiencies.utils.DBHandlers.UserDBHandler;
 import de.leonhard.storage.Json;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 import static com.miketheshadow.complexproficiencies.ComplexProficiencies.levelConfig;
@@ -84,7 +83,7 @@ public static int getPlayerCurrentXP(CustomUser user) {
         return -1;
     }
 
-    public static void runLevelUpCommands(CustomUser user,int level)
+    private static void runLevelUpCommands(CustomUser user,int level)
     {
         int id = 1;
         String command =replaceTagsWithInformation(user,level,id);
@@ -97,7 +96,7 @@ public static void runLevelUpCommands(CustomUser user,int level)
         }
     }
 
-    public static String replaceTagsWithInformation(CustomUser user,int level,int id)
+    private static String replaceTagsWithInformation(CustomUser user,int level,int id)
     {
         Json levelConf = levelConfig;
         String command = levelConf.getString(level + "." + id);