From 8043bd292880865d1592c4653db581620158f817 Mon Sep 17 00:00:00 2001
From: Roman Danilov <neci.03@mail.ru>
Date: Thu, 29 Feb 2024 23:56:57 +0300
Subject: [PATCH] Improve logging v2

---
 .../nekiplay/meteorplus/MeteorPlusAddon.java  | 28 ++++++++++---
 .../java/nekiplay/meteorplus/MixinPlugin.java | 39 ++-----------------
 2 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java b/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java
index d3803a6..3e3e378 100644
--- a/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java
+++ b/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java
@@ -51,10 +51,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static nekiplay.meteorplus.MixinPlugin.*;
+
 public class MeteorPlusAddon extends MeteorAddon {
 	public static final Logger LOG = LoggerFactory.getLogger(MeteorPlusAddon.class);
-	//public static final Category CATEGORY = new Category("Meteor+", ModItems.LOGO_ITEM.getDefaultStack());
-
 	public static final ItemStack logo_mods_item = ModItems.LOGO_MODS_ITEM.getDefaultStack();
 
 	public static final Category CATEGORYMODS = new Category("Integrations", logo_mods_item);
@@ -73,6 +73,22 @@ public void onInitialize() {
 
 		LOG.info(LOGPREFIX + " Initializing...");
 
+		if (isXaeroWorldMapresent) {
+			if (!isBaritonePresent) {
+				LOG.warn(LOGPREFIX + " [Baritone] not found, disabling Xaero's World Map improvement");
+			}
+		}
+		if (isJourneyMapPresent) {
+			if (!isBaritonePresent) {
+				LOG.warn(LOGPREFIX + " [Baritone] not found, disabling Journey Map improvement");
+			}
+		}
+		if (!isBaritonePresent) {
+			LOG.warn(LOGPREFIX + " [Baritone] not found, disabling Freecam and Waypoints improvement");
+		}
+		if (!isWhereIsIt) {
+			LOG.warn(LOGPREFIX + " [Where is it] not found, disabling ChestTracker improvement");
+		}
 
 		//region Commands
 		LOG.info(LOGPREFIX + " Initializing commands...");
@@ -80,7 +96,7 @@ public void onInitialize() {
 		Commands.add(new ItemRawIdCommand());
 		Commands.add(new Eclip());
 		Commands.add(new ClearInventory());
-		if (MixinPlugin.isBaritonePresent) {
+		if (isBaritonePresent) {
 			Commands.add(new GotoPlus());
 		}
 		Commands.add(new GPT());
@@ -135,7 +151,7 @@ public void onInitialize() {
 		}
 		modules.add(new NoSlowPlus());
 		//modules.add(new VelocityPlus());
-		if (MixinPlugin.isXaeroWorldMapresent || MixinPlugin.isJourneyMapPresent) {
+		if (isXaeroWorldMapresent || isJourneyMapPresent) {
 			modules.add(new MapIntegration());
 			LOG.info(LOGPREFIX + " Loaded mini-map integration");
 		}
@@ -171,8 +187,8 @@ public void onInitialize() {
 	@Override
 	public void onRegisterCategories() {
 		LOG.info(LOGPREFIX + " registering categories...");
-		if (MixinPlugin.isXaeroWorldMapresent ||
-			MixinPlugin.isJourneyMapPresent ||
+		if (isXaeroWorldMapresent ||
+			isJourneyMapPresent ||
 			MixinPlugin.isLitematicaMapresent ||
 			MixinPlugin.isWhereIsIt
 		) {
diff --git a/src/main/java/nekiplay/meteorplus/MixinPlugin.java b/src/main/java/nekiplay/meteorplus/MixinPlugin.java
index fba1065..7a4eb48 100644
--- a/src/main/java/nekiplay/meteorplus/MixinPlugin.java
+++ b/src/main/java/nekiplay/meteorplus/MixinPlugin.java
@@ -47,47 +47,16 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
 			throw new RuntimeException(LOGPREFIX + " " + mixinClassName + " is not in the mixin package");
 		}
 		else if (mixinClassName.startsWith(mixinPackage + ".meteorclient")) {
-			if (isBaritonePresent && (mixinClassName.contains("FreecamMixin") || mixinClassName.contains("WaypointsMixin"))) {
-				return true;
-			}
-			else {
-				LOG.info(LOGPREFIX + " [Baritone] not found, disabling Freecam and Waypoints improvement");
-				return false;
-			}
+            return isBaritonePresent && (mixinClassName.contains("FreecamMixin") || mixinClassName.contains("WaypointsModuleMixin"));
 		}
 		else if (mixinClassName.startsWith(mixinPackage + ".journeymap")) {
-			if (isJourneyMapPresent) {
-				if (isBaritonePresent) {
-					return true;
-				}
-				else {
-					LOG.info(LOGPREFIX + " [Baritone] not found, disabling Journey Map improvement");
-					return false;
-				}
-			}
+			return isBaritonePresent && isJourneyMapPresent;
 		}
 		else if (mixinClassName.startsWith(mixinPackage + ".xaero")) {
-			if (isXaeroWorldMapresent) {
-				if (isBaritonePresent) {
-					return true;
-				}
-				else {
-					LOG.info(LOGPREFIX + " [Baritone] not found, disabling Xaero's World Map improvement");
-					return false;
-				}
-			}
+			return isBaritonePresent && isXaeroWorldMapresent;
 		}
 		else if (mixinClassName.startsWith(mixinPackage + ".whereisit")) {
-			if (isWhereIsIt) {
-				return true;
-			}
-			else {
-				LOG.info(LOGPREFIX + " [Where is it] not found, disabling ChestTracker improvement");
-				return false;
-			}
-		}
-		else if (mixinClassName.startsWith(mixinPackage + ".baritone")) {
-			return isBaritonePresent;
+            return isWhereIsIt;
 		}
 		return false;
 	}