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

Use same packet resource for all versions

Browse Source
This commit is contained in:
s809
2024-08-19 17:56:34 +05:00
parent 00ec14d319
commit 7c4c99089b
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
+1 -3
View File
@@ -26,10 +26,8 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
#if MC_VER >= MC_1_21
public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
#elif MC_VER >= MC_1_20_6
public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
#else
public static final ResourceLocation PLUGIN_CHANNEL_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.PLUGIN_CHANNEL_PATH);
public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
#endif
coreSubProjects
+1 -1
Submodule coreSubProjects updated: b5e2019d28...81e6f55dbf
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+1 -1
View File
@@ -269,7 +269,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
ClientApi.INSTANCE.pluginMessageReceived(payload.message());
});
#else
ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE, (client, handler, buffer, packetSender) ->
ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (client, handler, buffer, packetSender) ->
{
NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
if (message != null)
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
+2 -2
View File
@@ -23,7 +23,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
#else // < 1.20.6
FriendlyByteBuf buffer = PacketByteBufs.create();
AbstractPluginPacketSender.encodeMessage(buffer, message);
ClientPlayNetworking.send(PLUGIN_CHANNEL_RESOURCE, buffer);
ClientPlayNetworking.send(WRAPPER_PACKET_RESOURCE, buffer);
#endif
}
@@ -35,7 +35,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
#else // < 1.20.6
FriendlyByteBuf buffer = PacketByteBufs.create();
AbstractPluginPacketSender.encodeMessage(buffer, message);
ServerPlayNetworking.send(serverPlayer, PLUGIN_CHANNEL_RESOURCE, buffer);
ServerPlayNetworking.send(serverPlayer, WRAPPER_PACKET_RESOURCE, buffer);
#endif
}
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java
+1 -1
View File
@@ -185,7 +185,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
});
#else
ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
{
NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
if (message != null)
forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
+2 -2
View File
@@ -31,14 +31,14 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender
{
public static final SimpleChannel PLUGIN_CHANNEL =
#if MC_VER >= MC_1_20_2
ChannelBuilder.named(AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE)
ChannelBuilder.named(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE)
.networkProtocolVersion(1)
.serverAcceptedVersions((status, version) -> true)
.clientAcceptedVersions((status, version) -> true)
.simpleChannel();
#else // < 1.20.2
NetworkRegistry.newSimpleChannel(
AbstractPluginPacketSender.PLUGIN_CHANNEL_RESOURCE,
AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE,
() -> "1",
ignored -> true,
ignored -> true