Add support for enchanting 60

3 files changed, 11 insertions, 11 deletions

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 3127f98..22a8009 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -332,7 +332,7 @@ public class DankersSkyblockMod
     		for (String section : actionBarSections) {
     			if (section.contains("+") && section.contains("/") && section.contains("(")) {
     				if (!section.contains("Runecrafting") && !section.contains("Carpentry")) {
-    					int limit = section.contains("Farming") ? 60 : 50;
+    					int limit = section.contains("Farming") || section.contains("Enchanting") ? 60 : 50;
     					double currentXP = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
     					int xpToLevelUp = Integer.parseInt(section.substring(section.indexOf("/") + 1, section.indexOf(")")).replaceAll(",", ""));
     					xpLeft = xpToLevelUp - currentXP;
@@ -399,7 +399,7 @@ public class DankersSkyblockMod
     					double currentXp = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
     					int limit;
     					int totalXp;
-    					if (section.contains("Farming")) {
+    					if (section.contains("Farming") || section.contains("Enchanting")) {
     						limit = 60;
     						totalXp = 111672425;
     					} else {
diff --git a/src/main/java/me/Danker/commands/LobbySkillsCommand.java b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
index ee71669..e5bf98c 100644
--- a/src/main/java/me/Danker/commands/LobbySkillsCommand.java
+++ b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
@@ -116,7 +116,7 @@ public class LobbySkillsCommand extends CommandBase {
 							fishingLevel = (double) Math.round(fishingLevel * 100) / 100;
 						}
 						if (latestProfile.has("experience_skill_enchanting")) {
-							enchantingLevel = Utils.xpToSkillLevel(latestProfile.get("experience_skill_enchanting").getAsDouble(), 50);
+							enchantingLevel = Utils.xpToSkillLevel(latestProfile.get("experience_skill_enchanting").getAsDouble(), 60);
 							enchantingLevel = (double) Math.round(enchantingLevel * 100) / 100;
 						}
 						if (latestProfile.has("experience_skill_alchemy")) {
@@ -143,25 +143,25 @@ public class LobbySkillsCommand extends CommandBase {
 							farmingLevel = achievementObject.get("skyblock_harvester").getAsInt();
 						}
 						if (achievementObject.has("skyblock_excavator")) {
-							miningLevel = achievementObject.get("skyblock_excavator").getAsInt();
+							miningLevel = Math.min(achievementObject.get("skyblock_excavator").getAsInt(), 50);
 						}
 						if (achievementObject.has("skyblock_combat")) {
-							combatLevel = achievementObject.get("skyblock_combat").getAsInt();
+							combatLevel = Math.min(achievementObject.get("skyblock_combat").getAsInt(), 50);
 						}
 						if (achievementObject.has("skyblock_gatherer")) {
-							foragingLevel = achievementObject.get("skyblock_gatherer").getAsInt();
+							foragingLevel = Math.min(achievementObject.get("skyblock_gatherer").getAsInt(), 50);
 						}
 						if (achievementObject.has("skyblock_angler")) {
-							fishingLevel = achievementObject.get("skyblock_angler").getAsInt();
+							fishingLevel = Math.min(achievementObject.get("skyblock_angler").getAsInt(), 50);
 						}
 						if (achievementObject.has("skyblock_augmentation")) {
 							enchantingLevel = achievementObject.get("skyblock_augmentation").getAsInt();
 						}
 						if (achievementObject.has("skyblock_concoctor")) {
-							alchemyLevel = achievementObject.get("skyblock_concoctor").getAsInt();
+							alchemyLevel = Math.min(achievementObject.get("skyblock_concoctor").getAsInt(), 50);
 						}
 						if (achievementObject.has("skyblock_domesticator")) {
-							tamingLevel = achievementObject.get("skyblock_domesticator").getAsInt();
+							tamingLevel = Math.min(achievementObject.get("skyblock_domesticator").getAsInt(), 50);
 						}
 					}
 					
diff --git a/src/main/java/me/Danker/commands/SkillsCommand.java b/src/main/java/me/Danker/commands/SkillsCommand.java
index 5ac4b8b..2d5cf78 100644
--- a/src/main/java/me/Danker/commands/SkillsCommand.java
+++ b/src/main/java/me/Danker/commands/SkillsCommand.java
@@ -112,7 +112,7 @@ public class SkillsCommand extends CommandBase {
 					fishingLevel = (double) Math.round(fishingLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_enchanting")) {
-					enchantingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_enchanting").getAsDouble(), 50);
+					enchantingLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_enchanting").getAsDouble(), 60);
 					enchantingLevel = (double) Math.round(enchantingLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_alchemy")) {
@@ -153,7 +153,7 @@ public class SkillsCommand extends CommandBase {
 					fishingLevel = Math.min(achievementObject.get("skyblock_angler").getAsInt(), 50);
 				}
 				if (achievementObject.has("skyblock_augmentation")) {
-					enchantingLevel = Math.min(achievementObject.get("skyblock_augmentation").getAsInt(), 50);
+					enchantingLevel = achievementObject.get("skyblock_augmentation").getAsInt();
 				}
 				if (achievementObject.has("skyblock_concoctor")) {
 					alchemyLevel = Math.min(achievementObject.get("skyblock_concoctor").getAsInt(), 50);