Add support for LAN games

diff --git a/java/com/irtimaled/bbor/BoundingBoxOutlineReloaded.java b/java/com/irtimaled/bbor/BoundingBoxOutlineReloaded.java
index 62be1159045ee8b106923a57236f212c858ca246..c13660f6bfb9ddea57d7dd28ccfc5406d6e3c1f8 100644 (file)
--- a/java/com/irtimaled/bbor/BoundingBoxOutlineReloaded.java
+++ b/java/com/irtimaled/bbor/BoundingBoxOutlineReloaded.java
@@ -24,7 +24,7 @@ public class BoundingBoxOutlineReloaded {
     @Mod.Instance()
     public static BoundingBoxOutlineReloaded instance;
 
-    @SidedProxy(clientSide = "com.irtimaled.bbor.ClientProxy", serverSide = "com.irtimaled.bbor.ServerProxy")
+    @SidedProxy(clientSide = "com.irtimaled.bbor.ClientProxy", serverSide = "com.irtimaled.bbor.CommonProxy")
     public static CommonProxy proxy;
 
 

diff --git a/java/com/irtimaled/bbor/CommonProxy.java b/java/com/irtimaled/bbor/CommonProxy.java
index 3a09c385a5ddcbc8828d72aa037fbcd93f9cd8fb..3393cac2b6d2aeb61a4d7e07fba1c784f4097f70 100644 (file)
--- a/java/com/irtimaled/bbor/CommonProxy.java
+++ b/java/com/irtimaled/bbor/CommonProxy.java
@@ -1,21 +1,31 @@
 package com.irtimaled.bbor;
 
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.gen.ChunkProviderServer;
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraftforge.fml.relauncher.Side;
 
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class CommonProxy {
 
     public Map<Integer, BoundingBoxCache> boundingBoxCacheMap = new ConcurrentHashMap<Integer, BoundingBoxCache>();
+    public ConcurrentHashMap<EntityPlayerMP, Integer> playerDimensions = new ConcurrentHashMap<EntityPlayerMP, Integer>();
+
+    private Map<EntityPlayerMP, Set<BoundingBox>> playerBoundingBoxesCache = new HashMap<EntityPlayerMP, Set<BoundingBox>>();
+
 
     public ConfigManager configManager;
     protected SimpleNetworkWrapper network;
@@ -44,4 +54,60 @@ public class CommonProxy {
             boundingBoxCacheMap.get(dimensionId).refresh();
         }
     }
+
+    @SubscribeEvent
+    public void playerJoinedWorldEvent(net.minecraftforge.event.entity.EntityJoinWorldEvent evt) {
+        if (evt.entity instanceof EntityPlayerMP) {
+            EntityPlayerMP player = (EntityPlayerMP) evt.entity;
+            int dimension = player.dimension;
+            playerDimensions.put(player, dimension);
+
+            sendToPlayer(player, boundingBoxCacheMap.get(dimension));
+        }
+    }
+
+    @SubscribeEvent
+    public void tickEvent(TickEvent event) {
+        for (EntityPlayerMP player : playerDimensions.keySet()) {
+
+            MinecraftServer mc = MinecraftServer.getServer();
+            if (!mc.getConfigurationManager().playerEntityList.contains(player)) {
+                playerDimensions.remove(player);
+            } else {
+                int dimension = playerDimensions.get(player);
+                if (boundingBoxCacheMap.containsKey(dimension)) {
+                    sendToPlayer(player, boundingBoxCacheMap.get(dimension));
+                }
+            }
+        }
+    }
+
+    private void sendToPlayer(EntityPlayerMP player, BoundingBoxCache boundingBoxCache) {
+        Map<BoundingBox, Set<BoundingBox>> cacheSubset = getBoundingBoxMap(player, boundingBoxCache.getBoundingBoxes());
+
+        int dimension = player.dimension;
+        if (cacheSubset.keySet().size() > 0) {
+            FMLLog.info("send %d entries to %s (%d)", cacheSubset.keySet().size(), player.getDisplayNameString(), dimension);
+        }
+
+        for (BoundingBox key : cacheSubset.keySet()) {
+            Set<BoundingBox> boundingBoxes = cacheSubset.get(key);
+            network.sendTo(BoundingBoxMessage.from(dimension, key, boundingBoxes), player);
+
+            if (!playerBoundingBoxesCache.containsKey(player)) {
+                playerBoundingBoxesCache.put(player, new HashSet<BoundingBox>());
+            }
+            playerBoundingBoxesCache.get(player).add(key);
+        }
+    }
+
+    private Map<BoundingBox, Set<BoundingBox>> getBoundingBoxMap(EntityPlayerMP player, Map<BoundingBox, Set<BoundingBox>> boundingBoxMap) {
+        Map<BoundingBox, Set<BoundingBox>> cacheSubset = new HashMap<BoundingBox, Set<BoundingBox>>();
+        for (BoundingBox key : boundingBoxMap.keySet()) {
+            if (!playerBoundingBoxesCache.containsKey(player) || !playerBoundingBoxesCache.get(player).contains(key)) {
+                cacheSubset.put(key, boundingBoxMap.get(key));
+            }
+        }
+        return cacheSubset;
+    }
 }

