Add Additional API for Finding Depleted Veins and Updating Clients

src/main/java/com/sinthoras/visualprospecting/VisualProspecting_API.java

@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -12,12 +13,16 @@
 import com.sinthoras.visualprospecting.database.ServerCache;
 import com.sinthoras.visualprospecting.database.UndergroundFluidPosition;
 import com.sinthoras.visualprospecting.database.VeinSource;
+import com.sinthoras.visualprospecting.database.cachebuilder.PartiallyLoadedChunk;
+import com.sinthoras.visualprospecting.database.veintypes.VeinType;
 import com.sinthoras.visualprospecting.database.veintypes.VeinTypeCaching;
 import com.sinthoras.visualprospecting.network.VeinDepletionMessage;
 import com.sinthoras.visualprospecting.teams.TeamProspectionDispatcher;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.interfaces.IOreMaterial;
+import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
 
 @SuppressWarnings("unused")
 public class VisualProspecting_API {
@@ -82,6 +87,28 @@ public static OreVeinPosition getOreVein(int dimensionId, int blockX, int blockZ
                     Utils.mapToCenterOreChunkCoord(blockZ));
         }
 
+        public static boolean isVeinDepleted(World world, int dimensionId, int chunkX, int chunkZ, int chunkRadius) {
+            final int centerX = Utils.mapToCenterOreChunkCoord(chunkX);
+            final int centerZ = Utils.mapToCenterOreChunkCoord(chunkZ);
+
+            final ReferenceOpenHashSet<IOreMaterial> presentOreMaterials = new ReferenceOpenHashSet<>();
+            final VeinType veinType = ServerCache.instance.getOreVein(dimensionId, chunkX, chunkZ).veinType;
+
+            for (int curX = centerX - chunkRadius; curX <= centerX + chunkRadius; curX++) {
+                for (int curZ = centerZ - chunkRadius; curZ <= centerZ + chunkRadius; curZ++) {
+                    final PartiallyLoadedChunk chunk = new PartiallyLoadedChunk();
+                    chunk.loadFromLiveChunk(world.getChunkFromChunkCoords(curX, curZ));
+                    chunk.forEachOre((x, y, z, info) -> presentOreMaterials.add(info.material));
+                }
+            }
+
+            for (IOreMaterial oreMaterial : presentOreMaterials) {
+                if (VeinTypeCaching.getVeinTypesForOre(oreMaterial).contains(veinType)) return false;
+            }
+
+            return true;
+        }
+
         public static UndergroundFluidPosition getUndergroundFluid(World world, int blockX, int blockZ) {
             return prospectUndergroundFluidsWithingRadius(world, blockX, blockZ, 0).get(0);
         }
@@ -100,6 +127,11 @@ public static void sendProspectionResultsToClient(EntityPlayerMP player, List<Or
             TeamProspectionDispatcher.deliverProspectingResults(player, oreVeins, undergroundFluids);
         }
 
+        public static void sendProspectionResultsToClient(UUID player, List<OreVeinPosition> oreVeins,
+                List<UndergroundFluidPosition> undergroundFluids) {
+            TeamProspectionDispatcher.deliverProspectingResults(player, oreVeins, undergroundFluids);
+        }
+
         public static List<OreVeinPosition> prospectOreVeinsWithinRadius(int dimensionId, int blockX, int blockZ,
                 int blockRadius) {
             return ServerCache.instance.prospectOreBlockRadius(dimensionId, blockX, blockZ, blockRadius);

src/main/java/com/sinthoras/visualprospecting/database/ServerCache.java

@@ -1,7 +1,11 @@
 package com.sinthoras.visualprospecting.database;
 
+import static com.sinthoras.visualprospecting.VisualProspecting_API.LogicalServer.isVeinDepleted;
+import static com.sinthoras.visualprospecting.VisualProspecting_API.LogicalServer.sendProspectionResultsToClient;
+
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -21,6 +25,7 @@
 import com.sinthoras.visualprospecting.teams.TeamProspectionDispatcher;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.events.DrillChunkDiscoveryEvent;
 import gregtech.api.events.OreInteractEvent;
 import gregtech.api.events.VeinGenerateEvent;
 import gregtech.api.interfaces.IOreMaterial;
@@ -82,6 +87,28 @@
         }
     }
 
