Merge remote-tracking branch 'origin/navigator-api-migration' into dev

GTNewHorizons · Jul 16, 2024 · 908192e · 908192e
2 parents a65df85 + dfdff3b
commit 908192e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 50 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,7 +5,7 @@ dependencies {
     api("com.github.GTNewHorizons:GTNHLib:0.3.1:dev")
     compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev")
     compileOnly("com.github.GTNewHorizons:EnderIO:2.8.6:dev")
-    compileOnly("com.github.GTNewHorizons:Navigator:1.0.2:dev")
+    compileOnly("com.github.GTNewHorizons:Navigator:1.0.5:dev")
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.8.0:dev")
 }
diff --git a/src/main/java/serverutils/integration/navigator/ClaimsLayerManager.java b/src/main/java/serverutils/integration/navigator/ClaimsLayerManager.java
@@ -5,19 +5,25 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 
-import com.gtnewhorizons.navigator.api.model.layers.WaypointProviderManager;
+import com.gtnewhorizons.navigator.api.model.SupportedMods;
+import com.gtnewhorizons.navigator.api.model.layers.InteractableLayerManager;
+import com.gtnewhorizons.navigator.api.model.layers.LayerRenderer;
 import com.gtnewhorizons.navigator.api.model.locations.IWaypointAndLocationProvider;
 import com.gtnewhorizons.navigator.api.model.waypoints.Waypoint;
 import com.gtnewhorizons.navigator.api.util.Util;
 
 import serverutils.client.gui.ClientClaimedChunks;
+import serverutils.integration.navigator.journeymap.JMClaimsRenderer;
+import serverutils.integration.navigator.xaero.XaeroClaimsRenderer;
 import serverutils.lib.math.ChunkDimPos;
 import serverutils.net.MessageJourneyMapRequest;
 