diff --git a/java/com/irtimaled/bbor/ServerProxy.java b/java/com/irtimaled/bbor/ServerProxy.java
deleted file mode 100644 (file)
index 1c5e923..0000000
--- a/java/com/irtimaled/bbor/ServerProxy.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.irtimaled.bbor;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
-import net.minecraftforge.fml.common.FMLLog;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ServerProxy extends CommonProxy {
-
-    public ConcurrentHashMap<EntityPlayerMP, Integer> playerDimensions =
-            new ConcurrentHashMap<EntityPlayerMP, Integer>();
-
-    private Map<EntityPlayerMP, Set<BoundingBox>> playerBoundingBoxesCache = new HashMap<EntityPlayerMP, Set<BoundingBox>>();
-
-    @SubscribeEvent
-    public void playerJoinedWorldEvent(net.minecraftforge.event.entity.EntityJoinWorldEvent evt) {
-        if (evt.entity instanceof EntityPlayerMP) {
-            EntityPlayerMP player = (EntityPlayerMP) evt.entity;
-            int dimension = player.dimension;
-            playerDimensions.put(player, dimension);
-
-            sendToPlayer(player, boundingBoxCacheMap.get(dimension));
-        }
-    }
-
-    @SubscribeEvent
-    public void tickEvent(TickEvent event) {
-        for (EntityPlayerMP player : playerDimensions.keySet()) {
-
-            MinecraftServer mc = MinecraftServer.getServer();
-            if (!mc.getConfigurationManager().playerEntityList.contains(player)) {
-                playerDimensions.remove(player);
-            } else {
-                int dimension = playerDimensions.get(player);
-                if (boundingBoxCacheMap.containsKey(dimension)) {
-                    sendToPlayer(player, boundingBoxCacheMap.get(dimension));
-                }
-            }
-        }
-    }
-
-    private void sendToPlayer(EntityPlayerMP player, BoundingBoxCache boundingBoxCache) {
-        Map<BoundingBox, Set<BoundingBox>> cacheSubset = getBoundingBoxMap(player, boundingBoxCache.getBoundingBoxes());
-
-        int dimension = player.dimension;
-        if (cacheSubset.keySet().size() > 0) {
-            FMLLog.info("send %d entries to %s (%d)", cacheSubset.keySet().size(), player.getDisplayNameString(), dimension);
-        }
-
-        for (BoundingBox key : cacheSubset.keySet()) {
-            Set<BoundingBox> boundingBoxes = cacheSubset.get(key);
-            network.sendTo(BoundingBoxMessage.from(dimension, key, boundingBoxes), player);
-
-            if (!playerBoundingBoxesCache.containsKey(player)) {
-                playerBoundingBoxesCache.put(player, new HashSet<BoundingBox>());
-            }
-            playerBoundingBoxesCache.get(player).add(key);
-        }
-    }
-
-    private Map<BoundingBox, Set<BoundingBox>> getBoundingBoxMap(EntityPlayerMP player, Map<BoundingBox, Set<BoundingBox>> boundingBoxMap) {
-        Map<BoundingBox, Set<BoundingBox>> cacheSubset = new HashMap<BoundingBox, Set<BoundingBox>>();
-        for (BoundingBox key : boundingBoxMap.keySet()) {
-            if (!playerBoundingBoxesCache.containsKey(player) || !playerBoundingBoxesCache.get(player).contains(key)) {
-                cacheSubset.put(key, boundingBoxMap.get(key));
-            }
-        }
-        return cacheSubset;
-    }
-}
\ No newline at end of file