From 8fb3ff11b0054aef1093126f66ab2266aaafefa5 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:40:42 +0100 Subject: [PATCH] Removed fixes which are now in ViaVersion --- .../injection/mixins/MixinChunkType1_8.java | 54 ------------------- .../mixins/MixinEntityPackets_6_1.java | 42 --------------- .../mixins/MixinWorldPackets1_13.java | 34 ------------ 3 files changed, 130 deletions(-) delete mode 100644 src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java delete mode 100644 src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPackets_6_1.java delete mode 100644 src/main/java/net/raphimc/viaproxy/injection/mixins/MixinWorldPackets1_13.java diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java deleted file mode 100644 index 2340091..0000000 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChunkType1_8.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package net.raphimc.viaproxy.injection.mixins; - -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.minecraft.chunks.*; -import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_8; -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.Redirect; - -import java.util.ArrayList; -import java.util.logging.Level; - -@Mixin(value = ChunkType1_8.class, remap = false) -public abstract class MixinChunkType1_8 { - - @Shadow - public static Chunk deserialize(int chunkX, int chunkZ, boolean fullChunk, boolean skyLight, int bitmask, byte[] data) { - return null; - } - - @Redirect(method = "read(Lio/netty/buffer/ByteBuf;)Lcom/viaversion/viaversion/api/minecraft/chunks/Chunk;", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/type/types/chunk/ChunkType1_8;deserialize(IIZZI[B)Lcom/viaversion/viaversion/api/minecraft/chunks/Chunk;")) - private Chunk fixAegis(int chunkX, int chunkZ, boolean fullChunk, boolean skyLight, int bitmask, byte[] data) { - try { - return deserialize(chunkX, chunkZ, fullChunk, skyLight, bitmask, data); - } catch (Throwable e) { - Via.getPlatform().getLogger().log(Level.WARNING, "The server sent an invalid chunk data packet, returning an empty chunk", e); - final ChunkSection[] airSections = new ChunkSection[16]; - for (int i = 0; i < airSections.length; i++) { - airSections[i] = new ChunkSectionImpl(true); - airSections[i].palette(PaletteType.BLOCKS).addId(0); - } - return new BaseChunk(chunkX, chunkZ, fullChunk, false, 65535, airSections, new int[256], new ArrayList<>()); - } - } - -} diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPackets_6_1.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPackets_6_1.java deleted file mode 100644 index c741d27..0000000 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPackets_6_1.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package net.raphimc.viaproxy.injection.mixins; - -import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; -import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8; -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.CallbackInfoReturnable; - -@Mixin(targets = "com.viaversion.viaversion.protocols.protocol1_9to1_8.packets.EntityPackets$6$1", remap = false) -public abstract class MixinEntityPackets_6_1 { - - @SuppressWarnings({"UnresolvedMixinReference", "MixinAnnotationTarget"}) - @Inject(method = "transform(Lcom/viaversion/viaversion/api/protocol/packet/PacketWrapper;Ljava/lang/Short;)Ljava/lang/Integer;", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/data/entity/EntityTracker;clientEntityId()I"), cancellable = true) - private void fixOutOfBoundsSlot(PacketWrapper wrapper, Short slot, CallbackInfoReturnable cir) throws Exception { - final int entityId = wrapper.get(Type.VAR_INT, 0); - final int clientPlayerId = wrapper.user().getEntityTracker(Protocol1_9To1_8.class).clientEntityId(); - if (slot < 0 || slot > 4 || (entityId == clientPlayerId && slot > 3)) { - wrapper.cancel(); - cir.setReturnValue(0); - } - } - -} diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinWorldPackets1_13.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinWorldPackets1_13.java deleted file mode 100644 index 2d1f64e..0000000 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinWorldPackets1_13.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package net.raphimc.viaproxy.injection.mixins; - -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets; -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.CallbackInfoReturnable; - -@Mixin(value = WorldPackets.class, remap = false) -public abstract class MixinWorldPackets1_13 { - - @Inject(method = "toNewId", at = @At(value = "RETURN", ordinal = 2), cancellable = true) - private static void returnAirDefault(int oldId, CallbackInfoReturnable cir) { - cir.setReturnValue(0); - } - -}