+    @SubscribeEvent
+    public void onDrillChunkDiscovery(DrillChunkDiscoveryEvent event) {
+        if (!event.discovery) return;
+        final OreVeinPosition vein = getOreVein(event.world.provider.dimensionId, event.chunkX, event.chunkZ);
+        sendProspectionResultsToClient(event.owner, Collections.singletonList(vein), Collections.emptyList());
+    }
+
+    @SubscribeEvent
+    public void onDrillChunkDepletion(DrillChunkDiscoveryEvent event) {
+        if (event.discovery) return;
+        final boolean depleted = isVeinDepleted(
+                event.world,
+                event.world.provider.dimensionId,
+                event.chunkX,
+                event.chunkZ,
+                1);
+        final int centerX = Utils.mapToCenterOreChunkCoord(event.chunkX);
+        final int centerZ = Utils.mapToCenterOreChunkCoord(event.chunkZ);
+        TeamProspectionDispatcher
+                .handleDepletionToggle(event.owner, event.world.provider.dimensionId, centerX, centerZ, depleted);
+    }
+
     public List<OreVeinPosition> prospectOreChunks(int dimensionId, int minChunkX, int minChunkZ, int maxChunkX,
             int maxChunkZ) {
         minChunkX = Utils.mapToCenterOreChunkCoord(minChunkX);

src/main/java/com/sinthoras/visualprospecting/teams/TeamProspectionDispatcher.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 
@@ -42,6 +43,40 @@ public static void deliverProspectingResults(EntityPlayerMP player, ProspectingN
         deliverProspectingResults(player, notification, true);
     }
 
+    /**
+     * Send prospection results to {@code player}'s team through UUID.
+     *
+     * @param player   the player's team whose action produced these results
+     * @param oreVeins ore veins to deliver. May be empty; must not be {@code null}.
+     * @param fluids   underground fluid positions to deliver. May be empty; must not be {@code null}.
+     */
+    public static void deliverProspectingResults(UUID player, List<OreVeinPosition> oreVeins,
+            List<UndergroundFluidPosition> fluids) {
+        deliverProspectingResults(player, new ProspectingNotification(oreVeins, fluids));
+    }
+
+    public static void deliverProspectingResults(UUID player, ProspectingNotification notification) {
+        if (player == null) return;
+
+        if (!Config.enableTeamSharing) return;
+
+        Team team = TeamManager.getTeamByPlayer(player);
+        if (team == null) return;
+        TeamProspectionData data = (TeamProspectionData) team.getData(TeamProspectionData.DATA_KEY);
+        if (data == null) return;
+
+        // Update the team's record
+        List<OreVeinPosition> newVeins = filterNewVeins(data, notification.getOreVeins());
+        List<UndergroundFluidPosition> newFluids = filterNewFluids(data, notification.getUndergroundFluids());
+        if (newVeins.isEmpty() && newFluids.isEmpty()) return;
+
+        team.markDirty();
+
+        // Broadcast to other online teammates.
+        ProspectingNotification broadcast = new ProspectingNotification(newVeins, newFluids);
+        TeamManager.forEachOnlineTeamMember(team, member -> VP.network.sendTo(broadcast, member));
+    }
+
     public static void deliverProspectingResults(EntityPlayerMP player, ProspectingNotification notification,
             boolean notifySelf) {
         if (player == null || player.playerNetServerHandler == null) return;
@@ -106,6 +141,27 @@ public static void handleDepletionToggle(EntityPlayerMP player, int dim, int chu
         });
     }
 
+    public static void handleDepletionToggle(UUID player, int dim, int chunkX, int chunkZ, boolean depleted) {
+        if (!Config.enableTeamSharing) return;
+
+        Team team = TeamManager.getTeamByPlayer(player);
+        if (team == null) return;
+        TeamProspectionData data = (TeamProspectionData) team.getData(TeamProspectionData.DATA_KEY);
+        if (data == null) return;
+
+        // Require the vein to be in the team's discovered set.
+        if (!data.isVeinDiscovered(dim, chunkX, chunkZ)) return;
+
+        // Stop here if the team's depletion state already matches.
+        if (!data.setVeinDepleted(dim, chunkX, chunkZ, depleted)) return;
+
+        team.markDirty();
+
+        // Broadcast to other online teammates.
+        VeinDepletionMessage broadcast = new VeinDepletionMessage(dim, chunkX, chunkZ, depleted);
+        TeamManager.forEachOnlineTeamMember(team, member -> VP.network.sendTo(broadcast, member));
+    }
+
     private static List<OreVeinPosition> filterNewVeins(TeamProspectionData data, List<OreVeinPosition> veins) {
         if (veins == null || veins.isEmpty()) return Collections.emptyList();
         List<OreVeinPosition> newVeins = new ArrayList<>(veins.size());