mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-05 11:57:56 +00:00
Code Issues Releases Wiki Activity

Clean up FakePlayer

Browse Source 
Not sure why we had two fake implementations of
ServerGamePacketListenerImpl and Connection. One set wasn't actually
being used and was in bad shape.
This commit is contained in:
Toad-Dev
2022-02-07 23:11:46 -08:00
parent 87bb49337f
commit 31a3b975d3
3 changed files with 3 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/java/dan200/computercraft/api/turtle/FakePlayer.java
View File

@@ -6,21 +6,13 @@
package dan200.computercraft.api.turtle;
import com.mojang.authlib.GameProfile;
import io.netty.channel.ChannelHandlerContext;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import dan200.computercraft.shared.util.FakeNetHandler;
import net.minecraft.commands.arguments.EntityAnchorArgument;
import net.minecraft.network.Connection;
import net.minecraft.network.ConnectionProtocol;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
import net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.Container;
@@ -39,7 +31,6 @@ import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.phys.Vec3;
import javax.annotation.Nullable;
import javax.crypto.Cipher;
import java.util.Collection;
import java.util.OptionalInt;
import java.util.UUID;
@@ -49,7 +40,7 @@ import java.util.UUID;
*
* Please note that this does not implement any of the traditional fake player behaviour. It simply exists to prevent me passing in normal players.
*/
public class FakePlayer extends ServerPlayer
public abstract class FakePlayer extends ServerPlayer
{
public FakePlayer( ServerLevel world, GameProfile gameProfile )
{
@@ -266,86 +257,4 @@ public class FakePlayer extends ServerPlayer
public void playNotifySound( SoundEvent soundEvent, SoundSource soundCategory, float volume, float pitch )
{
}
private static class FakeNetHandler extends ServerGamePacketListenerImpl
{
FakeNetHandler( ServerPlayer player )
{
super( player.server, new FakeConnection(), player );
}
@Override
public void disconnect( Component message )
{
}
@Override
public void handleMoveVehicle( ServerboundMoveVehiclePacket move )
{
}
@Override
public void handleCustomCommandSuggestions( ServerboundCommandSuggestionPacket packet )
{
}
@Override
public void send( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
{
}
}
private static class FakeConnection extends Connection
{
FakeConnection()
{
super( PacketFlow.CLIENTBOUND );
}
@Override
public void channelActive( ChannelHandlerContext active )
{
}
@Override
public void setProtocol( ConnectionProtocol state )
{
}
@Override
public void exceptionCaught( ChannelHandlerContext context, Throwable err )
{
}
@Override
protected void channelRead0( ChannelHandlerContext context, Packet<?> packet )
{
}
@Override
public void send( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
{
}
@Override
public void tick()
{
}
@Override
public void disconnect( Component message )
{
}
@Override
public void setEncryptionKey( Cipher cipher, Cipher cipher2 )
{
super.setEncryptionKey( cipher, cipher2 );
}
@Override
public void setReadOnly()
{
}
}
}

2
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
View File

@@ -11,7 +11,6 @@ import dan200.computercraft.api.turtle.FakePlayer;
import dan200.computercraft.api.turtle.ITurtleAccess;
import dan200.computercraft.shared.Registry;
import dan200.computercraft.shared.util.DirectionUtil;
import dan200.computercraft.shared.util.FakeNetHandler;
import dan200.computercraft.shared.util.InventoryUtil;
import dan200.computercraft.shared.util.WorldUtil;
import net.minecraft.core.BlockPos;
@@ -54,7 +53,6 @@ public final class TurtlePlayer extends FakePlayer
GameProfile profile = turtle.getOwningPlayer();
TurtlePlayer player = new TurtlePlayer( world, getProfile( profile ) );
player.connection = new FakeNetHandler( player );
player.setState( turtle );
if( profile != null && profile.getId() != null )

8
src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java
View File

@@ -26,8 +26,7 @@ public class FakeNetHandler extends ServerGamePacketListenerImpl
{
public FakeNetHandler( @Nonnull FakePlayer player )
{
super( player.getLevel()
.getServer(), new FakeNetworkManager(), player );
super( player.getLevel().getServer(), new FakeNetworkManager(), player );
}
@Override
@@ -241,11 +240,6 @@ public class FakeNetHandler extends ServerGamePacketListenerImpl
{
}
// @Override
// public void onConfirmScreenAction( ConfirmScreenActionC2SPacket packet )
// {
// }
@Override
public void handleSignUpdate( @Nonnull ServerboundSignUpdatePacket packet )
{