package com.irtimaled.bbor.common;
import com.irtimaled.bbor.Logger;
-import com.irtimaled.bbor.common.chunkProcessors.ChunkProcessor;
-import com.irtimaled.bbor.common.chunkProcessors.EndChunkProcessor;
-import com.irtimaled.bbor.common.chunkProcessors.NetherChunkProcessor;
-import com.irtimaled.bbor.common.chunkProcessors.OverworldChunkProcessor;
-import com.irtimaled.bbor.common.events.*;
+import com.irtimaled.bbor.client.config.ConfigManager;
+import com.irtimaled.bbor.common.events.PlayerLoggedIn;
+import com.irtimaled.bbor.common.events.PlayerLoggedOut;
+import com.irtimaled.bbor.common.events.PlayerSubscribed;
+import com.irtimaled.bbor.common.events.ServerTick;
+import com.irtimaled.bbor.common.events.StructuresLoaded;
+import com.irtimaled.bbor.common.events.WorldLoaded;
import com.irtimaled.bbor.common.messages.AddBoundingBox;
import com.irtimaled.bbor.common.messages.InitializeClient;
import com.irtimaled.bbor.common.messages.PayloadBuilder;
-import com.irtimaled.bbor.common.messages.RemoveBoundingBox;
-import com.irtimaled.bbor.common.models.*;
-import net.minecraft.world.WorldServer;
-import net.minecraft.world.chunk.Chunk;
+import com.irtimaled.bbor.common.models.AbstractBoundingBox;
+import com.irtimaled.bbor.common.models.DimensionId;
+import com.irtimaled.bbor.common.models.ServerPlayer;
import java.util.HashMap;
import java.util.HashSet;
import java.util.concurrent.ConcurrentHashMap;
public class CommonProxy {
- private Set<ServerPlayer> players = new HashSet<>();
- private Map<ServerPlayer, Set<BoundingBox>> playerBoundingBoxesCache = new HashMap<>();
- private Map<Integer, VillageProcessor> villageProcessors = new HashMap<>();
- private Map<Integer, ChunkProcessor> chunkProcessors = new HashMap<>();
- private WorldData worldData = null;
- private final Map<Integer, BoundingBoxCache> dimensionCache = new ConcurrentHashMap<>();
+ private final Map<Integer, ServerPlayer> players = new ConcurrentHashMap<>();
+ private final Map<Integer, Set<AbstractBoundingBox>> playerBoundingBoxesCache = new HashMap<>();
+ private final Map<DimensionId, StructureProcessor> structureProcessors = new HashMap<>();
+ private final Map<DimensionId, BoundingBoxCache> dimensionCache = new ConcurrentHashMap<>();
+ private Long seed = null;
+ private Integer spawnX = null;
+ private Integer spawnZ = null;
+
+ public CommonProxy(){
+ ConfigManager.loadConfig();
+ }
public void init() {
- EventBus.subscribe(WorldLoaded.class, e -> worldLoaded(e.getWorld()));
- EventBus.subscribe(ChunkLoaded.class, e -> chunkLoaded(e.getChunk()));
- EventBus.subscribe(MobSpawnerBroken.class, e -> mobSpawnerBroken(e.getDimensionId(), e.getPos()));
- EventBus.subscribe(PlayerLoggedIn.class, e -> playerLoggedIn(e.getPlayer()));
- EventBus.subscribe(PlayerLoggedOut.class, e -> playerLoggedOut(e.getPlayer()));
- EventBus.subscribe(PlayerSubscribed.class, e -> sendBoundingBoxes(e.getPlayer()));
- EventBus.subscribe(ServerWorldTick.class, e -> serverWorldTick(e.getWorld()));
+ BoundingBoxType.registerTypes();
+ EventBus.subscribe(WorldLoaded.class, this::worldLoaded);
+ EventBus.subscribe(StructuresLoaded.class, this::structuresLoaded);
+ EventBus.subscribe(PlayerLoggedIn.class, this::playerLoggedIn);
+ EventBus.subscribe(PlayerLoggedOut.class, this::playerLoggedOut);
+ EventBus.subscribe(PlayerSubscribed.class, this::onPlayerSubscribed);
EventBus.subscribe(ServerTick.class, e -> serverTick());
- EventBus.subscribe(VillageRemoved.class, e -> sendRemoveBoundingBox(e.getDimensionId(), e.getVillage()));
}
- protected void setWorldData(long seed, int spawnX, int spawnZ) {
- worldData = new WorldData(seed, spawnX, spawnZ);
+ protected void setSeed(long seed) {
+ this.seed = seed;
}
- private void worldLoaded(WorldServer world) {
- int dimensionId = world.dimension.getType().getId();
- BoundingBoxCache boundingBoxCache = getOrCreateCache(dimensionId);
- ChunkProcessor chunkProcessor = null;
- if (dimensionId == Dimensions.OVERWORLD) {
- setWorldData(world.getSeed(), world.getWorldInfo().getSpawnX(), world.getWorldInfo().getSpawnZ());
- chunkProcessor = new OverworldChunkProcessor(boundingBoxCache);
- }
- if (dimensionId == Dimensions.NETHER) {
- chunkProcessor = new NetherChunkProcessor(boundingBoxCache);
- }
- if (dimensionId == Dimensions.THE_END) {
- chunkProcessor = new EndChunkProcessor(boundingBoxCache);
- }
- Logger.info("create world dimension: %s, %s (seed: %d)", dimensionId, world.getClass().toString(), world.getSeed());
- chunkProcessors.put(dimensionId, chunkProcessor);
- villageProcessors.put(dimensionId, new VillageProcessor(dimensionId, boundingBoxCache));
+ protected void setWorldSpawn(int spawnX, int spawnZ) {
+ this.spawnX = spawnX;
+ this.spawnZ = spawnZ;
}
- private void chunkLoaded(Chunk chunk) {
- int dimensionId = chunk.getWorld().dimension.getType().getId();
- ChunkProcessor chunkProcessor = chunkProcessors.get(dimensionId);
- if (chunkProcessor != null) {
- chunkProcessor.process(chunk);
+ private void worldLoaded(WorldLoaded event) {
+ DimensionId dimensionId = event.getDimensionId();
+ long seed = event.getSeed();
+ if (dimensionId == DimensionId.OVERWORLD) {
+ setSeed(seed);
+ setWorldSpawn(event.getSpawnX(), event.getSpawnZ());
}
+ Logger.info("create world dimension: %s (seed: %d)", dimensionId, seed);
}
- private void playerLoggedIn(ServerPlayer player) {
- player.sendPacket(InitializeClient.getPayload(worldData));
- }
-
- private void playerLoggedOut(ServerPlayer player) {
- players.remove(player);
- playerBoundingBoxesCache.remove(player);
+ private void structuresLoaded(StructuresLoaded event) {
+ DimensionId dimensionId = event.getDimensionId();
+ StructureProcessor structureProcessor = getStructureProcessor(dimensionId);
+ structureProcessor.process(event.getStructures());
}
- private void sendRemoveBoundingBox(int dimensionId, BoundingBox boundingBox) {
- PayloadBuilder payload = RemoveBoundingBox.getPayload(dimensionId, boundingBox);
- if (payload == null) return;
-
- for (ServerPlayer player : players) {
- if (player.getDimensionId() == dimensionId) {
- player.sendPacket(payload);
-
- if (playerBoundingBoxesCache.containsKey(player)) {
- playerBoundingBoxesCache.get(player).remove(boundingBox);
- }
- }
+ private StructureProcessor getStructureProcessor(DimensionId dimensionId) {
+ StructureProcessor structureProcessor = structureProcessors.get(dimensionId);
+ if (structureProcessor == null) {
+ structureProcessor = new StructureProcessor(getOrCreateCache(dimensionId));
+ structureProcessors.put(dimensionId, structureProcessor);
}
+ return structureProcessor;
}
- private void sendBoundingBoxes(ServerPlayer player) {
- players.add(player);
- sendToPlayer(player, getCache(player.getDimensionId()));
- }
-
- private void sendToPlayer(ServerPlayer player, BoundingBoxCache boundingBoxCache) {
- if (boundingBoxCache == null) return;
-
- Map<BoundingBox, Set<BoundingBox>> cacheSubset = getBoundingBoxMap(player, boundingBoxCache.getBoundingBoxes());
-
- for (BoundingBox key : cacheSubset.keySet()) {
- Set<BoundingBox> boundingBoxes = cacheSubset.get(key);
- PayloadBuilder payload = AddBoundingBox.getPayload(player.getDimensionId(), key, boundingBoxes);
- if (payload != null)
- player.sendPacket(payload);
-
- if (!playerBoundingBoxesCache.containsKey(player)) {
- playerBoundingBoxesCache.put(player, new HashSet<>());
- }
- playerBoundingBoxesCache.get(player).add(key);
+ private void playerLoggedIn(PlayerLoggedIn event) {
+ if (seed == null || spawnX == null || spawnZ == null) {
+ return;
}
+ ServerPlayer player = event.getPlayer();
+ player.sendPacket(InitializeClient.getPayload(seed, spawnX, spawnZ));
}
- private Map<BoundingBox, Set<BoundingBox>> getBoundingBoxMap(ServerPlayer player, Map<BoundingBox, Set<BoundingBox>> boundingBoxMap) {
- Map<BoundingBox, Set<BoundingBox>> cacheSubset = new HashMap<>();
- for (BoundingBox key : boundingBoxMap.keySet()) {
- if (!playerBoundingBoxesCache.containsKey(player) || !playerBoundingBoxesCache.get(player).contains(key)) {
- cacheSubset.put(key, boundingBoxMap.get(key));
- }
- }
- return cacheSubset;
+ private void playerLoggedOut(PlayerLoggedOut event) {
+ int playerId = event.getPlayerId();
+ players.remove(playerId);
+ playerBoundingBoxesCache.remove(playerId);
}
- protected void addBoundingBox(int dimensionId, BoundingBox key, Set<BoundingBox> boundingBoxes) {
- BoundingBoxCache cache = getCache(dimensionId);
- if (cache == null) return;
-
- cache.addBoundingBoxes(key, boundingBoxes);
+ private void onPlayerSubscribed(PlayerSubscribed event) {
+ int playerId = event.getPlayerId();
+ ServerPlayer player = event.getPlayer();
+ players.put(playerId, player);
+ sendToPlayer(playerId, player);
}
- protected void removeBoundingBox(int dimensionId, BoundingBox key) {
- BoundingBoxCache cache = getCache(dimensionId);
- if (cache == null) return;
+ private void sendToPlayer(int playerId, ServerPlayer player) {
+ for (Map.Entry<DimensionId, BoundingBoxCache> entry : dimensionCache.entrySet()) {
+ DimensionId dimensionId = entry.getKey();
+ BoundingBoxCache boundingBoxCache = entry.getValue();
+ if (boundingBoxCache == null) return;
- cache.removeBoundingBox(key);
- }
+ Set<AbstractBoundingBox> playerBoundingBoxes = playerBoundingBoxesCache.computeIfAbsent(playerId, k -> new HashSet<>());
- private void mobSpawnerBroken(int dimensionId, Coords pos) {
- BoundingBox boundingBox = BoundingBoxMobSpawner.from(pos);
- removeBoundingBox(dimensionId, boundingBox);
- sendRemoveBoundingBox(dimensionId, boundingBox);
- }
+ Map<AbstractBoundingBox, Set<AbstractBoundingBox>> boundingBoxMap = boundingBoxCache.getBoundingBoxes();
+ for (AbstractBoundingBox key : boundingBoxMap.keySet()) {
+ if (playerBoundingBoxes.contains(key)) {
+ continue;
+ }
- private void serverTick() {
- for (ServerPlayer player : players) {
- sendToPlayer(player, getCache(player.getDimensionId()));
+ Set<AbstractBoundingBox> boundingBoxes = boundingBoxMap.get(key);
+ PayloadBuilder payload = AddBoundingBox.getPayload(dimensionId, key, boundingBoxes);
+ if (payload != null)
+ player.sendPacket(payload);
+
+ playerBoundingBoxes.add(key);
+ }
}
}
- private void serverWorldTick(WorldServer world) {
- int dimensionId = world.dimension.getType().getId();
- VillageProcessor villageProcessor = villageProcessors.get(dimensionId);
- if (villageProcessor == null) return;
+ private void serverTick() {
+ for (Map.Entry<Integer, ServerPlayer> playerEntry : players.entrySet()) {
+ int playerId = playerEntry.getKey();
+ ServerPlayer player = playerEntry.getValue();
- villageProcessor.process(world.getVillageCollection());
+ sendToPlayer(playerId, player);
+ }
}
- protected BoundingBoxCache getCache(int dimensionId) {
+ protected BoundingBoxCache getCache(DimensionId dimensionId) {
return dimensionCache.get(dimensionId);
}
- protected BoundingBoxCache getOrCreateCache(int dimensionId) {
+ protected BoundingBoxCache getOrCreateCache(DimensionId dimensionId) {
return dimensionCache.computeIfAbsent(dimensionId, dt -> new BoundingBoxCache());
}
protected void clearCaches() {
- for (VillageProcessor villageProcessor : villageProcessors.values()) {
- villageProcessor.clear();
- }
- villageProcessors.clear();
+ structureProcessors.clear();
for (BoundingBoxCache cache : dimensionCache.values()) {
cache.clear();
}
projects / BoundingBoxOutlineReloaded.git / blobdiff