From c71de31f5740527e0727416f4c9c50e3f8c3bbba Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 16 Sep 2024 19:37:34 -0500 Subject: [PATCH] Fix a few pre-processors blocked renamings --- .../wrappers/misc/ServerPlayerWrapper.java | 4 ++-- .../fabric/FabricClientProxy.java | 4 ++-- .../fabric/FabricServerProxy.java | 4 ++-- .../forge/ForgePluginPacketSender.java | 17 +++++++---------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java index 8fd6d97b5..c768af762 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java @@ -53,7 +53,7 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper if (level == null) { #if MC_VER < MC_1_20_1 - level = this.serverPlayer().getLevel(); + level = this.getServerPlayer().getLevel(); #else level = this.getServerPlayer().serverLevel(); #endif @@ -78,7 +78,7 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper #if MC_VER >= MC_1_19_4 return this.getServerPlayer().connection.getRemoteAddress(); #else // < 1.19.4 - return this.serverPlayer().connection.connection.getRemoteAddress(); + return this.getServerPlayer().connection.connection.getRemoteAddress(); #endif } diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index 6d3ff981b..5a8f9bd08 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -52,7 +52,7 @@ import net.minecraft.client.gui.screens.TitleScreen; import com.seibel.distanthorizons.common.CommonPacketPayload; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; #else -import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage; #endif #if MC_VER < MC_1_19_4 @@ -268,7 +268,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy { // Forge packet ID buffer.readByte(); - NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer); + AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer); if (message != null) { ClientApi.INSTANCE.pluginMessageReceived(message); diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java index 8410f40ef..08df8c021 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.Logger; import com.seibel.distanthorizons.common.CommonPacketPayload; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; #else -import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage; import com.seibel.distanthorizons.common.AbstractPluginPacketSender; #endif @@ -194,7 +194,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy { // Forge packet ID buffer.readByte(); - NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer); + AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer); if (message != null) { ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message); diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java index 733c19c05..b4c4f982f 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java @@ -2,7 +2,7 @@ package com.seibel.distanthorizons.forge; import com.seibel.distanthorizons.common.AbstractPluginPacketSender; import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper; -import com.seibel.distanthorizons.core.network.messages.NetworkMessage; +import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper; import net.minecraft.server.level.ServerPlayer; @@ -45,11 +45,11 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender ); #endif - public static void setPacketHandler(Consumer consumer) + public static void setPacketHandler(Consumer consumer) { setPacketHandler((player, message) -> consumer.accept(message)); } - public static void setPacketHandler(BiConsumer consumer) + public static void setPacketHandler(BiConsumer consumer) { #if MC_VER >= MC_1_20_2 PLUGIN_CHANNEL.messageBuilder(MessageWrapper.class, 0) @@ -95,7 +95,7 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender } @Override - public void sendPluginPacketClient(NetworkMessage message) + public void sendPluginClientPacket(AbstractNetworkMessage message) { #if MC_VER >= MC_1_20_2 PLUGIN_CHANNEL.send(new MessageWrapper(message), PacketDistributor.SERVER.noArg()); @@ -105,7 +105,7 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender } @Override - public void sendPluginPacketServer(ServerPlayer serverPlayer, NetworkMessage message) + public void sendPluginPacketServer(ServerPlayer serverPlayer, AbstractNetworkMessage message) { #if MC_VER >= MC_1_20_2 PLUGIN_CHANNEL.send(new MessageWrapper(message), PacketDistributor.PLAYER.with(serverPlayer)); @@ -118,12 +118,9 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender @SuppressWarnings({"ClassCanBeRecord", "RedundantSuppression"}) public static class MessageWrapper { - public final NetworkMessage message; + public final AbstractNetworkMessage message; - public MessageWrapper(NetworkMessage message) - { - this.message = message; - } + public MessageWrapper(AbstractNetworkMessage message) { this.message = message; } }