less package structure in mixins, moved some classes ™️

ViaVersion · Nov 5, 2023 · aa90343 · aa90343
1 parent d19e330
commit aa90343
Show file tree

Hide file tree

Showing 24 changed files with 112 additions and 132 deletions.
diff --git a/...ol1_12to1_11_1/MixinChatItemRewriter.java → ...xes/viaversion/MixinChatItemRewriter.java b/...ol1_12to1_11_1/MixinChatItemRewriter.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/...n/protocol1_9to1_8/MixinChunkType1_8.java → ...n/fixes/viaversion/MixinChunkType1_8.java b/...n/protocol1_9to1_8/MixinChunkType1_8.java → ...n/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 <http://www.gnu.org/licenses/>.
  */
-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/...ol1_9to1_8/MixinCommandBlockProvider.java → ...viaversion/MixinCommandBlockProvider.java b/...ol1_9to1_8/MixinCommandBlockProvider.java → ...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 <http://www.gnu.org/licenses/>.
  */
-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/...ocol1_11to1_10/MixinEntityIdRewriter.java → ...xes/viaversion/MixinEntityIdRewriter.java b/...ocol1_11to1_10/MixinEntityIdRewriter.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/...l1_17to1_16_4/MixinEntityPackets1_17.java → ...es/viaversion/MixinEntityPackets1_17.java b/...l1_17to1_16_4/MixinEntityPackets1_17.java → ...es/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 <http://www.gnu.org/licenses/>.
  */
-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/...tocol1_9to1_8/MixinEntityPackets_6_1.java → ...es/viaversion/MixinEntityPackets_6_1.java b/...tocol1_9to1_8/MixinEntityPackets_6_1.java → ...es/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 <http://www.gnu.org/licenses/>.
  */
-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/...otocol1_9to1_8/MixinEntityTracker1_9.java → ...xes/viaversion/MixinEntityTracker1_9.java b/...otocol1_9to1_8/MixinEntityTracker1_9.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/..._16_4/MixinInventoryAcknowledgements.java → ...rsion/MixinInventoryAcknowledgements.java b/..._16_4/MixinInventoryAcknowledgements.java → ...rsion/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 <http://www.gnu.org/licenses/>.
  */
-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/...ol1_14to1_13_2/MixinInventoryPackets.java → ...xes/viaversion/MixinInventoryPackets.java b/...ol1_14to1_13_2/MixinInventoryPackets.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/..._4/MixinMetadataRewriter1_15To1_14_4.java → ...on/MixinMetadataRewriter1_15To1_14_4.java b/..._4/MixinMetadataRewriter1_15To1_14_4.java → ...on/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 <http://www.gnu.org/licenses/>.
  */
-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/...9to1_8/MixinMetadataRewriter1_9To1_8.java → ...ersion/MixinMetadataRewriter1_9To1_8.java b/...9to1_8/MixinMetadataRewriter1_9To1_8.java → ...ersion/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 <http://www.gnu.org/licenses/>.
  */
-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/...ol1_11to1_10/MixinProtocol1_11To1_10.java → ...s/viaversion/MixinProtocol1_11To1_10.java b/...ol1_11to1_10/MixinProtocol1_11To1_10.java → ...s/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 <http://www.gnu.org/licenses/>.
  */
-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/...anmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_12To1_11_1_3.java b/...anmichael/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 <http://www.gnu.org/licenses/>.
+ */
+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/...otocol1_13to1_12_2/MixinSkullHandler.java → ...n/fixes/viaversion/MixinSkullHandler.java b/...otocol1_13to1_12_2/MixinSkullHandler.java → ...n/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 <http://www.gnu.org/licenses/>.
  */
-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/...ol1_13to1_12_2/MixinWorldPackets1_13.java → ...xes/viaversion/MixinWorldPackets1_13.java b/...ol1_13to1_12_2/MixinWorldPackets1_13.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/...ol1_16_2to1_16_1/MixinWorldPackets_2.java → ...s/viaversion/MixinWorldPackets1_16_2.java b/...ol1_16_2to1_16_1/MixinWorldPackets_2.java → ...s/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,15 +15,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-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;
 import org.spongepowered.asm.mixin.injection.Constant;
 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/...ol1_17to1_16_4/MixinWorldPackets1_17.java → ...xes/viaversion/MixinWorldPackets1_17.java b/...ol1_17to1_16_4/MixinWorldPackets1_17.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/...otocol1_19to1_18_2/MixinWorldPackets.java → ...xes/viaversion/MixinWorldPackets1_19.java b/...otocol1_19to1_18_2/MixinWorldPackets.java → ...xes/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 <http://www.gnu.org/licenses/>.
  */
-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/...plus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinProtocol1_12To1_11_1.java b/...plus/injection/mixin/fixes/viaversion/protocol1_12to1_11_1/MixinProtocol1_12To1_11_1.java
diff --git a/.../MixinAbstractFenceConnectionHandler.java → .../MixinAbstractFenceConnectionHandler.java b/.../MixinAbstractFenceConnectionHandler.java → .../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 <http://www.gnu.org/licenses/>.
  */
-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/...to1_12_2/MixinGlassConnectionHandler.java → ...aversion/MixinGlassConnectionHandler.java b/...to1_12_2/MixinGlassConnectionHandler.java → ...aversion/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 <http://www.gnu.org/licenses/>.
  */
-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;