meta: remove the monkey check triggering the tab list warning (#1303)

2 files changed, 2 insertions, 58 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
index 5749656e..31ce3656 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
@@ -323,61 +323,6 @@ public class PetInfoOverlay extends TextOverlay {
 		return pet;
 	}
 
-	public static float getXpGain(Pet pet, float xp, String xpType) {
-		if (pet.petLevel.getCurrentLevel() >= pet.petLevel.getMaxLevel()) return 0;
-
-		if (validXpTypes == null)
-			validXpTypes = Lists.newArrayList(
-				"mining",
-				"foraging",
-				"enchanting",
-				"farming",
-				"combat",
-				"fishing",
-				"alchemy",
-				"all"
-			);
-		if (!validXpTypes.contains(xpType.toLowerCase(Locale.ROOT))) return 0;
-
-		float tamingPercent = 1.0f + (config.tamingLevel / 100f);
-		xp = xp * tamingPercent;
-		xp = xp + (xp * config.beastMultiplier / 100f);
-
-		if (pet.petXpType != null && !pet.petXpType.equalsIgnoreCase(xpType) && !pet.petXpType.equalsIgnoreCase("all")) {
-			xp = xp / 3f;
-
-			if (xpType.equalsIgnoreCase("alchemy") || xpType.equalsIgnoreCase("enchanting")) {
-				xp = xp / 4f;
-			}
-		}
-		if (xpType.equalsIgnoreCase("mining") || xpType.equalsIgnoreCase("fishing")) {
-			xp = xp * 1.5f;
-		}
-
-		if (pet.petItem != null) {
-			Matcher petItemMatcher = XP_BOOST_PATTERN.matcher(pet.petItem);
-			if ((petItemMatcher.matches() && petItemMatcher.group(1).equalsIgnoreCase(xpType))
-				|| pet.petItem.equalsIgnoreCase("ALL_SKILLS_SUPER_BOOST")) {
-				xp = xp * getBoostMultiplier(pet.petItem);
-			}
-		}
-		JsonObject pets = Constants.PETS;
-		if (pets != null && pets.has("custom_pet_leveling") &&
-			pets.get("custom_pet_leveling").getAsJsonObject().has(pet.petType.toUpperCase(Locale.ROOT)) &&
-			pets.get("custom_pet_leveling").getAsJsonObject().get(pet.petType.toUpperCase(Locale.ROOT)).getAsJsonObject().has(
-				"xp_multiplier")) {
-			xp *= pets
-				.get("custom_pet_leveling")
-				.getAsJsonObject()
-				.get(pet.petType.toUpperCase(Locale.ROOT))
-				.getAsJsonObject()
-				.get(
-					"xp_multiplier")
-				.getAsFloat();
-		}
-		return xp;
-	}
-
 	private int firstPetLines = 0;
 	private int secondPetLines = 0;
 
@@ -554,8 +499,7 @@ public class PetInfoOverlay extends TextOverlay {
 	}
 
 	public void update() {
-		if (!NotEnoughUpdates.INSTANCE.config.petOverlay.enablePetInfo &&
-			!NotEnoughUpdates.INSTANCE.config.itemOverlays.enableMonkeyCheck) {
+		if (!NotEnoughUpdates.INSTANCE.config.petOverlay.enablePetInfo) {
 			overlayStrings = null;
 			return;
 		}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/ItemOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/ItemOverlays.java
index 10fd3503..ac91ddef 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/ItemOverlays.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/ItemOverlays.java
@@ -73,7 +73,7 @@ public class ItemOverlays {
 	@Expose
 	@ConfigOption(
 		name = "Enable Monkey Pet Check",
-		desc = "Will check using the API to check what pet you're using\nto determine the cooldown based off of if you have a monkey pet."
+		desc = "Determines the cooldown based off of if you have a monkey pet."
 	)
 	@ConfigEditorBoolean
 	@ConfigAccordionId(id = 0)