-public class ClaimsLayerManager extends WaypointProviderManager {
+public class ClaimsLayerManager extends InteractableLayerManager {
 
     public static final ClaimsLayerManager INSTANCE = new ClaimsLayerManager();
     private int oldMinBlockX = 0;
@@ -30,6 +36,16 @@ public ClaimsLayerManager() {
         super(ClaimsButtonManager.INSTANCE);
     }
 
+    @Nullable
+    @Override
+    protected LayerRenderer addLayerRenderer(InteractableLayerManager manager, SupportedMods mod) {
+        return switch (mod) {
+            case JourneyMap -> new JMClaimsRenderer(manager);
+            case XaeroWorldMap -> new XaeroClaimsRenderer(manager);
+            default -> null;
+        };
+    }
+
     @Override
     public void setActiveWaypoint(Waypoint waypoint) {}
 

diff --git a/src/main/java/serverutils/integration/navigator/NavigatorIntegration.java b/src/main/java/serverutils/integration/navigator/NavigatorIntegration.java
@@ -12,8 +12,6 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import serverutils.client.gui.ClientClaimedChunks;
-import serverutils.integration.navigator.journeymap.JMClaimsRenderer;
-import serverutils.integration.navigator.xaero.XaeroClaimsRenderer;
 import serverutils.lib.math.ChunkDimPos;
 import serverutils.net.MessageClaimedChunksModify;
 import serverutils.net.MessageClaimedChunksUpdate;
@@ -28,14 +26,6 @@ public class NavigatorIntegration {
 
     public static void init() {
         NavigatorApi.registerLayerManager(ClaimsLayerManager.INSTANCE);
-        NavigatorApi.registerButtonManager(ClaimsButtonManager.INSTANCE);
-        if (Util.isJourneyMapInstalled()) {
-            NavigatorApi.registerLayerRenderer(JMClaimsRenderer.INSTANCE);
-        }
-
-        if (Util.isXaerosWorldMapInstalled()) {
-            NavigatorApi.registerLayerRenderer(XaeroClaimsRenderer.INSTANCE);
-        }
     }
 
     public static void updateMap(MessageJourneyMapUpdate message) {

diff --git a/src/main/java/serverutils/integration/navigator/journeymap/JMClaimsRenderer.java b/src/main/java/serverutils/integration/navigator/journeymap/JMClaimsRenderer.java
@@ -4,19 +4,17 @@
 import java.util.List;
 
 import com.gtnewhorizons.navigator.api.journeymap.render.JMInteractableLayerRenderer;
+import com.gtnewhorizons.navigator.api.model.layers.InteractableLayerManager;
 import com.gtnewhorizons.navigator.api.model.locations.ILocationProvider;
 import com.gtnewhorizons.navigator.api.model.steps.RenderStep;
 
-import serverutils.integration.navigator.ClaimsLayerManager;
 import serverutils.integration.navigator.ClaimsLocation;
 import serverutils.integration.navigator.NavigatorIntegration;
 
 public class JMClaimsRenderer extends JMInteractableLayerRenderer {
 
-    public static final JMClaimsRenderer INSTANCE = new JMClaimsRenderer();
-
-    public JMClaimsRenderer() {
-        super(ClaimsLayerManager.INSTANCE);
+    public JMClaimsRenderer(InteractableLayerManager manager) {
+        super(manager);
     }
 
     @Override

diff --git a/src/main/java/serverutils/integration/navigator/journeymap/JMRenderStep.java b/src/main/java/serverutils/integration/navigator/journeymap/JMRenderStep.java
@@ -1,7 +1,6 @@
 package serverutils.integration.navigator.journeymap;
 
 import java.awt.geom.Point2D;
-import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.client.gui.FontRenderer;
@@ -50,9 +49,7 @@ public void draw(double draggedPixelX, double draggedPixelY, GridRenderer gridRe
     }
 
     @Override
-    public List<String> getTooltip() {
-        final List<String> tooltip = new ArrayList<>();
-
+    public void getTooltip(List<String> tooltip) {
         tooltip.add(location.getTeamName());
 
         if (!location.teamHint().isEmpty()) {
@@ -66,11 +63,11 @@ public List<String> getTooltip() {
             tooltip.add(location.toggleLoadHint());
             tooltip.add(location.unclaimHint());
         }
-        return tooltip;
     }
 
     @Override
-    public void drawTooltip(FontRenderer fontRenderer, int mouseX, int mouseY, int displayWidth, int displayHeight) {}
+    public void drawCustomTooltip(FontRenderer fontRenderer, int mouseX, int mouseY, int displayWidth,
+            int displayHeight) {}
 
     @Override
     public boolean isMouseOver(int mouseX, int mouseY) {

diff --git a/src/main/java/serverutils/integration/navigator/xaero/XaeroClaimsRenderer.java b/src/main/java/serverutils/integration/navigator/xaero/XaeroClaimsRenderer.java
@@ -3,20 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gtnewhorizons.navigator.api.model.layers.InteractableLayerManager;
 import com.gtnewhorizons.navigator.api.model.locations.ILocationProvider;
 import com.gtnewhorizons.navigator.api.model.steps.RenderStep;
 import com.gtnewhorizons.navigator.api.xaero.renderers.XaeroInteractableLayerRenderer;
 
-import serverutils.integration.navigator.ClaimsLayerManager;
 import serverutils.integration.navigator.ClaimsLocation;
 import serverutils.integration.navigator.NavigatorIntegration;
 
 public class XaeroClaimsRenderer extends XaeroInteractableLayerRenderer {
 
-    public static final XaeroClaimsRenderer INSTANCE = new XaeroClaimsRenderer();
-
-    public XaeroClaimsRenderer() {
-        super(ClaimsLayerManager.INSTANCE);
+    public XaeroClaimsRenderer(InteractableLayerManager manager) {
+        super(manager);
     }
 
     @Override

diff --git a/src/main/java/serverutils/integration/navigator/xaero/XaeroRenderStep.java b/src/main/java/serverutils/integration/navigator/xaero/XaeroRenderStep.java
@@ -1,6 +1,5 @@
 package serverutils.integration.navigator.xaero;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nullable;
@@ -11,7 +10,6 @@
 
 import com.gtnewhorizons.navigator.api.NavigatorApi;
 import com.gtnewhorizons.navigator.api.model.locations.IWaypointAndLocationProvider;
-import com.gtnewhorizons.navigator.api.util.DrawUtils;
 import com.gtnewhorizons.navigator.api.xaero.rendersteps.XaeroInteractableStep;
 
 import serverutils.integration.navigator.ClaimsLocation;
@@ -58,34 +56,25 @@ public boolean isMouseOver(double mouseX, double mouseY, double scale) {
     }
 
     @Override
-    public void drawTooltip(GuiScreen gui, double mouseX, double mouseY, double scale, int scaleAdj) {
-        final List<String> tooltip = new ArrayList<>();
-        // correct for gl matrix differences
-        mouseX = mouseX * scale + (gui.mc.displayWidth >> 1);
-        mouseY = mouseY * scale + (gui.mc.displayHeight >> 1);
-
-        tooltip.add(location.getTeamName());
+    public void getTooltip(List<String> list) {
+        list.add(location.getTeamName());
 
         if (!location.teamHint().isEmpty()) {
-            tooltip.add(location.teamHint());
+            list.add(location.teamHint());
         }
         if (!location.loadedHint().isEmpty()) {
-            tooltip.add(location.loadedHint());
+            list.add(location.loadedHint());
         }
         if (location.getOwnTeam()) {
-            tooltip.add(location.claimHint());
-            tooltip.add(location.toggleLoadHint());
-            tooltip.add(location.unclaimHint());
+            list.add(location.claimHint());
+            list.add(location.toggleLoadHint());
+            list.add(location.unclaimHint());
         }
-
-        GL11.glPushMatrix();
-
-        DrawUtils
-                .drawSimpleTooltip(gui, tooltip, mouseX / scaleAdj + 6, mouseY / scaleAdj - 12, 0xFFFFFFFF, 0x86000000);
-
-        GL11.glPopMatrix();
     }
 
+    @Override
+    public void drawCustomTooltip(GuiScreen gui, double mouseX, double mouseY, double scale, int scaleAdj) {}
+
     @Override
     public void onActionButton() {
         location.removeClaim();