mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-20 04:09:41 +00:00
Added tick & player handlers to the server to keep track of players and send updates when required.
Client can request a chunk status update (Packet0x02) OverlayLoadedchunk is now a singleton and will send a request packet when activated. Player status is saved in the server proxy. ChunkData is a "static" class to gather chunk related data (loaded chunks for now).
This commit is contained in:
1 parent
a04e7bb8fb
commit
e676b8dc23
11 files changed
+198
-6
No files matched your search
@@ -58,7 +58,7 @@ public class CommandChunkDump extends CommandBase {
|
||||
@Override
|
||||
public boolean canCommandSenderUseCommand(ICommandSender par1ICommandSender)
|
||||
{
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mcp.mobius.opis.constants;
|
||||
|
||||
public enum OverlayStatus {
|
||||
CHUNKSTATUS;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package mcp.mobius.opis.data;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
public class ChunkData {
|
||||
public static HashMap<ChunkCoordIntPair, Boolean> getLoadedChunks(int dimension){
|
||||
HashMap<ChunkCoordIntPair, Boolean> chunkStatus = new HashMap<ChunkCoordIntPair, Boolean>();
|
||||
WorldServer world = DimensionManager.getWorld(dimension);
|
||||
if (world != null)
|
||||
{
|
||||
Set<ChunkCoordIntPair> persistantChunks = world.getPersistentChunks().keySet();
|
||||
Set<ChunkCoordIntPair> chunks = (Set<ChunkCoordIntPair>)world.activeChunkSet;
|
||||
|
||||
for (ChunkCoordIntPair chunk : chunks){
|
||||
chunkStatus.put(chunk, persistantChunks.contains(chunk));
|
||||
}
|
||||
}
|
||||
|
||||
return chunkStatus;
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,8 @@ import mcp.mobius.opis.commands.CommandChunkDump;
|
||||
import mcp.mobius.opis.network.OpisConnectionHandler;
|
||||
import mcp.mobius.opis.network.OpisPacketHandler;
|
||||
import mcp.mobius.opis.proxy.ProxyServer;
|
||||
import mcp.mobius.opis.server.OpisPlayerTracker;
|
||||
import mcp.mobius.opis.server.OpisServerTickHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
@@ -16,6 +18,9 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLServerStartingEvent;
|
||||
import cpw.mods.fml.common.network.NetworkMod;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
@Mod(modid="Opis", name="Opis", version="0.0.1")
|
||||
@NetworkMod(channels={"Opis"},clientSideRequired=true, serverSideRequired=true, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class)
|
||||
@@ -34,7 +39,9 @@ public class modOpis {
|
||||
public void preInit(FMLPreInitializationEvent event) {}
|
||||
|
||||
@EventHandler
|
||||
public void load(FMLInitializationEvent event) {}
|
||||
public void load(FMLInitializationEvent event) {
|
||||
TickRegistry.registerTickHandler(new OpisServerTickHandler(), Side.SERVER);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
@@ -44,5 +51,6 @@ public class modOpis {
|
||||
@EventHandler
|
||||
public void serverStarting(FMLServerStartingEvent event){
|
||||
event.registerServerCommand(new CommandChunkDump());
|
||||
GameRegistry.registerPlayerTracker(new OpisPlayerTracker());
|
||||
}
|
||||
}
|
||||
@@ -3,13 +3,21 @@ package mcp.mobius.opis.network;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.constants.OverlayStatus;
|
||||
import mcp.mobius.opis.data.ChunkData;
|
||||
import mcp.mobius.opis.overlay.OverlayLoadedChunks;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import cpw.mods.fml.common.network.IPacketHandler;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
|
||||
public class OpisPacketHandler implements IPacketHandler {
|
||||
@@ -20,9 +28,16 @@ public class OpisPacketHandler implements IPacketHandler {
|
||||
byte header = this.getHeader(packet);
|
||||
if (header == 0x01){
|
||||
Packet0x01ChunkStatus castedPacket = new Packet0x01ChunkStatus(packet);
|
||||
modOpis.log.log(Level.INFO, String.format("Received a Packet0x01ChunkStatus with %s chunks", castedPacket.chunkStatus.size()));
|
||||
OverlayLoadedChunks.chunks = castedPacket.chunkStatus;
|
||||
OverlayLoadedChunks.instance.chunks = castedPacket.chunkStatus;
|
||||
}
|
||||
|
||||
else if (header == 0x02){
|
||||
Packet0x02RequestChunkStatus castedPacket = new Packet0x02RequestChunkStatus(packet);
|
||||
modOpis.proxy.playerOverlayStatus.put(player, OverlayStatus.CHUNKSTATUS);
|
||||
modOpis.proxy.playerDimension.put(player, castedPacket.dimension);
|
||||
PacketDispatcher.sendPacketToPlayer(Packet0x01ChunkStatus.create(ChunkData.getLoadedChunks(castedPacket.dimension)), player);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package mcp.mobius.opis.network;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
public class Packet0x02RequestChunkStatus {
|
||||
|
||||
public byte header;
|
||||
public int dimension;
|
||||
|
||||
public Packet0x02RequestChunkStatus(Packet250CustomPayload packet) {
|
||||
DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
|
||||
|
||||
try{
|
||||
this.header = inputStream.readByte();
|
||||
this.dimension = inputStream.readInt();
|
||||
} catch (IOException e){}
|
||||
}
|
||||
|
||||
public static Packet250CustomPayload create(int dimension){
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(1);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
|
||||
try{
|
||||
outputStream.writeByte(0x02);
|
||||
outputStream.writeInt(dimension);
|
||||
}catch(IOException e){}
|
||||
|
||||
packet.channel = "Opis";
|
||||
packet.data = bos.toByteArray();
|
||||
packet.length = bos.size();
|
||||
|
||||
return packet;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,10 +4,12 @@ import java.awt.Point;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import mapwriter.api.IMwChunkOverlay;
|
||||
import mapwriter.api.IMwDataProvider;
|
||||
import mapwriter.map.MapView;
|
||||
import mcp.mobius.opis.network.Packet0x02RequestChunkStatus;
|
||||
|
||||
public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
|
||||
@@ -41,7 +43,11 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
|
||||
}
|
||||
|
||||
public static HashMap<ChunkCoordIntPair, Boolean> chunks = new HashMap<ChunkCoordIntPair, Boolean>();
|
||||
public static OverlayLoadedChunks instance = new OverlayLoadedChunks();
|
||||
private OverlayLoadedChunks(){};
|
||||
|
||||
|
||||
public HashMap<ChunkCoordIntPair, Boolean> chunks = new HashMap<ChunkCoordIntPair, Boolean>();
|
||||
|
||||
@Override
|
||||
public ArrayList<IMwChunkOverlay> getChunksOverlay(int dim, double centerX, double centerZ, double minX, double minZ, double maxX, double maxZ) {
|
||||
@@ -73,6 +79,7 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
|
||||
@Override
|
||||
public void onDimensionChanged(int dimension, MapView mapview) {
|
||||
PacketDispatcher.sendPacketToServer(Packet0x02RequestChunkStatus.create(dimension));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -83,4 +90,8 @@ public class OverlayLoadedChunks implements IMwDataProvider {
|
||||
public void onZoomChanged(int level, MapView mapview) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onOverlayActivated(MapView mapview) {
|
||||
PacketDispatcher.sendPacketToServer(Packet0x02RequestChunkStatus.create(mapview.getDimension()));
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,6 @@ public class ProxyClient extends ProxyServer {
|
||||
|
||||
@Override
|
||||
public void init(){
|
||||
MwAPI.registerDataProvider("Loaded chunks", new OverlayLoadedChunks());
|
||||
MwAPI.registerDataProvider("Loaded chunks", OverlayLoadedChunks.instance);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,13 @@
|
||||
package mcp.mobius.opis.proxy;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import mcp.mobius.opis.constants.OverlayStatus;
|
||||
|
||||
public class ProxyServer {
|
||||
public HashMap<Player, OverlayStatus> playerOverlayStatus = new HashMap<Player, OverlayStatus>();
|
||||
public HashMap<Player, Integer> playerDimension = new HashMap<Player, Integer>();
|
||||
|
||||
public void init(){}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package mcp.mobius.opis.server;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import cpw.mods.fml.common.IPlayerTracker;
|
||||
|
||||
public class OpisPlayerTracker implements IPlayerTracker {
|
||||
|
||||
@Override
|
||||
public void onPlayerLogin(EntityPlayer player) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPlayerLogout(EntityPlayer player) {
|
||||
modOpis.proxy.playerOverlayStatus.remove(player);
|
||||
modOpis.proxy.playerDimension.remove(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPlayerChangedDimension(EntityPlayer player) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPlayerRespawn(EntityPlayer player) {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package mcp.mobius.opis.server;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.constants.OverlayStatus;
|
||||
import mcp.mobius.opis.data.ChunkData;
|
||||
import mcp.mobius.opis.network.Packet0x01ChunkStatus;
|
||||
import cpw.mods.fml.common.ITickHandler;
|
||||
import cpw.mods.fml.common.TickType;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
|
||||
public class OpisServerTickHandler implements ITickHandler {
|
||||
|
||||
int tickCounter = 0;
|
||||
|
||||
@Override
|
||||
public void tickStart(EnumSet<TickType> type, Object... tickData) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tickEnd(EnumSet<TickType> type, Object... tickData) {
|
||||
if(type.contains(TickType.WORLD)){
|
||||
tickCounter += 1;
|
||||
if (tickCounter % 100 == 0){
|
||||
updatePlayers();
|
||||
tickCounter = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<TickType> ticks() {
|
||||
return EnumSet.of(TickType.WORLD);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLabel() {
|
||||
return "opis.server.tickhandler";
|
||||
}
|
||||
|
||||
private void updatePlayers(){
|
||||
for (Player player : modOpis.proxy.playerOverlayStatus.keySet())
|
||||
if (modOpis.proxy.playerOverlayStatus.get(player) == OverlayStatus.CHUNKSTATUS)
|
||||
PacketDispatcher.sendPacketToPlayer( Packet0x01ChunkStatus.create(ChunkData.getLoadedChunks(modOpis.proxy.playerDimension.get(player))), player);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user