diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java index e71cfd1..d9b143b 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataBlockTileEntityPerClass.java @@ -7,14 +7,18 @@ import java.io.IOException; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; +import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.helpers.ModIdentification; public class DataBlockTileEntityPerClass implements ISerializable, Comparable { public int id; public int meta; - public int amount; - public DataTiming update; + public int amount; + public CachedString name; + public CachedString mod; + public DataTiming update; public DataBlockTileEntityPerClass(){} @@ -22,6 +26,8 @@ public class DataBlockTileEntityPerClass implements ISerializable, Comparable { this.id = id; this.meta = meta; this.amount = 0; + this.name = new CachedString(ModIdentification.getStackName(id, meta)); + this.mod = new CachedString(ModIdentification.getModStackName(id, meta)); this.update = new DataTiming(); } @@ -49,6 +55,8 @@ public class DataBlockTileEntityPerClass implements ISerializable, Comparable { stream.writeInt(this.id); stream.writeInt(this.meta); stream.writeInt(this.amount); + this.name.writeToStream(stream); + this.mod.writeToStream(stream); this.update.writeToStream(stream); } @@ -57,6 +65,8 @@ public class DataBlockTileEntityPerClass implements ISerializable, Comparable { retVal.id = stream.readInt(); retVal.meta = stream.readInt(); retVal.amount = stream.readInt(); + retVal.name = CachedString.readFromStream(stream); + retVal.mod = CachedString.readFromStream(stream); retVal.update = DataTiming.readFromStream(stream); return retVal; } diff --git a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java index c7a35b9..b8340c3 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/StringCache.java +++ b/src/main/java/mcp/mobius/opis/data/managers/StringCache.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.concurrent.ConcurrentLinkedQueue; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraftforge.common.util.FakePlayer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -19,6 +20,7 @@ import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataList; import mcp.mobius.opis.network.packets.server.NetDataValue; +import mcp.mobius.opis.network.rconserver.RConServer; public enum StringCache implements IMessageHandler { INSTANCE; @@ -75,7 +77,8 @@ public enum StringCache implements IMessageHandler { public void syncNewCache(){ while (!unsynced.isEmpty()){ - PacketManager.sendToAll(new NetDataValue(Message.STATUS_STRINGUPD, this.unsynced.poll())); + DataStringUpdate update = this.unsynced.poll(); + PacketManager.sendToAll(new NetDataValue(Message.STATUS_STRINGUPD, update)); } } diff --git a/src/main/java/mcp/mobius/opis/helpers/Helpers.java b/src/main/java/mcp/mobius/opis/helpers/Helpers.java index 163aec2..d86fb87 100644 --- a/src/main/java/mcp/mobius/opis/helpers/Helpers.java +++ b/src/main/java/mcp/mobius/opis/helpers/Helpers.java @@ -6,7 +6,7 @@ public class Helpers { public static Side getEffectiveSide(){ Thread thr = Thread.currentThread(); - if ((thr.getName().equals("Server thread")) || (thr.getName().contains("Netty IO"))) + if ((thr.getName().equals("Server thread")) || (thr.getName().contains("Netty IO")) || (thr.getName().startsWith("nioEventLoopGroup"))) { return Side.SERVER; } diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index 3620b17..d6e0bc3 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -220,9 +220,14 @@ public class PacketManager public static void sendToPlayer(PacketBase packet, EntityPlayer player) { - channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); - channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); - channels.get(SERVER).writeAndFlush(packet); + if (player instanceof FakePlayer){ + RConServer.instance.sendToPlayer(packet, (FakePlayer)player); + } + else { + channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); + channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); + channels.get(SERVER).writeAndFlush(packet); + } } public static void sendToPlayer(Packet packet, EntityPlayerMP player) @@ -248,6 +253,10 @@ public class PacketManager { channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL); channels.get(SERVER).writeAndFlush(packet); + + for (FakePlayer fakePlayer : RConServer.instance.fakePlayers.keySet()){ + RConServer.instance.sendToPlayer(packet, fakePlayer); + } } public static Packet toMcPacket(PacketBase packet) @@ -272,10 +281,6 @@ public class PacketManager */ public static void validateAndSend(PacketBase capsule, EntityPlayerMP player){ - if (player instanceof FakePlayer){ - RConServer.instance.sendToPlayer(capsule, (FakePlayer)player); - } - if (!capsule.msg.isDisplayActive(PlayerTracker.INSTANCE.getPlayerSelectedTab(player))) return; if (capsule.msg.canPlayerUseCommand(player)) diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java b/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java index d8ef69c..1ed2054 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConInboundHandler.java @@ -5,10 +5,14 @@ import java.util.UUID; import com.mojang.authlib.GameProfile; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.data.holders.basetypes.SerialLong; +import mcp.mobius.opis.data.managers.StringCache; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.PacketBase; +import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.PacketReqData; +import mcp.mobius.opis.network.packets.server.NetDataValue; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.FakePlayer; @@ -30,6 +34,8 @@ class RConInboundHandler extends ChannelInboundHandlerAdapter{ RConServer.instance.fakePlayers.put(fakePlayer, ctx); PlayerTracker.INSTANCE.playersSwing.add(fakePlayer); + PacketManager.validateAndSend(new NetDataValue(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), fakePlayer); + StringCache.INSTANCE.syncCache(fakePlayer); modOpis.log.info(String.format("Connection to rcon detected. FakePlayer %s with uuid %s created.", ctx.name(), fakeUUID)); diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java index 5713a30..9e2ba75 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java @@ -67,6 +67,7 @@ public class RConServer implements Runnable { EventLoopGroup bossGroup = new NioEventLoopGroup(); EventLoopGroup workerGroup = new NioEventLoopGroup(); + try { ServerBootstrap b = new ServerBootstrap(); b.group(bossGroup, workerGroup)