sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

use latest Netty and Guava

Browse source
This commit is contained in:
Sen 2025-03-16 17:40:47 +01:00
parent 7f32e87ef4
commit 3af1b1f5b6
463 changed files with 611 additions and 68249 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/src/game/network/IThreadListener.java
View file

@ -1,6 +1,6 @@
package game.network;
import game.future.ListenableFuture;
import com.google.common.util.concurrent.ListenableFuture;
public interface IThreadListener
{

47
java/src/game/network/NetConnection.java
View file

@ -7,31 +7,32 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Pattern;
import game.future.ThreadFactoryBuilder;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import game.log.Log;
import game.net.bootstrap.Bootstrap;
import game.net.channel.Channel;
import game.net.channel.ChannelException;
import game.net.channel.ChannelFuture;
import game.net.channel.ChannelFutureListener;
import game.net.channel.ChannelHandler;
import game.net.channel.ChannelHandlerContext;
import game.net.channel.ChannelInitializer;
import game.net.channel.ChannelOption;
import game.net.channel.EventLoopGroup;
import game.net.channel.SimpleChannelInboundHandler;
import game.net.channel.local.LocalChannel;
import game.net.channel.local.LocalEventLoopGroup;
import game.net.channel.local.LocalServerChannel;
import game.net.channel.nio.NioEventLoopGroup;
import game.net.channel.socket.SocketChannel;
import game.net.channel.socket.nio.NioSocketChannel;
import game.net.handler.timeout.ReadTimeoutHandler;
import game.net.handler.timeout.TimeoutException;
import game.net.util.AttributeKey;
import game.net.util.concurrent.Future;
import game.net.util.concurrent.GenericFutureListener;
import game.network.NetHandler.ThreadQuickExitException;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.channel.local.LocalChannel;
import io.netty.channel.local.LocalEventLoopGroup;
import io.netty.channel.local.LocalServerChannel;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.timeout.ReadTimeoutHandler;
import io.netty.handler.timeout.TimeoutException;
import io.netty.util.AttributeKey;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
public class NetConnection extends SimpleChannelInboundHandler<Packet>
{

4
java/src/game/network/NetHandlerPlayClient.java
View file

@ -3,11 +3,13 @@ package game.network;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.Maps;
import java.util.Set;
import game.Game;
import game.audio.PositionedSound;
import game.collect.Maps;
import game.dimension.Dimension;
import game.entity.DataWatcher;
import game.entity.Entity;

13
java/src/game/network/NetHandlerPlayServer.java
View file

@ -6,7 +6,10 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Futures;
import game.Server;
import game.block.Block;
@ -19,7 +22,6 @@ import game.clipboard.ClipboardPlacer;
import game.clipboard.Rotation;
import game.clipboard.RotationValue;
import game.clipboard.Vector;
import game.collect.Lists;
import game.color.TextColor;
import game.dimension.Dimension;
import game.entity.Entity;
@ -31,7 +33,6 @@ import game.entity.npc.EntityHuman;
import game.entity.npc.EntityNPC;
import game.entity.projectile.EntityArrow;
import game.entity.types.EntityLiving;
import game.future.Futures;
import game.init.BlockRegistry;
import game.init.Config;
import game.init.Config.ValueType;
@ -57,8 +58,6 @@ import game.material.Material;
import game.nbt.NBTTagCompound;
import game.nbt.NBTTagList;
import game.nbt.NBTTagString;
import game.net.util.concurrent.Future;
import game.net.util.concurrent.GenericFutureListener;
import game.packet.CPacketAction;
import game.packet.CPacketBook;
import game.packet.CPacketBreak;
@ -123,6 +122,8 @@ import game.world.State;
import game.world.Vec3i;
import game.world.World;
import game.world.WorldServer;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
public class NetHandlerPlayServer extends NetHandler implements ICrafting
{
@ -2685,7 +2686,7 @@ public class NetHandlerPlayServer extends NetHandler implements ICrafting
case MAGNET:
if(this.isAdmin()) {
List<Entity> list = this.entity.worldObj.getEntitiesWithinAABB(Entity.class, new BoundingBox(this.entity.getPosition().subtract(new BlockPos(128, 128, 128)), this.entity.getPosition().add(new BlockPos(128, 128, 128))), new Predicate<Entity>() {
public boolean test(Entity entity) {
public boolean apply(Entity entity) {
return entity.isEntityAlive() && (entity instanceof EntityItem || entity instanceof EntityXp);
}
});

10
java/src/game/network/NettyCompressionDecoder.java
View file

@ -4,11 +4,11 @@ import java.util.List;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
import game.net.buffer.ByteBuf;
import game.net.buffer.Unpooled;
import game.net.channel.ChannelHandlerContext;
import game.net.handler.codec.ByteToMessageDecoder;
import game.net.handler.codec.DecoderException;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.DecoderException;
public class NettyCompressionDecoder extends ByteToMessageDecoder
{

6
java/src/game/network/NettyCompressionEncoder.java
View file

@ -2,9 +2,9 @@ package game.network;
import java.util.zip.Deflater;
import game.net.buffer.ByteBuf;
import game.net.channel.ChannelHandlerContext;
import game.net.handler.codec.MessageToByteEncoder;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
public class NettyCompressionEncoder extends MessageToByteEncoder<ByteBuf>
{

14
java/src/game/network/PacketBuffer.java
View file

@ -8,12 +8,12 @@ import game.item.ItemStack;
import game.nbt.NBTLoader;
import game.nbt.NBTSizeTracker;
import game.nbt.NBTTagCompound;
import game.net.buffer.ByteBuf;
import game.net.buffer.ByteBufInputStream;
import game.net.buffer.ByteBufOutputStream;
import game.net.handler.codec.DecoderException;
import game.net.handler.codec.EncoderException;
import game.world.BlockPos;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.ByteBufOutputStream;
import io.netty.handler.codec.DecoderException;
import io.netty.handler.codec.EncoderException;
public class PacketBuffer
{
@ -302,7 +302,9 @@ public class PacketBuffer
}
else
{
String s = new String(this.readBytes(i).array(), UTF_8);
byte[] abyte = new byte[i];
this.readBytes(abyte);
String s = new String(abyte, UTF_8); // this.readBytes(i).array()
if (s.length() > maxLength)
{

6
java/src/game/network/PacketDecoder.java
View file

@ -3,9 +3,9 @@ package game.network;
import java.io.IOException;
import java.util.List;
import game.net.buffer.ByteBuf;
import game.net.channel.ChannelHandlerContext;
import game.net.handler.codec.ByteToMessageDecoder;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
public class PacketDecoder extends ByteToMessageDecoder
{

6
java/src/game/network/PacketEncoder.java
View file

@ -3,9 +3,9 @@ package game.network;
import java.io.IOException;
import game.log.Log;
import game.net.buffer.ByteBuf;
import game.net.channel.ChannelHandlerContext;
import game.net.handler.codec.MessageToByteEncoder;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
public class PacketEncoder extends MessageToByteEncoder<Packet>
{

6
java/src/game/network/PacketPrepender.java
View file

@ -1,8 +1,8 @@
package game.network;
import game.net.buffer.ByteBuf;
import game.net.channel.ChannelHandlerContext;
import game.net.handler.codec.MessageToByteEncoder;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
public class PacketPrepender extends MessageToByteEncoder<ByteBuf>
{

7
java/src/game/network/PacketRegistry.java
View file

@ -2,9 +2,10 @@ package game.network;
import java.util.Map;
import game.collect.BiMap;
import game.collect.HashBiMap;
import game.collect.Maps;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Maps;
import game.packet.CPacketAction;
import game.packet.CPacketBook;
import game.packet.CPacketBreak;

10
java/src/game/network/PacketSplitter.java
View file

@ -2,11 +2,11 @@ package game.network;
import java.util.List;
import game.net.buffer.ByteBuf;
import game.net.buffer.Unpooled;
import game.net.channel.ChannelHandlerContext;
import game.net.handler.codec.ByteToMessageDecoder;
import game.net.handler.codec.CorruptedFrameException;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.CorruptedFrameException;
public class PacketSplitter extends ByteToMessageDecoder
{