[1.17.X] Backport Forge networking and playtest

The-Fireplace-Minecraft-Mods · Jul 9, 2024 · 3be6bc9 · 3be6bc9
1 parent a994952
commit 3be6bc9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/forge/src/main/java/dev/the_fireplace/lib/domain/network/ReceiveClientPacket.java b/forge/src/main/java/dev/the_fireplace/lib/domain/network/ReceiveClientPacket.java
@@ -2,7 +2,7 @@
 
 import dev.the_fireplace.lib.api.network.interfaces.ClientboundPacketReceiver;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.network.NetworkEvent;
 
 import java.util.function.Supplier;
 

diff --git a/forge/src/main/java/dev/the_fireplace/lib/domain/network/SimpleChannelManager.java b/forge/src/main/java/dev/the_fireplace/lib/domain/network/SimpleChannelManager.java
@@ -2,7 +2,7 @@
 
 import dev.the_fireplace.lib.api.network.interfaces.PacketSpecification;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
 
 public interface SimpleChannelManager
 {

diff --git a/forge/src/main/java/dev/the_fireplace/lib/network/ForgePacketChannel.java b/forge/src/main/java/dev/the_fireplace/lib/network/ForgePacketChannel.java
@@ -11,9 +11,9 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.network.NetworkEvent;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.network.NetworkRegistry;
+import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
 
 import javax.inject.Singleton;
 import java.util.Map;

diff --git a/forge/src/main/java/dev/the_fireplace/lib/network/ReceiveClientPacketClient.java b/forge/src/main/java/dev/the_fireplace/lib/network/ReceiveClientPacketClient.java
@@ -7,7 +7,7 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.network.NetworkEvent;
 
 import java.util.function.Supplier;
 

diff --git a/forge/src/main/java/dev/the_fireplace/lib/network/ReceiveClientPacketServer.java b/forge/src/main/java/dev/the_fireplace/lib/network/ReceiveClientPacketServer.java
@@ -4,7 +4,7 @@
 import dev.the_fireplace.lib.api.network.interfaces.ClientboundPacketReceiver;
 import dev.the_fireplace.lib.domain.network.ReceiveClientPacket;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.network.NetworkEvent;
 
 import java.util.function.Supplier;
 

diff --git a/playtest-forge/src/main/java/dev/the_fireplace/playtest/entrypoints/Forge.java b/playtest-forge/src/main/java/dev/the_fireplace/playtest/entrypoints/Forge.java
@@ -5,7 +5,7 @@
 import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.network.NetworkConstants;
+import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
 
 @Mod(PlaytestConstants.MODID)
 public final class Forge
@@ -14,7 +14,7 @@ public Forge() {
         PlaytestConstants.getInjector().getInstance(IPlaytestInitializer.class).init();
 
         // Register as optional on both sides
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
     }
 }