From aa903430d8ad396d26e1580165089b1224e7cfc9 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sun, 5 Nov 2023 19:26:28 +0100 Subject: [PATCH] less package structure in mixins, moved some classes :tm: --- .../MixinChatItemRewriter.java | 6 +- .../MixinChunkType1_8.java | 6 +- .../MixinCommandBlockProvider.java | 2 +- .../MixinEntityIdRewriter.java | 2 +- .../MixinEntityPackets1_17.java | 6 +- .../MixinEntityPackets_6_1.java | 6 +- .../MixinEntityTracker1_9.java | 6 +- .../MixinInventoryAcknowledgements.java | 2 +- .../MixinInventoryPackets.java | 2 +- .../MixinMetadataRewriter1_15To1_14_4.java | 2 +- .../MixinMetadataRewriter1_9To1_8.java | 6 +- .../MixinProtocol1_11To1_10.java | 2 +- .../MixinProtocol1_12To1_11_1_3.java | 45 +++++++++++++ .../MixinSkullHandler.java | 2 +- .../MixinWorldPackets1_13.java | 6 +- ...ts_2.java => MixinWorldPackets1_16_2.java} | 8 +-- .../MixinWorldPackets1_17.java | 6 +- ...ackets.java => MixinWorldPackets1_19.java} | 4 +- .../MixinProtocol1_12To1_11_1.java | 63 ------------------- .../MixinAbstractFenceConnectionHandler.java | 2 +- .../MixinGlassConnectionHandler.java | 2 +- .../MixinProtocol1_13To1_12_2.java | 2 +- .../viaversion/MixinProtocolVersion.java | 6 +- src/main/resources/viafabricplus.mixins.json | 50 +++++++-------- 24 files changed, 112 insertions(+), 132 deletions(-) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_12to1_11_1 => }/MixinChatItemRewriter.java (91%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_9to1_8 => }/MixinChunkType1_8.java (93%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_9to1_8 => }/MixinCommandBlockProvider.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_11to1_10 => }/MixinEntityIdRewriter.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_17to1_16_4 => }/MixinEntityPackets1_17.java (93%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_9to1_8 => }/MixinEntityPackets_6_1.java (92%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_9to1_8 => }/MixinEntityTracker1_9.java (93%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_17to1_16_4 => }/MixinInventoryAcknowledgements.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_14to1_13_2 => }/MixinInventoryPackets.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_15to1_14_4 => }/MixinMetadataRewriter1_15To1_14_4.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_9to1_8 => }/MixinMetadataRewriter1_9To1_8.java (92%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_11to1_10 => }/MixinProtocol1_11To1_10.java (98%) create mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_12To1_11_1_3.java rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_13to1_12_2 => }/MixinSkullHandler.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_13to1_12_2 => }/MixinWorldPackets1_13.java (89%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_16_2to1_16_1/MixinWorldPackets_2.java => MixinWorldPackets1_16_2.java} (85%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_17to1_16_4 => }/MixinWorldPackets1_17.java (93%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{protocol1_19to1_18_2/MixinWorldPackets.java => MixinWorldPackets1_19.java} (97%) delete mode 100644 src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinProtocol1_12To1_11_1.java rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/{fixes/viaversion/protocol1_13to1_12_2 => viaversion}/MixinAbstractFenceConnectionHandler.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/{fixes/viaversion/protocol1_13to1_12_2 => viaversion}/MixinGlassConnectionHandler.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/{fixes/viaversion/protocol1_13to1_12_2 => viaversion}/MixinProtocol1_13To1_12_2.java (94%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/{fixes => }/viaversion/MixinProtocolVersion.java (95%) diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChatItemRewriter.java similarity index 91% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChatItemRewriter.java index daeb38239..ba5ff8d2a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinChatItemRewriter.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChatItemRewriter.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_12to1_11_1; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ChatItemRewriter; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunkType1_8.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChunkType1_8.java similarity index 93% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunkType1_8.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChunkType1_8.java index 838e93685..8cce9ce8a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinChunkType1_8.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinChunkType1_8.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_9to1_8; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.chunks.*; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinCommandBlockProvider.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinCommandBlockProvider.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java index 5591817ad..1060e4949 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinCommandBlockProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_9to1_8; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.CommandBlockProvider; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_11to1_10/MixinEntityIdRewriter.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityIdRewriter.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_11to1_10/MixinEntityIdRewriter.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityIdRewriter.java index cd590e4b7..31a411c73 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_11to1_10/MixinEntityIdRewriter.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityIdRewriter.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_11to1_10; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java similarity index 93% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java index 6dc990e19..c754623c8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinEntityPackets1_17.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_17to1_16_4; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets_6_1.java similarity index 92% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets_6_1.java index 780a76720..8379487c2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityPackets_6_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets_6_1.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_9to1_8; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java similarity index 93% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java index 26f2cdd20..4acf20bbf 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinEntityTracker1_9.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_9to1_8; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.protocols.protocol1_9to1_8.storage.EntityTracker1_9; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinInventoryAcknowledgements.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryAcknowledgements.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinInventoryAcknowledgements.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryAcknowledgements.java index 96d7156a4..31232a58d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinInventoryAcknowledgements.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryAcknowledgements.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_17to1_16_4; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.libs.fastutil.ints.IntList; import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.storage.InventoryAcknowledgements; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_14to1_13_2/MixinInventoryPackets.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryPackets.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_14to1_13_2/MixinInventoryPackets.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryPackets.java index 81ab048c4..ec707c396 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_14to1_13_2/MixinInventoryPackets.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryPackets.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_14to1_13_2; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.ProtocolPathEntry; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMetadataRewriter1_15To1_14_4.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMetadataRewriter1_15To1_14_4.java index fcd3d8848..e705c3e75 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_15to1_14_4/MixinMetadataRewriter1_15To1_14_4.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMetadataRewriter1_15To1_14_4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_15to1_14_4; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityType; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMetadataRewriter1_9To1_8.java similarity index 92% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMetadataRewriter1_9To1_8.java index 8aa2e0185..3dd0e9d35 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_9to1_8/MixinMetadataRewriter1_9To1_8.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMetadataRewriter1_9To1_8.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_9to1_8; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.entities.EntityType; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_11to1_10/MixinProtocol1_11To1_10.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_11To1_10.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_11to1_10/MixinProtocol1_11To1_10.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_11To1_10.java index 8d3ed5370..bdfae4c39 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_11to1_10/MixinProtocol1_11To1_10.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_11To1_10.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_11to1_10; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import de.florianmichael.viafabricplus.definition.ClientsideFixes; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_12To1_11_1_3.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_12To1_11_1_3.java new file mode 100644 index 000000000..7a9e01f3b --- /dev/null +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_12To1_11_1_3.java @@ -0,0 +1,45 @@ +/* + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; + +import com.viaversion.viaversion.api.Via; +import com.viaversion.viaversion.api.protocol.packet.PacketType; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; +import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; +import de.florianmichael.viafabricplus.injection.access.IProtocol1_13To1_12_2; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(targets = "com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1$3", remap = false) +public class MixinProtocol1_12To1_11_1_3 { + + @Redirect(method = "lambda$register$1", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/protocol/packet/PacketWrapper;create(Lcom/viaversion/viaversion/api/protocol/packet/PacketType;Lcom/viaversion/viaversion/api/protocol/remapper/PacketHandler;)Lcom/viaversion/viaversion/api/protocol/packet/PacketWrapper;")) + private static PacketWrapper writeRecipes(PacketWrapper instance, PacketType packetType, PacketHandler handler) throws Exception { + return instance.create(packetType, wrapper -> { + final IProtocol1_13To1_12_2 protocol = (IProtocol1_13To1_12_2) wrapper.user().getProtocolInfo().getPipeline().getProtocol(Protocol1_13To1_12_2.class); + if (protocol == null) { + Via.getPlatform().getLogger().warning("Cannot write recipes! 1.13 -> 1.12.2 protocol not found!"); + return; + } + + protocol.viafabricplus_writeDeclareRecipes(wrapper); + }); + } +} diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinSkullHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinSkullHandler.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinSkullHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinSkullHandler.java index ea77d3da8..6bb027705 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinSkullHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinSkullHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_13to1_12_2; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.blockentities.SkullHandler; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_13.java similarity index 89% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_13.java index 54d8323a4..214ead720 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinWorldPackets1_13.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_13.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_13to1_12_2; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_16_2.java similarity index 85% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_16_2.java index 91c02d8aa..47286e0bd 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_16_2to1_16_1/MixinWorldPackets_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_16_2.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_16_2to1_16_1; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.packets.WorldPackets; import org.spongepowered.asm.mixin.Mixin; @@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(value = WorldPackets.class, remap = false) -public abstract class MixinWorldPackets_2 { +public abstract class MixinWorldPackets1_16_2 { @ModifyConstant(method = "lambda$register$1", constant = @Constant(intValue = 16)) private static int modifySectionCountToSupportClassicWorldHeight(int constant) { diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java similarity index 93% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java index 8553e4fb3..3511f7886 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_17to1_16_4/MixinWorldPackets1_17.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_17to1_16_4; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_19to1_18_2/MixinWorldPackets.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_19.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_19to1_18_2/MixinWorldPackets.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_19.java index c37a596d6..340da40e1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_19to1_18_2/MixinWorldPackets.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_19.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_19to1_18_2; +package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.type.Type; @@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(value = WorldPackets.class, remap = false) -public class MixinWorldPackets { +public class MixinWorldPackets1_19 { @Redirect(method = "register", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2;cancelClientbound(Lcom/viaversion/viaversion/api/protocol/packet/ClientboundPacketType;)V")) private static void passAcknowledgePlayerDigging(Protocol1_19To1_18_2 instance, ClientboundPacketType clientboundPacketType) { diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinProtocol1_12To1_11_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinProtocol1_12To1_11_1.java deleted file mode 100644 index 0ac653f04..000000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinProtocol1_12To1_11_1.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_12to1_11_1; - -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.minecraft.ClientWorld; -import com.viaversion.viaversion.api.protocol.AbstractProtocol; -import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; -import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; -import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; -import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import de.florianmichael.viafabricplus.injection.access.IProtocol1_13To1_12_2; -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 = Protocol1_12To1_11_1.class, remap = false) -public class MixinProtocol1_12To1_11_1 extends AbstractProtocol { - - @Inject(method = "registerPackets", at = @At("RETURN")) - public void enforceRecipeWriting(CallbackInfo ci) { - registerClientbound(ClientboundPackets1_9_3.JOIN_GAME, new PacketHandlers() { - @Override - public void register() { - map(Type.INT); - map(Type.UNSIGNED_BYTE); - map(Type.INT); - handler(wrapper -> { - wrapper.user().get(ClientWorld.class).setEnvironment(wrapper.get(Type.INT, 1)); - - final IProtocol1_13To1_12_2 protocol = (IProtocol1_13To1_12_2) wrapper.user().getProtocolInfo().getPipeline().getProtocol(Protocol1_13To1_12_2.class); - if (protocol == null) { - Via.getPlatform().getLogger().warning("Protocol1_13To1_12_2 not found!"); - return; - } - - wrapper.create(ClientboundPackets1_13.DECLARE_RECIPES, protocol::viafabricplus_writeDeclareRecipes).scheduleSend(Protocol1_13To1_12_2.class); - }); - } - }); - } -} diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinAbstractFenceConnectionHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinAbstractFenceConnectionHandler.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinAbstractFenceConnectionHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinAbstractFenceConnectionHandler.java index e1a103557..09a2cf233 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinAbstractFenceConnectionHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinAbstractFenceConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_13to1_12_2; +package de.florianmichael.viafabricplus.injection.mixin.viaversion; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.BlockFace; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinGlassConnectionHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinGlassConnectionHandler.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinGlassConnectionHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinGlassConnectionHandler.java index 29e594b40..ca7cc7e1c 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinGlassConnectionHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinGlassConnectionHandler.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_13to1_12_2; +package de.florianmichael.viafabricplus.injection.mixin.viaversion; import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinProtocol1_13To1_12_2.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocol1_13To1_12_2.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinProtocol1_13To1_12_2.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocol1_13To1_12_2.java index 768ed4e80..b852d8e3d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_13to1_12_2/MixinProtocol1_13To1_12_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocol1_13To1_12_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion.protocol1_13to1_12_2; +package de.florianmichael.viafabricplus.injection.mixin.viaversion; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java index d7e09eec9..524667920 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocolVersion.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java @@ -1,6 +1,6 @@ /* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2023 RK_01/RaphiMC and contributors + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD 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 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; +package de.florianmichael.viafabricplus.injection.mixin.viaversion; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.protocol.version.VersionRange; diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index 0bda3f944..7771a8e61 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -149,34 +149,32 @@ "fixes.vialegacy.MixinViaLegacyConfig", "fixes.viaversion.MixinCommonBoss", "fixes.viaversion.MixinNamedCompoundTagType", - "fixes.viaversion.MixinProtocolVersion", - "fixes.viaversion.protocol1_11to1_10.MixinEntityIdRewriter", - "fixes.viaversion.protocol1_11to1_10.MixinProtocol1_11To1_10", - "fixes.viaversion.protocol1_12to1_11_1.MixinChatItemRewriter", - "fixes.viaversion.protocol1_13to1_12_2.MixinAbstractFenceConnectionHandler", - "fixes.viaversion.protocol1_13to1_12_2.MixinGlassConnectionHandler", - "fixes.viaversion.protocol1_13to1_12_2.MixinSkullHandler", - "fixes.viaversion.protocol1_13to1_12_2.MixinWorldPackets1_13", - "fixes.viaversion.protocol1_14to1_13_2.MixinInventoryPackets", - "fixes.viaversion.protocol1_15to1_14_4.MixinMetadataRewriter1_15To1_14_4", - "fixes.viaversion.protocol1_16_2to1_16_1.MixinWorldPackets_2", - "fixes.viaversion.protocol1_17to1_16_4.MixinEntityPackets1_17", - "fixes.viaversion.protocol1_17to1_16_4.MixinInventoryAcknowledgements", - "fixes.viaversion.protocol1_17to1_16_4.MixinWorldPackets1_17", - "fixes.viaversion.protocol1_19to1_18_2.MixinWorldPackets", - "fixes.viaversion.protocol1_9to1_8.MixinChunkType1_8", - "fixes.viaversion.protocol1_9to1_8.MixinCommandBlockProvider", - "fixes.viaversion.protocol1_9to1_8.MixinEntityPackets_6_1", - "fixes.viaversion.protocol1_9to1_8.MixinEntityTracker1_9", - "fixes.viaversion.protocol1_9to1_8.MixinMetadataRewriter1_9To1_8", + "viaversion.MixinProtocolVersion", + "fixes.viaversion.MixinEntityIdRewriter", + "fixes.viaversion.MixinProtocol1_11To1_10", + "fixes.viaversion.MixinChatItemRewriter", + "viaversion.MixinAbstractFenceConnectionHandler", + "viaversion.MixinGlassConnectionHandler", + "fixes.viaversion.MixinSkullHandler", + "fixes.viaversion.MixinWorldPackets1_13", + "fixes.viaversion.MixinInventoryPackets", + "fixes.viaversion.MixinMetadataRewriter1_15To1_14_4", + "fixes.viaversion.MixinWorldPackets1_16_2", + "fixes.viaversion.MixinEntityPackets1_17", + "fixes.viaversion.MixinInventoryAcknowledgements", + "fixes.viaversion.MixinWorldPackets1_17", + "fixes.viaversion.MixinWorldPackets1_19", + "fixes.viaversion.MixinChunkType1_8", + "fixes.viaversion.MixinCommandBlockProvider", + "fixes.viaversion.MixinEntityPackets_6_1", + "fixes.viaversion.MixinEntityTracker1_9", + "fixes.viaversion.MixinMetadataRewriter1_9To1_8", "jsonwebtoken.MixinClasses", - "jsonwebtoken.MixinDefaultJwtParserBuilder" + "jsonwebtoken.MixinDefaultJwtParserBuilder", + "fixes.viaversion.MixinProtocol1_12To1_11_1_3", + "viaversion.MixinProtocol1_13To1_12_2" ], "injectors": { "defaultRequire": 1 - }, - "mixins": [ - "fixes.viaversion.protocol1_12to1_11_1.MixinProtocol1_12To1_11_1", - "fixes.viaversion.protocol1_13to1_12_2.MixinProtocol1_13To1_12_2" - ] + } }