Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-09-28 04:27:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into recode/3.0.0

Browse Source 
# Conflicts:
#	src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
This commit is contained in:
FlorianMichael 2023-11-27 14:15:37 +01:00
commit 93c2abf8f1
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -4,9 +4,9 @@ org.gradle.parallel=true
# Minecraft/Fabric
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.2
yarn_mappings=1.20.2+build.4
loader_version=0.14.24
fabric_api_version=0.90.0+1.20.2
fabric_api_version=0.91.1+1.20.2
# Project Details
mod_version=2.9.9-SNAPSHOT

7
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
View File

@ -23,7 +23,8 @@ import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.Inventor
import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
import de.florianmichael.viafabricplus.injection.access.IClientConnection;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.fabricmc.fabric.impl.networking.payload.PacketByteBufPayload;
import net.fabricmc.fabric.impl.networking.payload.ResolvablePayload;
import net.fabricmc.fabric.impl.networking.payload.UntypedPayload;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientCommonNetworkHandler;
import net.minecraft.network.ClientConnection;
@ -94,8 +95,8 @@ public abstract class MixinClientCommonNetworkHandler {
@Inject(method = "onCustomPayload(Lnet/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket;)V", at = @At("HEAD"), cancellable = true)
private void handleSyncTask(CustomPayloadS2CPacket packet, CallbackInfo ci) {
if (packet.payload().id().toString().equals(ClientsideFixes.PACKET_SYNC_IDENTIFIER) && packet.payload() instanceof PacketByteBufPayload payload) {
ClientsideFixes.handleSyncTask(payload.data());
if (packet.payload().id().toString().equals(ClientsideFixes.PACKET_SYNC_IDENTIFIER) && packet.payload() instanceof ResolvablePayload payload) {
ClientsideFixes.handleSyncTask(((UntypedPayload) payload.resolve(null)).buffer());
ci.cancel(); // Cancel the packet, so it doesn't get processed by the client
}
}