From 485e4b76824eb17ae389901831b67504f1a925f4 Mon Sep 17 00:00:00 2001
From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com>
Date: Thu, 24 Sep 2026 14:46:57 +0000
Subject: [PATCH] refactor: use TLibs scanning and RPCharacters focus

---
 pom.xml                                         | 17 ++---------------
 src/main/java/net/tfminecraft/magic/Magic.java  |  2 +-
 .../artifact/ArtifactAttuneScanHandler.java     |  2 +-
 .../magic/gui/ResonanceGuiBuilder.java          |  7 +++----
 .../magic/meditation/MeditationService.java     |  6 +++---
 src/main/resources/plugin.yml                   |  4 ++--
 6 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5bf88f4..7624584 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,9 +13,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.proc>full</maven.compiler.proc>
         <interactiblefurniture.version>0.2.0</interactiblefurniture.version>
-        <rpcharacters.version>2.0.1</rpcharacters.version>
-        <tfmccore.version>2.0.0</tfmccore.version>
-        <tlibs.version>2.0.0</tlibs.version>
+        <rpcharacters.version>2.1.0</rpcharacters.version>
+        <tlibs.version>2.1.0</tlibs.version>
     </properties>
 
     <dependencies>
@@ -91,18 +90,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>net.tfminecraft</groupId>
-            <artifactId>tfmccore</artifactId>
-            <version>${tfmccore.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>net.tfminecraft</groupId>
             <artifactId>interactiblefurniture</artifactId>
diff --git a/src/main/java/net/tfminecraft/magic/Magic.java b/src/main/java/net/tfminecraft/magic/Magic.java
index b40f53f..683c4d8 100644
--- a/src/main/java/net/tfminecraft/magic/Magic.java
+++ b/src/main/java/net/tfminecraft/magic/Magic.java
@@ -53,7 +53,7 @@
 import net.tfminecraft.magic.service.ResonanceService;
 import net.tfminecraft.magic.util.GridLayout;
 import net.tfminecraft.magic.util.RevisionTracker;
-import net.tfminecraft.tfmccore.itemscan.ItemScanService;
+import net.tfminecraft.tlibs.itemscan.ItemScanService;
 
 /**
  * Elemental resonance and casting modes. See docs/ for batch plan.
diff --git a/src/main/java/net/tfminecraft/magic/artifact/ArtifactAttuneScanHandler.java b/src/main/java/net/tfminecraft/magic/artifact/ArtifactAttuneScanHandler.java
index 58eaf43..99d6c85 100644
--- a/src/main/java/net/tfminecraft/magic/artifact/ArtifactAttuneScanHandler.java
+++ b/src/main/java/net/tfminecraft/magic/artifact/ArtifactAttuneScanHandler.java
@@ -4,7 +4,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 
-import net.tfminecraft.tfmccore.itemscan.ItemScanHandler;
+import net.tfminecraft.tlibs.itemscan.ItemScanHandler;
 
 public final class ArtifactAttuneScanHandler implements ItemScanHandler {
 
diff --git a/src/main/java/net/tfminecraft/magic/gui/ResonanceGuiBuilder.java b/src/main/java/net/tfminecraft/magic/gui/ResonanceGuiBuilder.java
index ee3ff96..71b2922 100644
--- a/src/main/java/net/tfminecraft/magic/gui/ResonanceGuiBuilder.java
+++ b/src/main/java/net/tfminecraft/magic/gui/ResonanceGuiBuilder.java
@@ -27,8 +27,7 @@
 import net.tfminecraft.magic.util.GuiText;
 import net.tfminecraft.magic.util.ItemRef;
 import net.tfminecraft.magic.util.ResonanceBar;
-import net.tfminecraft.tfmccore.TFMCCore;
-import net.tfminecraft.tfmccore.focus.FocusConfig;
+import net.tfminecraft.rpcharacters.RPCharacters;
 
 public final class ResonanceGuiBuilder {
 
@@ -129,10 +128,10 @@ private static List<String> buildHeadLore(Player player, ResonanceSession sessio
     private static String formatFocusLore(Player player) {
         int current = 0;
         int max = 0;
-        var focus = TFMCCore.getFocusService();
+        var focus = RPCharacters.getFocusService();
         if (focus != null) {
             current = focus.getPoints(player);
-            max = FocusConfig.max;
+            max = focus.getMax();
         }
         String line = GuiCache.focusLore
                 .replace("{current}", String.valueOf(current))
diff --git a/src/main/java/net/tfminecraft/magic/meditation/MeditationService.java b/src/main/java/net/tfminecraft/magic/meditation/MeditationService.java
index 88896f6..0a54d31 100644
--- a/src/main/java/net/tfminecraft/magic/meditation/MeditationService.java
+++ b/src/main/java/net/tfminecraft/magic/meditation/MeditationService.java
@@ -29,8 +29,8 @@
 import net.tfminecraft.magic.profile.MagicProfileService;
 import net.tfminecraft.magic.session.ResonanceSession;
 import net.tfminecraft.magic.session.ResonanceSessionManager;
-import net.tfminecraft.tfmccore.TFMCCore;
-import net.tfminecraft.tfmccore.focus.FocusService;
+import net.tfminecraft.rpcharacters.RPCharacters;
+import net.tfminecraft.rpcharacters.focus.FocusService;
 
 public final class MeditationService implements Listener {
 
@@ -220,7 +220,7 @@ private void tryHit(Player player) {
         if (orb == null) {
             return;
         }
-        FocusService focus = TFMCCore.getFocusService();
+        FocusService focus = RPCharacters.getFocusService();
         if (focus == null || !focus.trySpend(player, MeditationCache.mentalCostPerHit)) {
             if (session.claimTiredNotice()) {
                 player.sendMessage(Messages.get("meditation.tired"));
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 75f9616..819825c 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,8 +3,8 @@ api-version: '1.21.10'
 name: Magic
 version: ${project.version}
 author: Drefvelin
-depend: [TLibs, ItemsAdder, TFMCCore, InteractibleFurniture]
-softdepend: [RPCharacters, MMOItems, MythicLib, MMOCore]
+depend: [TLibs, ItemsAdder, RPCharacters, InteractibleFurniture]
+softdepend: [MMOItems, MythicLib, MMOCore]
 
 commands:
   resonance: