added a clear method to each map renderer which is invoked when the c…

…aches are cleared.
GregTechCEu · Jan 14, 2025 · 168e52b · 168e52b
1 parent 3dfd0cb
commit 168e52b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 0 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/ClientCacheManager.java b/src/main/java/com/gregtechceu/gtceu/integration/map/ClientCacheManager.java
@@ -96,6 +96,7 @@ public static void clearCaches() {
         for (IClientCache cache : caches.keySet()) {
             cache.clear();
         }
+        GroupingMapRenderer.getInstance().clear();
     }
 
     public static void saveCaches() {

diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/GenericMapRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/GenericMapRenderer.java
@@ -43,4 +43,6 @@ public abstract boolean addMarker(String name, String id, ResourceKey<Level> dim
     public abstract boolean doShowLayer(String name);
 
     public abstract void setLayerActive(String name, boolean active);
+
+    public abstract void clear();
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java
@@ -95,4 +95,11 @@ public void setLayerActive(String name, boolean active) {
             renderer.setLayerActive(name, active);
         }
     }
+
+    @Override
+    public void clear() {
+        for (GenericMapRenderer renderer : rendererList) {
+            renderer.clear();
+        }
+    }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/FTBChunksRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/FTBChunksRenderer.java
@@ -55,4 +55,10 @@ public boolean doShowLayer(String name) {
     public void setLayerActive(String name, boolean active) {
         FTBChunksOptions.toggleLayer(name, active);
     }
+
+    @Override
+    public void clear() {
+        oreElements.clear();
+        fluidElements.clear();
+    }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/journeymap/JourneymapRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/journeymap/JourneymapRenderer.java
@@ -117,6 +117,13 @@ public void setLayerActive(String name, boolean active) {
         JourneyMapPlugin.getOptions().toggleLayer(name, active);
     }
 
+    @Override
+    public void clear() {
+        var api = JourneyMapPlugin.getJmApi();
+        markers.forEach((id, marker) -> api.remove(marker));
+        markers.clear();
+    }
+
     private MarkerOverlay createMarker(String name, String id, ResourceKey<Level> dim, GeneratedVeinMetadata vein) {
         BlockPos center = vein.center();
 

diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosRenderer.java
@@ -50,4 +50,10 @@ public boolean doShowLayer(String name) {
     public void setLayerActive(String name, boolean active) {
         XaerosMapPlugin.toggleOption(name, active);
     }
+
+    @Override
+    public void clear() {
+        oreElements.clear();
+        fluidElements.clear();
+    }
 }