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

Fix a few pre-processors blocked renamings

Browse Source
This commit is contained in:
James Seibel
2024-09-16 19:37:34 -05:00
parent ac869bf06e
commit c71de31f57
4 changed files with 13 additions and 16 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
+2 -2
View File
@@ -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
}
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+2 -2
View File
@@ -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);
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
+2 -2
View File
@@ -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);
forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
+7 -10
View File
@@ -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<NetworkMessage> consumer)
public static void setPacketHandler(Consumer<AbstractNetworkMessage> consumer)
{
setPacketHandler((player, message) -> consumer.accept(message));
}
public static void setPacketHandler(BiConsumer<IServerPlayerWrapper, NetworkMessage> consumer)
public static void setPacketHandler(BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> 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; }
}