Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix custom payload event

Browse Source 
[no changelog]
This commit is contained in:
Linnea Gräf
2024-06-05 01:04:55 +02:00
parent 3b9fd665af
commit db2b96bd98
10 changed files with 99 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/moe/nea/firmament/mixins/CustomPayloadEventDispatcher.java
View File

@@ -1,27 +0,0 @@
/*
* SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package moe.nea.firmament.mixins;
import moe.nea.firmament.apis.ingame.FirmamentCustomPayload;
import moe.nea.firmament.events.FirmamentCustomPayloadEvent;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.packet.CustomPayload;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientPlayNetworkHandler.class)
public class CustomPayloadEventDispatcher {
@Inject(method = "onCustomPayload", at = @At("HEAD"), cancellable = true)
private void handleFirmamentParsedPayload(CustomPayload payload, CallbackInfo ci) {
if (payload instanceof FirmamentCustomPayload customPayload) {
FirmamentCustomPayloadEvent.Companion.publish(new FirmamentCustomPayloadEvent(customPayload));
ci.cancel();
}
}
}

27
src/main/java/moe/nea/firmament/mixins/custompayload/CustomPayloadEventDispatcher.java Normal file
View File

@@ -0,0 +1,27 @@
/*
* SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package moe.nea.firmament.mixins.custompayload;
import moe.nea.firmament.apis.ingame.FirmamentCustomPayload;
import moe.nea.firmament.events.FirmamentCustomPayloadEvent;
import net.minecraft.client.network.ClientCommonNetworkHandler;
import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(value = ClientCommonNetworkHandler.class, priority = 500)
public class CustomPayloadEventDispatcher {
@Inject(method = "onCustomPayload(Lnet/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket;)V", at = @At("HEAD"), cancellable = true)
private void handleFirmamentParsedPayload(CustomPayloadS2CPacket packet, CallbackInfo ci) {
if (packet.payload() instanceof FirmamentCustomPayload customPayload) {
FirmamentCustomPayloadEvent.Companion.publishSync(new FirmamentCustomPayloadEvent(customPayload));
ci.cancel();
}
}
}

4
src/main/java/moe/nea/firmament/mixins/WrapCustomPayloadC2SPacketCodec.java → src/main/java/moe/nea/firmament/mixins/custompayload/InjectCustomCodecIntoC2SCustomPayloadPacket.java
View File

@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package moe.nea.firmament.mixins;
package moe.nea.firmament.mixins.custompayload;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.At;
import java.util.List;
@Mixin(priority = 1001, value = CustomPayloadC2SPacket.class)
public class WrapCustomPayloadC2SPacketCodec {
public class InjectCustomCodecIntoC2SCustomPayloadPacket {
@WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/CustomPayload;createCodec(Lnet/minecraft/network/packet/CustomPayload$CodecFactory;Ljava/util/List;)Lnet/minecraft/network/codec/PacketCodec;"))
private static PacketCodec<PacketByteBuf, CustomPayload> wrapFactory(

25
src/main/java/moe/nea/firmament/mixins/WrapCustomPayloadS2CPacketCodec.java → src/main/java/moe/nea/firmament/mixins/custompayload/InjectCustomCodecIntoS2CCustomPayloadPacket.java
View File

@@ -4,30 +4,22 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package moe.nea.firmament.mixins;
package moe.nea.firmament.mixins.custompayload;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import moe.nea.firmament.apis.ingame.InGameCodecWrapper;
import moe.nea.firmament.apis.ingame.JoinedCustomPayload;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.listener.ClientCommonPacketListener;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.List;
@Mixin(priority = 1001, value = CustomPayloadS2CPacket.class)
public abstract class WrapCustomPayloadS2CPacketCodec {
@Shadow
public abstract CustomPayload payload();
public abstract class InjectCustomCodecIntoS2CCustomPayloadPacket {
@WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/CustomPayload;createCodec(Lnet/minecraft/network/packet/CustomPayload$CodecFactory;Ljava/util/List;)Lnet/minecraft/network/codec/PacketCodec;"))
private static PacketCodec<PacketByteBuf, CustomPayload> wrapFactory(
@@ -39,17 +31,4 @@ public abstract class WrapCustomPayloadS2CPacketCodec {
return new InGameCodecWrapper(originalCodec, InGameCodecWrapper.Direction.S2C);
}
// TODO: move to own class
@Inject(method = "apply(Lnet/minecraft/network/listener/ClientCommonPacketListener;)V", at = @At("HEAD"), cancellable = true)
private void onApply(ClientCommonPacketListener clientCommonPacketListener, CallbackInfo ci) {
if (payload() instanceof JoinedCustomPayload joinedCustomPayload) {
new CustomPayloadS2CPacket(joinedCustomPayload.getOriginal()).apply(clientCommonPacketListener);
new CustomPayloadS2CPacket(joinedCustomPayload.getSmuggled()).apply(clientCommonPacketListener);
ci.cancel();
}
}
}

33
src/main/java/moe/nea/firmament/mixins/custompayload/SplitJoinedCustomPayload.java Normal file
View File

@@ -0,0 +1,33 @@
/*
* SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package moe.nea.firmament.mixins.custompayload;
import moe.nea.firmament.apis.ingame.JoinedCustomPayload;
import net.minecraft.network.listener.ClientCommonPacketListener;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(CustomPayloadS2CPacket.class)
public abstract class SplitJoinedCustomPayload {
@Shadow
public abstract CustomPayload payload();
@Inject(method = "apply(Lnet/minecraft/network/listener/ClientCommonPacketListener;)V", at = @At("HEAD"), cancellable = true)
private void onApply(ClientCommonPacketListener clientCommonPacketListener, CallbackInfo ci) {
if (payload() instanceof JoinedCustomPayload joinedCustomPayload) {
new CustomPayloadS2CPacket(joinedCustomPayload.getOriginal()).apply(clientCommonPacketListener);
new CustomPayloadS2CPacket(joinedCustomPayload.getSmuggled()).apply(clientCommonPacketListener);
ci.cancel();
}
}
}