wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
s809
2024-07-28 19:58:35 +05:00
parent 8c7c787a8f
commit 48b38d9285
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
+7 -6
View File
@@ -7,7 +7,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapp
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
import com.seibel.distanthorizons.core.util.math.Vec3d;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerPlayerConnection;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.world.phys.Vec3;
import java.net.SocketAddress;
@@ -19,12 +19,12 @@ import java.util.concurrent.ConcurrentMap;
*/
public class ServerPlayerWrapper implements IServerPlayerWrapper
{
private static final ConcurrentMap<ServerPlayerConnection, ServerPlayerWrapper> serverPlayerWrapperMap = new MapMaker().weakKeys().weakValues().makeMap();
private static final ConcurrentMap<ServerGamePacketListenerImpl, ServerPlayerWrapper> serverPlayerWrapperMap = new MapMaker().weakKeys().weakValues().makeMap();
private final ServerPlayerConnection connection;
private final ServerGamePacketListenerImpl connection;
private ServerPlayer serverPlayer()
{
return this.connection.getPlayer();
return this.connection.player;
}
public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
@@ -32,7 +32,7 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
return serverPlayerWrapperMap.computeIfAbsent(serverPlayer.connection, ignored -> new ServerPlayerWrapper(serverPlayer.connection));
}
private ServerPlayerWrapper(ServerPlayerConnection connection)
private ServerPlayerWrapper(ServerGamePacketListenerImpl connection)
{
this.connection = connection;
}
@@ -96,10 +96,11 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
{
return true;
}
if (!(o instanceof ServerPlayerWrapper that))
if (!(o instanceof ServerPlayerWrapper))
{
return false;
}
ServerPlayerWrapper that = (ServerPlayerWrapper) o;
return Objects.equal(this.connection, that.connection);
}
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+2
View File
@@ -51,6 +51,8 @@ import net.minecraft.client.gui.screens.TitleScreen;
#if MC_VER >= MC_1_20_6
import com.seibel.distanthorizons.common.CommonPacketPayload;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
#else
import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
#endif
#if MC_VER < MC_1_19_4