fix: Fix build

null2264 · Oct 30, 2024 · 8c95d33 · 8c95d33
1 parent 5f18765
commit 8c95d33
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/...main/java/io/github/null2264/cobblegen/mixin/network/ClientCommonPacketListenerMixin.java b/...main/java/io/github/null2264/cobblegen/mixin/network/ClientCommonPacketListenerMixin.java
@@ -3,15 +3,17 @@
 //#if MC<1.20.2
 import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
 //#else
-//#if MC>=1.20.4 && MC<1.20.5
+//#if MC>=1.20.4
+//$$ import net.minecraft.network.protocol.Packet;
+//$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
+//$$ import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+//#if MC<1.20.5
 //$$ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-//#else if MC>=1.20.5
+//#else
 //$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 //$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-//$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
-//$$ import net.minecraft.network.protocol.Packet;
 //$$ import net.minecraft.network.protocol.common.ClientCommonPacketListener;
-//$$ import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+//#endif
 //#endif
 //$$ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 //#endif
@@ -68,8 +70,8 @@ private void handleDisconnect(Component reason, CallbackInfo ci) {
     }
     //#endif
 
-    //#if FORGE>1
-    //#if MC>=1.20.4 && MC<1.20.5
+    //#if MC>=1.20.4 && FORGE>1
+    //#if MC<1.20.5
     //$$ @ModifyExpressionValue(
     //$$     method = "send",
     //$$     at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;canSendPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ClientCommonPacketListener;)Z")

diff --git a/...main/java/io/github/null2264/cobblegen/mixin/network/ServerCommonPacketListenerMixin.java b/...main/java/io/github/null2264/cobblegen/mixin/network/ServerCommonPacketListenerMixin.java
@@ -3,16 +3,18 @@
 //#if MC<1.20.2
 import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
 //#else
-//#if MC>=1.20.4 && MC<1.20.5
-//$$ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-//#else if MC>=1.20.5
-//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-//$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+//#if MC>=1.20.4
 //$$ import io.github.null2264.cobblegen.network.payload.CGPacketPayload;
 //$$ import net.minecraft.network.protocol.Packet;
 //$$ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+//#if MC<1.20.5
+//$$ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+//#else
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 //$$ import net.minecraft.network.protocol.common.ServerCommonPacketListener;
 //#endif
+//#endif
 //$$ import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 //#endif
 
@@ -70,8 +72,8 @@ private void handleCustomPayload(ServerboundCustomPayloadPacket packet, Callback
         }
     }
 
-    //#if FORGE>1
-    //#if MC>=1.20.4 && MC<1.20.5
+    //#if MC>=1.20.4 && FORGE>1
+    //#if MC<1.20.5
     //$$ @ModifyExpressionValue(
     //$$     method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V",
     //$$     at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;canSendPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ServerCommonPacketListener;)Z")